opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-29 17:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting mimetype for image files in tool shed repositories.

Browse Source
This commit is contained in:
Greg Von Kuster
2013-10-07 10:32:33 -04:00
parent 8ba7578b10
commit d516842c08
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
+8 -3
View File
@@ -306,9 +306,14 @@ class AdminToolshed( AdminGalaxy ):
path_to_file = suc.get_absolute_path_to_file_in_repository( repo_files_dir, relative_path_to_image_file )
if os.path.exists( path_to_file ):
file_name = os.path.basename( relative_path_to_image_file )
mimetype = trans.app.datatypes_registry.get_mimetype_by_extension( file_name, None )
if mimetype:
trans.response.set_content_type( mimetype )
try:
extension = file_name.split( '.' )[ -1 ]
except Exception, e:
extension = None
if extension:
mimetype = trans.app.datatypes_registry.get_mimetype_by_extension( extension )
if mimetype:
trans.response.set_content_type( mimetype )
return open( path_to_file, 'r' )
return None
lib/galaxy/webapps/tool_shed/controllers/repository.py
+8 -3
View File
@@ -1038,9 +1038,14 @@ class RepositoryController( BaseUIController, ratings_util.ItemRatings ):
path_to_file = suc.get_absolute_path_to_file_in_repository( repo_files_dir, relative_path_to_image_file )
if os.path.exists( path_to_file ):
file_name = os.path.basename( relative_path_to_image_file )
mimetype = trans.app.datatypes_registry.get_mimetype_by_extension( file_name, None )
if mimetype:
trans.response.set_content_type( mimetype )
try:
extension = file_name.split( '.' )[ -1 ]
except Exception, e:
extension = None
if extension:
mimetype = trans.app.datatypes_registry.get_mimetype_by_extension( extension )
if mimetype:
trans.response.set_content_type( mimetype )
return open( path_to_file, 'r' )
return None