opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upload optimization - eliminate second call to check_binary in upload.py.

Browse Source
This commit is contained in:
John Chilton
2017-12-15 13:24:44 -05:00
parent 7e7dc249ab
commit 09f51f59af
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/data_source/upload.py
+3 -2
View File
@@ -123,7 +123,8 @@ def add_file(dataset, registry, json_file, output_path):
file_err('The uploaded file is empty', dataset, json_file)
return
# Is dataset content supported sniffable binary?
if check_binary(dataset.path):
is_binary = check_binary(dataset.path)
if is_binary:
# Sniff the data type
guessed_ext = sniff.guess_ext(dataset.path, registry.sniff_order)
# Set data_type only if guessed_ext is a binary datatype
@@ -259,7 +260,7 @@ def add_file(dataset, registry, json_file, output_path):
dataset.name = uncompressed_name
data_type = 'zip'
if not data_type:
if check_binary(dataset.path) or registry.is_extension_unsniffable_binary(dataset.file_type):
if is_binary or registry.is_extension_unsniffable_binary(dataset.file_type):
# We have a binary dataset, but it is not Bam, Sff or Pdf
data_type = 'binary'
parts = dataset.name.split(".")