changeset 52:1c7f86ab84aa draft

"planemo upload for repository https://github.com/rolfverberg/galaxytools commit d0260a00527c2d69ef0675b49c5d86730ec14303"
author rv43
date Thu, 28 Jul 2022 17:14:36 +0000
parents 5735b3d49897
children d34915cfd997
files tomo_setup.py
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tomo_setup.py	Thu Jul 28 17:02:40 2022 +0000
+++ b/tomo_setup.py	Thu Jul 28 17:14:36 2022 +0000
@@ -67,10 +67,15 @@
     # Check input file type
     print(f'inputfiles ({type(args.inputfiles)}):\n{args.inputfiles}')
     print(f'inputfile_types ({type(args.inputfile_types)}):\n{args.inputfile_types}')
-    if isinstance(args.inputfile_types, str) and args.inputfile_types == 'collection':
-        input_as_collection = True
-    elif isinstance(args.inputfile_types, list):
-        input_as_collection = False
+    if isinstance(args.inputfile_types, list):
+        if args.inputfile_types[0] == 'collection':
+            input_as_collection = True
+            if len(args.inputfiles) != 1 or args.inputfiles[0] != inputfiles.txt:
+                raise ValueError('Inconsistent inputfiles and inputfile_types:\n'+
+                        f'inputfiles ({type(inputfiles)}):\n{inputfiles}\n'+
+                        f'inputfile_types ({type(inputfile_types)}):\n{inputfile_types}')
+        else:
+            input_as_collection = False
     else:
         raise ValueError(f'Invalid args.inputfile_types: {args.inputfile_types} '+
                 f'{type(args.inputfile_types)}')