Don't Upload Metadata Catalogs

This patch makes pyCA not upload metadata catalogs by default since
Opencast holds them internally anyway.

etc/pyca.conf

@@ -142,12 +142,11 @@ command          = 'ffmpeg -nostats -re -f lavfi -r 25 -i testsrc -f lavfi -i si
 # Default: False
 #delete_after_upload = False
 
-# Skip ingesting metadata catalogs to Opencast. If you set this option to True,
-# Opencast will use the metadata catalogs from the scheduler service and do not
-# override these by the uploaded version from pyCA.
+# Defines if pyCA will upload dublin core catalogs to Opencast.
+# Deprecated: The option will be removed soon.
 # Type: boolean
 # Default: False
-# skip_catalogs   = False
+#upload_catalogs  = False
 
 
 [server]

pyca/config.py

@@ -36,7 +36,7 @@
 
 [ingest]
 delete_after_upload = boolean(default=false)
-skip_catalogs    = boolean(default=false)
+upload_catalogs  = boolean(default=false)
 
 [server]
 url              = string(default='https://develop.opencast.org')

pyca/ingest.py

@@ -68,19 +68,21 @@ def ingest(event):
         if attachment.get('x-apple-filename') == prop:
             workflow_def, workflow_config = get_config_params(data)
 
-        # Check for dublincore catalogs
-        elif attachment.get('fmttype') == 'application/xml' and dcns in data:
+        # dublin core catalogs
+        elif attachment.get('fmttype') == 'application/xml' \
+                and dcns in data \
+                and config('ingest', 'upload_catalogs'):
             name = attachment.get('x-apple-filename', '').rsplit('.', 1)[0]
-            if config('ingest', 'skip_catalogs'):
-                logger.info(
-                    'Skipping adding catalog %s due to configuration', name)
-                continue
             logger.info('Adding %s DC catalog', name)
             fields = [('mediaPackage', mediapackage),
                       ('flavor', 'dublincore/%s' % name),
                       ('dublinCore', data.encode('utf-8'))]
             mediapackage = http_request(service_url + '/addDCCatalog', fields)
 
+        else:
+            logger.info('Not uploading %s', attachment.get('x-apple-filename'))
+            continue
+
     # add track
     for (flavor, track) in event.get_tracks():
         logger.info('Adding track (%s -> %s)', flavor, track)