changed bypass perms to accept a list of models to bypass rather than a bool

Author: nalduu

etc/woudc-contributor-feedback.txt

@@ -5,6 +5,9 @@ Data submissions now require the content, data generation, platform, instrument
 
 Where possible, your submitted files have been manually repaired to contain the correct metadata information and resubmitted on your behalf.  You do not need to resubmit the files, but please update your procedures to use the correct metadata for all future submissions.  (Detailed data submission requirements are here: https://guide.woudc.org/en/#chapter-3-standard-data-format).
 
+For future submissions, you can validate your data using the WOUDC validator tool: https://woudc.org/en/contributors/validation
+This tool will check your submission for any warnings or errors. We recommend you fix all warnings and errors for your data to pass. This will reduce the amount of files that we will need to manually repair or fail.
+
 If your station, platform, agency or contact information have been updated then please reply to this message with the updated information.
 Thank you for your support of WOUDC.
 

woudc_data_registry/controller.py

@@ -233,8 +233,9 @@ def data():
               help='Path to main output directory for logs and reports')
 @click.option('--lax', '-l', 'lax', is_flag=True,
               help='Only validate core metadata tables')
-@click.option('--yes', '-y', 'bypass', is_flag=True, default=False,
-              help='Bypass permission prompts while ingesting')
+@click.option('--yes', '-y', 'bypass', type=str, is_flag=False, default=False,
+              help='list of models to bypass permission prompts for '
+              'while ingesting')
 def ingest(ctx, source, reports_dir, lax, bypass, verbosity):
     """ingest a single data submission or directory of files"""
 
@@ -250,8 +251,9 @@ def ingest(ctx, source, reports_dir, lax, bypass, verbosity):
                                           dir_okay=True, file_okay=True))
 @click.option('--lax', '-l', 'lax', is_flag=True,
               help='Only validate core metadata tables')
-@click.option('--yes', '-y', 'bypass', is_flag=True, default=False,
-              help='Bypass permission prompts while ingesting')
+@click.option('--yes', '-y', 'bypass', type=str, is_flag=False, default=False,
+              help='list of models to bypass permission prompts for '
+              'while ingesting')
 def verify(ctx, source, lax, bypass, verbosity):
     """verify a single data submission or directory of files"""
 

woudc_data_registry/processing.py

@@ -153,7 +153,8 @@ def validate(self, extcsv, metadata_only=False, verify_only=False,
         else:
             contributor_ok = self.check_contributor()
 
-        platform_ok = self.check_station(bypass=bypass, verify=verify_only)
+        platform_ok = self.check_station(bypass=('station' in bypass),
+                                         verify=verify_only)
 
         if not all([project_ok, contributor_ok, platform_ok]):
             LOGGER.warning('Skipping deployment check: depends on'
@@ -175,7 +176,7 @@ def validate(self, extcsv, metadata_only=False, verify_only=False,
                 if verify_only:
                     LOGGER.info('Verify mode. Skipping deployment addition.')
                     deployment_ok = True
-                elif self.add_deployment(bypass=bypass):
+                elif self.add_deployment(bypass=('deployment' in bypass)):
                     deployment_ok = True
 
                     self._add_to_report(407)
@@ -227,7 +228,8 @@ def validate(self, extcsv, metadata_only=False, verify_only=False,
                                     ' addition.')
                         instrument_ok = True
                     else:
-                        instrument_ok = self.add_instrument(bypass=bypass)
+                        instrument_ok = self.add_instrument(bypass=(
+                            'instrument' in bypass))
 
                     if instrument_ok:
                         self._add_to_report(406)
@@ -254,7 +256,8 @@ def validate(self, extcsv, metadata_only=False, verify_only=False,
         elif contribution_ok:
             contribution_exists = self.check_contribution()
             if not contribution_exists:
-                contribution_ok = self.add_contribution(bypass=bypass)
+                contribution_ok = self.add_contribution(bypass=(
+                    'contribution' in bypass))
 
             if contribution_ok and (not contribution_exists):
                 self._add_to_report(409)