Changeset - 058e2743e7b7
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 14 years ago 2012-05-20 14:41:03
marcin@python-works.com
fixes issue #455 Creating an archive generates an exception on Windows
- reverted the FileIter implementation as it had the same issue on windows and
probably on unix as ref #448
2 files changed with 27 insertions and 24 deletions:
rhodecode/controllers/files.py
18
18
rhodecode/tests/functional/test_files.py
9
6
0 comments (0 inline, 0 general)
rhodecode/controllers/files.py
➞
Show inline comments
 
@@ -316,116 +316,116 @@ class FilesController(BaseRepoController
 
                h.flash(_('Successfully committed to %s' % node_path),
 
                        category='success')
 
            except NodeAlreadyExistsError, e:
 
                h.flash(_(e), category='error')
 
            except Exception:
 
                log.error(traceback.format_exc())
 
                h.flash(_('Error occurred during commit'), category='error')
 
            return redirect(url('changeset_home',
 
                                repo_name=c.repo_name, revision='tip'))
 

			




	
	
	
		
 
        return render('files/files_add.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def archivefile(self, repo_name, fname):

			




	
	
	
		
 

			




	
	
	
		
 
        fileformat = None

			




	
	
	
		
 
        revision = None

			




	
	
	
		
 
        ext = None

			




	
	
	
		
 
        subrepos = request.GET.get('subrepos') == 'true'

			




	
	
	
		
 

			




	
	
	
		
 
        for a_type, ext_data in settings.ARCHIVE_SPECS.items():

			




	
	
	
		
 
            archive_spec = fname.split(ext_data[1])

			




	
	
	
		
 
            if len(archive_spec) == 2 and archive_spec[1] == '':

			




	
	
	
		
 
                fileformat = a_type or ext_data[1]

			




	
	
	
		
 
                revision = archive_spec[0]

			




	
	
	
		
 
                ext = ext_data[1]

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            dbrepo = RepoModel().get_by_repo_name(repo_name)

			




	
	
	
		
 
            if dbrepo.enable_downloads is False:

			




	
	
	
		
 
                return _('downloads disabled')

			




	
	
	
		
 

			




	
	
	
		
 
            if c.rhodecode_repo.alias == 'hg':

			




	
	
	
		
 
                # patch and reset hooks section of UI config to not run any

			




	
	
	
		
 
                # hooks on fetching archives with subrepos

			




	
	
	
		
 
                for k, v in c.rhodecode_repo._repo.ui.configitems('hooks'):

			




	
	
	
		
 
                    c.rhodecode_repo._repo.ui.setconfig('hooks', k, None)

			




	
	
	
		
 

			




	
	
	
		
 
            cs = c.rhodecode_repo.get_changeset(revision)

			




	
	
	
		
 
            content_type = settings.ARCHIVE_SPECS[fileformat][0]

			




	
	
	
		
 
        except ChangesetDoesNotExistError:

			




	
	
	
		
 
            return _('Unknown revision %s') % revision

			




	
	
	
		
 
        except EmptyRepositoryError:

			




	
	
	
		
 
            return _('Empty repository')

			




	
	
	
		
 
        except (ImproperArchiveTypeError, KeyError):

			




	
	
	
		
 
            return _('Unknown archive type')

			




	
	
	
		
 

			




	
	
	
		
 
        fd, _archive_name = tempfile.mkstemp(suffix='rcarchive')

			




	
	
	
		
 
        with open(_archive_name, 'wb') as f:

			




	
	
	
		
 
            cs.fill_archive(stream=f, kind=fileformat, subrepos=subrepos)

			




	
	
	
		
 

			




	
	
	
		
 
        content_disposition = 'attachment; filename=%s-%s%s' \

			




	
	
	
		
 
            % (repo_name, revision[:12], ext)

			




	
	
	
		
 
        content_length = os.path.getsize(_archive_name)

			




	
	
	
		
 
        fd, archive = tempfile.mkstemp()

			




	
	
	
		
 
        t = open(archive, 'wb')

			




	
	
	
		
 
        cs.fill_archive(stream=t, kind=fileformat, subrepos=subrepos)

			




	
	
	
		
 
        t.close()

			




	
	
	
		
 

			




	
	
	
		
 
        headers = [('Content-Disposition', str(content_disposition)),

			




	
	
	
		
 
                   ('Content-Type', str(content_type)),

			




	
	
	
		
 
                   ('Content-Length', str(content_length))]

			




	
	
	
		
 
        def get_chunked_archive(archive):

			




	
	
	
		
 
            stream = open(archive, 'rb')

			




	
	
	
		
 
            while True:

			




	
	
	
		
 
                data = stream.read(16 * 1024)

			




	
	
	
		
 
                if not data:

			




	
	
	
		
 
                    stream.close()

			




	
	
	
		
 
                    os.close(fd)

			




	
	
	
		
 
                    os.remove(archive)

			




	
	
	
		
 
                    break

			




	
	
	
		
 
                yield data

			




	
	
	
		
 

			




	
	
	
		
 
        class _DestroyingFileWrapper(_FileIter):

			




	
	
	
		
 
            def close(self):

			




	
	
	
		
 
                self.file.close

			




	
	
	
		
 
                os.remove(self.file.name)

			




	
	
	
		
 

			




	
	
	
		
 
        request.environ['wsgi.file_wrapper'] = _DestroyingFileWrapper

			




	
	
	
		
 
        fapp = FileApp(_archive_name, headers=headers)

			




	
	
	
		
 
        return fapp(request.environ, self.start_response)

			




	
	
	
		
 
        response.content_disposition = str('attachment; filename=%s-%s%s' \

			




	
	
	
		
 
                                           % (repo_name, revision[:12], ext))

			




	
	
	
		
 
        response.content_type = str(content_type)

			




	
	
	
		
 
        return get_chunked_archive(archive)

			




	
	
	
		
 

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def diff(self, repo_name, f_path):

			




	
	
	
		
 
        ignore_whitespace = request.GET.get('ignorews') == '1'

			




	
	
	
		
 
        line_context = request.GET.get('context', 3)

			




	
	
	
		
 
        diff1 = request.GET.get('diff1', '')

			




	
	
	
		
 
        diff2 = request.GET.get('diff2', '')

			




	
	
	
		
 
        c.action = request.GET.get('diff')

			




	
	
	
		
 
        c.no_changes = diff1 == diff2

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 
        c.big_diff = False

			




	
	
	
		
 
        c.anchor_url = anchor_url

			




	
	
	
		
 
        c.ignorews_url = _ignorews_url

			




	
	
	
		
 
        c.context_url = _context_url

			




	
	
	
		
 
        c.changes = OrderedDict()

			




	
	
	
		
 
        c.changes[diff2] = []

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:

			




	
	
	
		
 
                c.changeset_1 = c.rhodecode_repo.get_changeset(diff1)

			




	
	
	
		
 
                node1 = c.changeset_1.get_node(f_path)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.changeset_1 = EmptyChangeset(repo=c.rhodecode_repo)

			




	
	
	
		
 
                node1 = FileNode('.', '', changeset=c.changeset_1)

			




	
	
	
		
 

			




	
	
	
		
 
            if diff2 not in ['', None, 'None', '0' * 12, '0' * 40]:

			




	
	
	
		
 
                c.changeset_2 = c.rhodecode_repo.get_changeset(diff2)

			




	
	
	
		
 
                node2 = c.changeset_2.get_node(f_path)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.changeset_2 = EmptyChangeset(repo=c.rhodecode_repo)

			




	
	
	
		
 
                node2 = FileNode('.', '', changeset=c.changeset_2)

			




	
	
	
		
 
        except RepositoryError:

			




	
	
	
		
 
            return redirect(url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                                f_path=f_path))

			




	
	
	
		
 

			




	
	
	
		
 
        if c.action == 'download':

			




	
	
	
		
 
            _diff = diffs.get_gitdiff(node1, node2,

			




	
	
	
		
 
                                      ignore_whitespace=ignore_whitespace,

			




	
	
	
		
 
                                      context=line_context)

			




	
	
	
		
 
            diff = diffs.DiffProcessor(_diff, format='gitdiff')

			




	
	
	
		
 

			




	
	
	
		
 
            diff_name = '%s_vs_%s.diff' % (diff1, diff2)

			




	
	
	
		
 
            response.content_type = 'text/plain'

			




	
	
	
		
 
            response.content_disposition = (

			




	
	
	
		
 
                'attachment; filename=%s' % diff_name

			




	
	
	
		
 
            )

			




	
	
	
		
 
            return diff.raw_diff()

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/tests/functional/test_files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -155,120 +155,123 @@ class TestFilesController(TestController

			




	
	
	
		
 
<option value="e0da75f308c0f18f98e9ce6257626009fdda2b39">r82:e0da75f308c0 (default)</option>

			




	
	
	
		
 
<option value="fb2e41e0f0810be4d7103bc2a4c7be16ee3ec611">r81:fb2e41e0f081 (default)</option>

			




	
	
	
		
 
<option value="602ae2f5e7ade70b3b66a58cdd9e3e613dc8a028">r76:602ae2f5e7ad (default)</option>

			




	
	
	
		
 
<option value="a066b25d5df7016b45a41b7e2a78c33b57adc235">r73:a066b25d5df7 (default)</option>

			




	
	
	
		
 
<option value="637a933c905958ce5151f154147c25c1c7b68832">r61:637a933c9059 (web)</option>

			




	
	
	
		
 
<option value="0c21004effeb8ce2d2d5b4a8baf6afa8394b6fbc">r60:0c21004effeb (web)</option>

			




	
	
	
		
 
<option value="a1f39c56d3f1d52d5fb5920370a2a2716cd9a444">r59:a1f39c56d3f1 (web)</option>

			




	
	
	
		
 
<option value="97d32df05c715a3bbf936bf3cc4e32fb77fe1a7f">r58:97d32df05c71 (web)</option>

			




	
	
	
		
 
<option value="08eaf14517718dccea4b67755a93368341aca919">r57:08eaf1451771 (web)</option>

			




	
	
	
		
 
<option value="22f71ad265265a53238359c883aa976e725aa07d">r56:22f71ad26526 (web)</option>

			




	
	
	
		
 
<option value="97501f02b7b4330924b647755663a2d90a5e638d">r49:97501f02b7b4 (web)</option>

			




	
	
	
		
 
<option value="86ede6754f2b27309452bb11f997386ae01d0e5a">r47:86ede6754f2b (web)</option>

			




	
	
	
		
 
<option value="014c40c0203c423dc19ecf94644f7cac9d4cdce0">r45:014c40c0203c (web)</option>

			




	
	
	
		
 
<option value="ee87846a61c12153b51543bf860e1026c6d3dcba">r30:ee87846a61c1 (default)</option>

			




	
	
	
		
 
<option value="9bb326a04ae5d98d437dece54be04f830cf1edd9">r26:9bb326a04ae5 (default)</option>

			




	
	
	
		
 
<option value="536c1a19428381cfea92ac44985304f6a8049569">r24:536c1a194283 (default)</option>

			




	
	
	
		
 
<option value="dc5d2c0661b61928834a785d3e64a3f80d3aad9c">r8:dc5d2c0661b6 (default)</option>

			




	
	
	
		
 
<option value="3803844fdbd3b711175fc3da9bdacfcd6d29a6fb">r7:3803844fdbd3 (default)</option>

			




	
	
	
		
 
</optgroup>

			




	
	
	
		
 
<optgroup label="Branches">

			




	
	
	
		
 
<option selected="selected" value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">default</option>

			




	
	
	
		
 
<option value="97e8b885c04894463c51898e14387d80c30ed1ee">git</option>

			




	
	
	
		
 
<option value="2e6a2bf9356ca56df08807f4ad86d480da72a8f4">web</option>

			




	
	
	
		
 
</optgroup>

			




	
	
	
		
 
<optgroup label="Tags">

			




	
	
	
		
 
<option selected="selected" value="27cd5cce30c96924232dffcd24178a07ffeb5dfc">tip</option>

			




	
	
	
		
 
<option value="fd4bdb5e9b2a29b4393a4ac6caef48c17ee1a200">0.1.4</option>

			




	
	
	
		
 
<option value="17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">0.1.3</option>

			




	
	
	
		
 
<option value="a7e60bff65d57ac3a1a1ce3b12a70f8a9e8a7720">0.1.2</option>

			




	
	
	
		
 
<option value="eb3a60fc964309c1a318b8dfe26aa2d1586c85ae">0.1.1</option>

			




	
	
	
		
 
</optgroup>""")

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_archival(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        for arch_ext, info in ARCHIVE_SPECS.items():

			




	
	
	
		
 
            short = '27cd5cce30c9%s' % arch_ext

			




	
	
	
		
 
            fname = '27cd5cce30c96924232dffcd24178a07ffeb5dfc%s' % arch_ext

			




	
	
	
		
 
            filename = '%s-%s' % (HG_REPO, short)

			




	
	
	
		
 
            response = self.app.get(url(controller='files',

			




	
	
	
		
 
                                        action='archivefile',

			




	
	
	
		
 
                                        repo_name=HG_REPO,

			




	
	
	
		
 
                                        fname=fname))

			




	
	
	
		
 

			




	
	
	
		
 
            self.assertEqual(response.status, '200 OK')

			




	
	
	
		
 
            heads = [

			




	
	
	
		
 
            ('Content-Type', 'text/html; charset=utf-8'),

			




	
	
	
		
 
            ('Content-Length', '0'), ('Pragma', 'no-cache'),

			




	
	
	
		
 
            ('Cache-Control', 'no-cache')

			




	
	
	
		
 
                ('Pragma', 'no-cache'), 

			




	
	
	
		
 
                ('Cache-Control', 'no-cache'), 

			




	
	
	
		
 
                ('Content-Disposition', 'attachment; filename=%s' % filename),

			




	
	
	
		
 
                ('Content-Type', '%s; charset=utf-8' % info[0]),

			




	
	
	
		
 
            ]

			




	
	
	
		
 
            self.assertEqual(response.response._headers.items(), heads)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_archival_wrong_ext(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        for arch_ext in ['tar', 'rar', 'x', '..ax', '.zipz']:

			




	
	
	
		
 
            fname = '27cd5cce30c96924232dffcd24178a07ffeb5dfc%s' % arch_ext

			




	
	
	
		
 

			




	
	
	
		
 
            response = self.app.get(url(controller='files', action='archivefile',

			




	
	
	
		
 
            response = self.app.get(url(controller='files', 

			




	
	
	
		
 
                                        action='archivefile',

			




	
	
	
		
 
                                        repo_name=HG_REPO,

			




	
	
	
		
 
                                        fname=fname))

			




	
	
	
		
 
            response.mustcontain('Unknown archive type')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_archival_wrong_revision(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 

			




	
	
	
		
 
        for rev in ['00x000000', 'tar', 'wrong', '@##$@$424213232', '232dffcd']:

			




	
	
	
		
 
        for rev in ['00x000000', 'tar', 'wrong', '@##$@$42413232', '232dffcd']:

			




	
	
	
		
 
            fname = '%s.zip' % rev

			




	
	
	
		
 

			




	
	
	
		
 
            response = self.app.get(url(controller='files', action='archivefile',

			




	
	
	
		
 
            response = self.app.get(url(controller='files',

			




	
	
	
		
 
                                        action='archivefile',

			




	
	
	
		
 
                                        repo_name=HG_REPO,

			




	
	
	
		
 
                                        fname=fname))

			




	
	
	
		
 
            response.mustcontain('Unknown revision')

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # RAW FILE

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    def test_raw_file_ok(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='rawfile',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision='27cd5cce30c96924232dffcd24178a07ffeb5dfc',

			




	
	
	
		
 
                                    f_path='vcs/nodes.py'))

			




	
	
	
		
 

			




	
	
	
		
 
        self.assertEqual(response.content_disposition, "attachment; filename=nodes.py")

			




	
	
	
		
 
        self.assertEqual(response.content_type, "text/x-python")

			




	
	
	
		
 

			




	
	
	
		
 
    def test_raw_file_wrong_cs(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        rev = u'ERRORce30c96924232dffcd24178a07ffeb5dfc'

			




	
	
	
		
 
        f_path = 'vcs/nodes.py'

			




	
	
	
		
 

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='rawfile',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision=rev,

			




	
	
	
		
 
                                    f_path=f_path))

			




	
	
	
		
 

			




	
	
	
		
 
        msg = """Revision %r does not exist for this repository""" % (rev)

			




	
	
	
		
 
        self.checkSessionFlash(response, msg)

			




	
	
	
		
 

			




	
	
	
		
 
        msg = """%s""" % (HG_REPO)

			




	
	
	
		
 
        self.checkSessionFlash(response, msg)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_raw_file_wrong_f_path(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        rev = '27cd5cce30c96924232dffcd24178a07ffeb5dfc'

			




	
	
	
		
 
        f_path = 'vcs/ERRORnodes.py'

			




	
	
	
		
 
        response = self.app.get(url(controller='files', action='rawfile',

			




	
	
	
		
 
                                    repo_name=HG_REPO,

			




	
	
	
		
 
                                    revision=rev,

			




	
	
	
		
 
                                    f_path=f_path))

			




	
	
	
		
 

			




	
	
	
		
 
        msg = "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12])

			




	
	
	
		
 
        self.checkSessionFlash(response, msg)

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # RAW RESPONSE - PLAIN

			




	
	
	
		
 
    #==========================================================================

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.