Changeset - ed5270522724
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 15 years ago 2011-04-10 19:54:49
marcin@python-works.com
changed raw action to show images instead of saying about binary file
added mimetype to binary file text
3 files changed with 40 insertions and 3 deletions:
rhodecode/controllers/files.py
38
1
rhodecode/templates/files/files_annotate.html
1
1
rhodecode/templates/files/files_source.html
1
1
0 comments (0 inline, 0 general)
rhodecode/controllers/files.py
➞
Show inline comments
 
@@ -4,48 +4,49 @@
 
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

			




	
	
	
		
 
    Files controller for RhodeCode

			




	
	
	
		
 

			




	
	
	
		
 
    :created_on: Apr 21, 2010

			




	
	
	
		
 
    :author: marcink

			




	
	
	
		
 
    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>

			




	
	
	
		
 
    :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/>.

			




	
	
	
		
 

			




	
	
	
		
 
import os

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import mimetypes

			




	
	
	
		
 
import rhodecode.lib.helpers as h

			




	
	
	
		
 

			




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

			




	
	
	
		
 
from pylons.i18n.translation import _

			




	
	
	
		
 
from pylons.controllers.util import redirect

			




	
	
	
		
 

			




	
	
	
		
 
from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator

			




	
	
	
		
 
from rhodecode.lib.base import BaseRepoController, render

			




	
	
	
		
 
from rhodecode.lib.utils import EmptyChangeset

			




	
	
	
		
 
from rhodecode.model.repo import RepoModel

			




	
	
	
		
 

			




	
	
	
		
 
from vcs.backends import ARCHIVE_SPECS

			




	
	
	
		
 
from vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \

			




	
	
	
		
 
    EmptyRepositoryError, ImproperArchiveTypeError, VCSError

			




	
	
	
		
 
from vcs.nodes import FileNode, NodeKind

			




	
	
	
		
 
from vcs.utils import diffs as differ

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class FilesController(BaseRepoController):

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




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

			




	
	
		
 
@@ -136,49 +137,85 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                c.file_history = self._get_node_history(c.changeset, f_path)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.file_history = []

			




	
	
	
		
 
        except RepositoryError, e:

			




	
	
	
		
 
            h.flash(str(e), category='warning')

			




	
	
	
		
 
            redirect(h.url('files_home', repo_name=repo_name,

			




	
	
	
		
 
                           revision=revision))

			




	
	
	
		
 

			




	
	
	
		
 
        return render('files/files.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def rawfile(self, repo_name, revision, f_path):

			




	
	
	
		
 
        cs = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
        file_node = self.__get_filenode_or_redirect(repo_name, cs, f_path)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            f_path.split(os.sep)[-1].encode('utf8', 'replace')

			




	
	
	
		
 

			




	
	
	
		
 
        response.content_type = file_node.mimetype

			




	
	
	
		
 
        return file_node.content

			




	
	
	
		
 

			




	
	
	
		
 
    def raw(self, repo_name, revision, f_path):

			




	
	
	
		
 
        cs = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
        file_node = self.__get_filenode_or_redirect(repo_name, cs, f_path)

			




	
	
	
		
 

			




	
	
	
		
 
        response.content_type = 'text/plain'

			




	
	
	
		
 
        raw_mimetype_mapping = {

			




	
	
	
		
 
            # map original mimetype to a mimetype used for "show as raw"

			




	
	
	
		
 
            # you can also provide a content-disposition to override the

			




	
	
	
		
 
            # default "attachment" disposition.

			




	
	
	
		
 
            # orig_type: (new_type, new_dispo)

			




	
	
	
		
 

			




	
	
	
		
 
            # show images inline:

			




	
	
	
		
 
            'image/x-icon': ('image/x-icon', 'inline'),

			




	
	
	
		
 
            'image/png': ('image/png', 'inline'),

			




	
	
	
		
 
            'image/gif': ('image/gif', 'inline'),

			




	
	
	
		
 
            'image/jpeg': ('image/jpeg', 'inline'),

			




	
	
	
		
 
            'image/svg+xml': ('image/svg+xml', 'inline'),

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        mimetype = file_node.mimetype

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            mimetype, dispo = raw_mimetype_mapping[mimetype]

			




	
	
	
		
 
        except KeyError:

			




	
	
	
		
 
            # we don't know anything special about this, handle it safely

			




	
	
	
		
 
            if file_node.is_binary:

			




	
	
	
		
 
                # do same as download raw for binary files

			




	
	
	
		
 
                mimetype, dispo = 'application/octet-stream', 'attachment'

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                # do not just use the original mimetype, but force text/plain,

			




	
	
	
		
 
                # otherwise it would serve text/html and that might be unsafe.

			




	
	
	
		
 
                # Note: underlying vcs library fakes text/plain mimetype if the

			




	
	
	
		
 
                # mimetype can not be determined and it thinks it is not binary.

			




	
	
	
		
 
                # This might lead to erroneous text display in some cases, but

			




	
	
	
		
 
                # helps in other cases, like with text files without extension.

			




	
	
	
		
 
                mimetype, dispo = 'text/plain', 'inline'

			




	
	
	
		
 

			




	
	
	
		
 
        if dispo == 'attachment':

			




	
	
	
		
 
            dispo = 'attachment; filename=%s' % \

			




	
	
	
		
 
                        f_path.split(os.sep)[-1].encode('utf8', 'replace')

			




	
	
	
		
 

			




	
	
	
		
 
        response.content_disposition = dispo

			




	
	
	
		
 
        response.content_type = mimetype

			




	
	
	
		
 
        return file_node.content

			




	
	
	
		
 

			




	
	
	
		
 
    def annotate(self, repo_name, revision, f_path):

			




	
	
	
		
 
        c.cs = self.__get_cs_or_redirect(revision, repo_name)

			




	
	
	
		
 
        c.file = self.__get_filenode_or_redirect(repo_name, c.cs, f_path)

			




	
	
	
		
 

			




	
	
	
		
 
        c.file_history = self._get_node_history(c.cs, f_path)

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 
        return render('files/files_annotate.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def archivefile(self, repo_name, fname):

			




	
	
	
		
 

			




	
	
	
		
 
        fileformat = None

			




	
	
	
		
 
        revision = None

			




	
	
	
		
 
        ext = None

			




	
	
	
		
 

			




	
	
	
		
 
        for a_type, ext_data in 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:

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_annotate.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,49 +43,49 @@

			




	
	
	
		
 
					/ ${h.link_to(_('show as raw'),

			




	
	
	
		
 
						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}

			




	
	
	
		
 
					/ ${h.link_to(_('download as raw'),

			




	
	
	
		
 
						h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path))}

			




	
	
	
		
 
				</dd>

			




	
	
	
		
 
			    <dt>${_('History')}</dt>

			




	
	
	
		
 
			    <dd>

			




	
	
	
		
 
			        <div>

			




	
	
	
		
 
			        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}

			




	
	
	
		
 
			        ${h.hidden('diff2',c.file.last_changeset.raw_id)}

			




	
	
	
		
 
			        ${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}

			




	
	
	
		
 
			        ${h.submit('diff','diff to revision',class_="ui-button")}

			




	
	
	
		
 
			        ${h.submit('show_rev','show at revision',class_="ui-button")}

			




	
	
	
		
 
			        ${h.end_form()}

			




	
	
	
		
 
			        </div>

			




	
	
	
		
 
			    </dd>					

			




	
	
	
		
 
			</dl>

			




	
	
	
		
 
			<div id="body" class="codeblock">

			




	
	
	
		
 
				<div class="code-header">

			




	
	
	
		
 
					<div class="revision">${c.file.name}@r${c.file.last_changeset.revision}:${h.short_id(c.file.last_changeset.raw_id)}</div>

			




	
	
	
		
 
					<div class="commit">"${c.file.message}"</div>

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
				<div class="code-body">

			




	
	
	
		
 
			       %if c.file.is_binary:

			




	
	
	
		
 
			           ${_('Binary file')}

			




	
	
	
		
 
			           ${_('Binary file (%s)') % c.file.mimetype}

			




	
	
	
		
 
			       %else:				

			




	
	
	
		
 
					% if c.file.size < c.cut_off_limit:

			




	
	
	
		
 
						${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}

			




	
	
	
		
 
					%else:

			




	
	
	
		
 
						${_('File is to big to display')} ${h.link_to(_('show as raw'),

			




	
	
	
		
 
						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}

			




	
	
	
		
 
					%endif

			




	
	
	
		
 
		            <script type="text/javascript">

			




	
	
	
		
 
		            YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
		                YAHOO.util.Event.addListener('show_rev','click',function(e){

			




	
	
	
		
 
		                    YAHOO.util.Event.preventDefault(e);

			




	
	
	
		
 
		                    var cs = YAHOO.util.Dom.get('diff1').value;

			




	
	
	
		
 
		                    var url = "${h.url('files_annotate_home',repo_name=c.repo_name,revision='__CS__',f_path=c.f_path)}".replace('__CS__',cs);

			




	
	
	
		
 
		                    window.location = url;

			




	
	
	
		
 
		                    });

			




	
	
	
		
 
		               });

			




	
	
	
		
 
		            </script>				

			




	
	
	
		
 
				   %endif				

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>    

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>    

			




	
	
	
		
 
</%def>   

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -16,49 +16,49 @@

			




	
	
	
		
 
		 / ${h.link_to(_('download as raw'),

			




	
	
	
		
 
			h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}

			




	
	
	
		
 
	</dd>

			




	
	
	
		
 
	<dt>${_('History')}</dt>

			




	
	
	
		
 
	<dd>

			




	
	
	
		
 
		<div>

			




	
	
	
		
 
		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}

			




	
	
	
		
 
		${h.hidden('diff2',c.files_list.last_changeset.raw_id)}

			




	
	
	
		
 
		${h.select('diff1',c.files_list.last_changeset.raw_id,c.file_history)}

			




	
	
	
		
 
		${h.submit('diff','diff to revision',class_="ui-button")}

			




	
	
	
		
 
		${h.submit('show_rev','show at revision',class_="ui-button")}

			




	
	
	
		
 
		${h.end_form()}

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	</dd>

			




	
	
	
		
 
</dl>	

			




	
	
	
		
 

			




	
	
	
		
 
	

			




	
	
	
		
 
<div id="body" class="codeblock">

			




	
	
	
		
 
	<div class="code-header">

			




	
	
	
		
 
		<div class="revision">${c.files_list.name}@r${c.files_list.last_changeset.revision}:${h.short_id(c.files_list.last_changeset.raw_id)}</div>

			




	
	
	
		
 
		<div class="commit">"${c.files_list.last_changeset.message}"</div>

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
	<div class="code-body">

			




	
	
	
		
 
	   %if c.files_list.is_binary:

			




	
	
	
		
 
	       ${_('Binary file')}

			




	
	
	
		
 
	       ${_('Binary file (%s)') % c.files_list.mimetype}

			




	
	
	
		
 
	   %else:

			




	
	
	
		
 
		% if c.files_list.size < c.cut_off_limit:

			




	
	
	
		
 
			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}

			




	
	
	
		
 
		%else:

			




	
	
	
		
 
			${_('File is to big to display')} ${h.link_to(_('show as raw'),

			




	
	
	
		
 
			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}

			




	
	
	
		
 
		%endif

			




	
	
	
		
 
		

			




	
	
	
		
 
       <script type="text/javascript">

			




	
	
	
		
 
           function highlight_lines(lines){

			




	
	
	
		
 
               for(pos in lines){

			




	
	
	
		
 
                 YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');                       

			




	
	
	
		
 
               }              

			




	
	
	
		
 
           }       

			




	
	
	
		
 
           page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');

			




	
	
	
		
 
           if (page_highlights.length == 2){

			




	
	
	
		
 
              highlight_ranges  = page_highlights[1].split(",");

			




	
	
	
		
 

			




	
	
	
		
 
              var h_lines = [];

			




	
	
	
		
 
              for (pos in highlight_ranges){

			




	
	
	
		
 
                   var _range = highlight_ranges[pos].split('-');

			




	
	
	
		
 
                   if(_range.length == 2){

			




	
	
	
		
 
                       var start = parseInt(_range[0]);

			




	
	
	
		
 
                       var end = parseInt(_range[1]);

			




        

    



    


    



    



      

      





    
    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.