Changeset - 3c1d991755df
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 14 years ago 2012-05-17 02:44:10
marcin@python-works.com
Use paste fileapp to properly send the archive size
2 files changed with 21 insertions and 19 deletions:
rhodecode/controllers/files.py
15
12
rhodecode/tests/functional/test_files.py
6
7
0 comments (0 inline, 0 general)
rhodecode/controllers/files.py
➞
Show inline comments
 
@@ -11,48 +11,49 @@
 
    :license: GPLv3, see COPYING for more details.
 
"""
 
# This program is free software: you can redistribute it and/or modify
 
# it under the terms of the GNU General Public License as published by
 
# the Free Software Foundation, either version 3 of the License, or
 
# (at your option) any later version.
 
#
 
# This program is distributed in the hope that it will be useful,
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
# GNU General Public License for more details.
 
#
 
# You should have received a copy of the GNU General Public License
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
from __future__ import with_statement
 
import os
 
import logging
 
import traceback
 
import tempfile
 

			




	
	
	
		
 
from pylons import request, response, tmpl_context as c, url

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 
from pylons.decorators import jsonify

			




	
	
	
		
 
from paste.fileapp import FileApp, _FileIter

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib import diffs

			




	
	
	
		
 
from rhodecode.lib import helpers as h

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.compat import OrderedDict

			




	
	
	
		
 
from rhodecode.lib.utils2 import convert_line_endings, detect_mode, safe_str

			




	
	
	
		
 
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from rhodecode.lib.base import BaseRepoController, render

			




	
	
	
		
 
from rhodecode.lib.utils import EmptyChangeset

			




	
	
	
		
 
from rhodecode.lib.vcs.conf import settings

			




	
	
	
		
 
from rhodecode.lib.vcs.exceptions import RepositoryError, \

			




	
	
	
		
 
    ChangesetDoesNotExistError, EmptyRepositoryError, \

			




	
	
	
		
 
    ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError

			




	
	
	
		
 
from rhodecode.lib.vcs.nodes import FileNode

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.model.repo import RepoModel

			




	
	
	
		
 
from rhodecode.model.scm import ScmModel

			




	
	
	
		
 
from rhodecode.model.db import Repository

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.controllers.changeset import anchor_url, _ignorews_url,\

			




	
	
	
		
 
    _context_url, get_line_ctx, get_ignore_ws

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
		
 
@@ -343,62 +344,64 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
	
		
 
        response.content_type = content_type

			




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

			




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

			




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

			




	
	
	
		
 
        response.content_length = str(os.path.getsize(_archive_name))

			




	
	
	
		
 
        content_length = os.path.getsize(_archive_name)

			




	
	
	
		
 

			




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

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
        def get_chunked_archive(tmpfile):

			




	
	
	
		
 
            while True:

			




	
	
	
		
 
                data = tmpfile.read(16 * 1024)

			




	
	
	
		
 
                if not data:

			




	
	
	
		
 
                    tmpfile.close()

			




	
	
	
		
 
                    os.unlink(tmpfile.name)

			




	
	
	
		
 
                    break

			




	
	
	
		
 
                yield data

			




	
	
	
		
 
        return get_chunked_archive(tmpfile=open(_archive_name, 'rb'))

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
	
		
 
    @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)

			




        

    


    
    

    

        

                

                    rhodecode/tests/functional/test_files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -178,55 +178,54 @@ class TestFilesController(TestController

			




	
	
	
		
 
</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')

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 
             ]

			




	
	
	
		
 
            )

			




	
	
	
		
 
            heads = [

			




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

			




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

			




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

			




	
	
	
		
 
            ]

			




	
	
	
		
 
            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',

			




	
	
	
		
 
                                        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']:

			




	
	
	
		
 
            fname = '%s.zip' % rev

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                        repo_name=HG_REPO,

			




	
	
	
		
 
                                        fname=fname))

			




	
	
	
		
 
            response.mustcontain('Unknown revision')

			




	
	
	
		
 

			




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

			




        

    



    


    



    



      

      





    
    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.