Finialize metadata validation

bin/bootstrap.py

@@ -94,7 +94,7 @@ example:
 def data(args):
     log.info('Inspecting  %s' % args.path)
     files = []
-    schema_validator = validators.payload_from_schema_file(None, 'uploader.json')
+    schema_validator = validators.payload_from_schema_file('uploader.json')
     with requests.Session() as rs:
         rs.verify = not args.insecure
         rs.headers = HTTP_HEADERS
@@ -120,11 +120,11 @@ def data(args):
                     log.info('Packaging   %s' % dirpath)
                     filepath = create_archive(dirpath, os.path.basename(dirpath), metadata, tempdir, filenames)
                     filename = os.path.basename(filepath)
-                    metadata['acquisition'].setdefault('files', [{}])[0]['name'] = filename
+                    metadata.setdefault('acquisition', {}).setdefault('files', [{}])[0]['name'] = filename
                     log.info('Validating  %s' % filename)
                     try:
                         schema_validator(metadata, 'POST')
-                    except Exception:
+                    except validators.InputValidationException:
                         log.warning('Skipping    %s: Invalid metadata' % dirpath)
                         continue
                     log.info('Uploading   %s' % filename)

bin/run.sh

@@ -168,7 +168,7 @@ fi
 TESTDATA_REPO="https://github.com/scitran/testdata.git"
 if [ ! -d "$SCITRAN_PERSISTENT_PATH/testdata" ]; then
     echo "Cloning testdata to $SCITRAN_PERSISTENT_PATH/testdata"
-    git clone --single-branch --branch bootstrap $TESTDATA_REPO $SCITRAN_PERSISTENT_PATH/testdata
+    git clone --single-branch $TESTDATA_REPO $SCITRAN_PERSISTENT_PATH/testdata
 else
     echo "Updating testdata in $SCITRAN_PERSISTENT_PATH/testdata"
     git -C $SCITRAN_PERSISTENT_PATH/testdata pull