# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Nate Coraor <nate@bx.psu.edu> # Date 1275924310 14400 # Node ID f08dff0dd4ac92c5d9b75792c2c5c38eb280e81b # Parent 4fb747f317d0b2c36ffb5fbf4b815caf4cb6ace1 Allow disabling of library download compression types --- a/lib/galaxy/web/controllers/library_common.py +++ b/lib/galaxy/web/controllers/library_common.py @@ -109,6 +109,13 @@ class LibraryCommon( BaseController ): comptypes_t = comptypes if trans.app.config.nginx_x_archive_files_base: comptypes_t = ['ngxzip'] + for comptype in trans.app.config.disable_library_comptypes: + # TODO: do this once, not every time (we're gonna raise an + # exception every time after the first time) + try: + comptypes_t.remove( comptype ) + except: + pass return trans.fill_template( '/library/common/browse_library.mako', cntrller=cntrller, use_panels=use_panels, --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -98,6 +98,7 @@ class Configuration( object ): if self.user_library_import_dir is not None and not os.path.exists( self.user_library_import_dir ): raise ConfigurationError( "user_library_import_dir specified in config (%s) does not exist" % self.user_library_import_dir ) self.allow_library_path_paste = kwargs.get( 'allow_library_path_paste', False ) + self.disable_library_comptypes = kwargs.get( 'disable_library_comptypes', '' ).lower().split( ',' ) # Configuration options for taking advantage of nginx features self.upstream_gzip = string_as_bool( kwargs.get( 'upstream_gzip', False ) ) self.apache_xsendfile = kwargs.get( 'apache_xsendfile', False )