task.py: get_original_filename()

server/web2py/applications/vidjil/models/sequence_file.py

 import defs
 import base64
 
+def get_original_filename(data_file):
+    return db.sequence_file.data_file.retrieve_file_properties(data_file)['filename']
+
 def get_new_uploaded_filename(data_file, new_filename):
     '''
     Rename the name given to a data_file uploaded by the user

server/web2py/applications/vidjil/models/task.py

@@ -663,7 +663,8 @@ def run_pre_process(pre_process_id, sequence_file_id, clean_before=True, clean_a
     db.commit()
     
     out_folder = defs.DIR_PRE_VIDJIL_ID % sequence_file_id
-    output_filename = get_preprocessed_filename(sequence_file.data_file, sequence_file.data_file2)
+    output_filename = get_preprocessed_filename(get_original_filename(sequence_file.data_file),
+                                                get_original_filename(sequence_file.data_file2))
     
     if clean_before:
         cmd = "rm -rf "+out_folder