From 7ff0e96ef4fc60ab3b9390451e90c3deb2c913d2 Mon Sep 17 00:00:00 2001 From: Alec Bertoy Date: Thu, 16 Nov 2023 13:43:33 -0600 Subject: [PATCH 1/4] fix vproc policies --- .../AJA_NTSC_VHS-2SAS-MKV.xml | 3 --- .../AJA_NTSC_VHS-2SAS-MOV.xml | 27 +++---------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MKV.xml b/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MKV.xml index dce4178..ea68b8b 100644 --- a/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MKV.xml +++ b/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MKV.xml @@ -17,8 +17,6 @@ V_MS/VFW/FOURCC / FFV1 720 486 - 0.909 - 1.347 CFR 29.970 NTSC @@ -28,7 +26,6 @@ Interlaced BFF Lossless - Matroska tags Yes No Yes diff --git a/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MOV.xml b/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MOV.xml index e0be976..bdd0e02 100644 --- a/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MOV.xml +++ b/nulrdcscripts/vproc/data/mediaconch_policies/AJA_NTSC_VHS-2SAS-MOV.xml @@ -2,22 +2,17 @@ 1 2 - 1 mov - QuickTime + QuickTime 29.970 - Apple QuickTime - Apple QuickTime 0 1 YUV v210 CBR 720 - 704 + 720 486 - 0.909 - 1.347 0.000 CFR 29.970 @@ -28,13 +23,12 @@ Interlaced BFF Lossless - en Yes BT.601 NTSC BT.709 BT.601 2 - 3 + 3 PCM Little Signed @@ -43,10 +37,7 @@ 2 48000 24 - No - Container - 3 - 4 + 3 PCM Little Signed @@ -55,14 +46,4 @@ 2 48000 24 - No - Container - 1 - 2 - Time code - QuickTime TC - 00:00:00:00 - Yes - Untitled - en From 70c248374c4c5d5d12c3782b56270eb12f673a0e Mon Sep 17 00:00:00 2001 From: Alec Bertoy Date: Fri, 17 Nov 2023 13:06:14 -0600 Subject: [PATCH 2/4] fix ingest x file parsing and work type identification --- nulrdcscripts/ingest/ingest.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/nulrdcscripts/ingest/ingest.py b/nulrdcscripts/ingest/ingest.py index 51795e7..8c70647 100644 --- a/nulrdcscripts/ingest/ingest.py +++ b/nulrdcscripts/ingest/ingest.py @@ -157,40 +157,47 @@ def main(): elif "parse" in args.aux_parse: aux_dict = { "front": { - "identifiers": ["Front."], + "identifiers": ["front", "Front"], "type": "pattern", "role": "X", "label": "asset front", "file_builder": "_auxiliary_", }, "back": { - "identifiers": ["Back."], + "identifiers": ["back", "Back"], "type": "pattern", "role": "X", "label": "asset back", "file_builder": "_auxiliary_", }, "asset": { - "identifiers": ["_Asset", "-Asset"], + "identifiers": ["_asset", "-asset", "_Asset", "-Asset"], "type": "pattern", "role": "X", "label": "asset", "file_builder": "_auxiliary_", }, "can": { - "identifiers": ["_Can", "-Can"], + "identifiers": ["_can", "-can", "_Can", "-Can"], "type": "pattern", "role": "X", "label": "can", "file_builder": "_auxiliary_", }, "ephemera": { - "identifiers": ["_Ephemera", "-Ephemera"], + "identifiers": ["_ephemera", "-ephemera", "_Ephemera", "-Ephemera"], "type": "pattern", "role": "X", "label": "ephemera", "file_builder": "_auxiliary_", }, + "auxiliary": { + "identifiers": ["_x", "-x"], + "type": "pattern", + "role": "X", + "label": "image", + "file_builder": "_auxiliary_", + } } # add the aux_dict to the beginning of the role_dict # this will catch X files that also have a/p identifiers in the filename @@ -439,9 +446,9 @@ def import_inventories(source_inventories): # work type is assumed by the presence of format-specific column headers if "Width (cm.)" in reader.fieldnames: work_type = "IMAGE" - elif "Speed IPS" in reader.fieldnames: + elif "speed IPS" or "Speed IPS" in reader.fieldnames: work_type = "AUDIO" - elif "Region" or "Stock" in reader.fieldnames: + elif "region" or "Region" or "stock" or "Stock" in reader.fieldnames: work_type = "VIDEO" else: print( From 4d357ba9c943b29ab64a674b15bd3c6131eead7b Mon Sep 17 00:00:00 2001 From: Alec Bertoy Date: Fri, 17 Nov 2023 13:11:35 -0600 Subject: [PATCH 3/4] update ingest readme --- nulrdcscripts/ingest/README.md | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/nulrdcscripts/ingest/README.md b/nulrdcscripts/ingest/README.md index 5209d4d..f2b3512 100644 --- a/nulrdcscripts/ingest/README.md +++ b/nulrdcscripts/ingest/README.md @@ -20,6 +20,11 @@ poetry run ingest -i INPUT_PATH -o OUTPUT_FILEPATH poetry run ingest -i INPUT_PATH -l INVENTORY_PATH ``` +### Parse x files by pattern +``` +poetry run ingest -i INPUT_PATH -x parse +``` + ### Skip ".md5" files ``` poetry run ingest -i INPUT_PATH -s .md5 @@ -27,7 +32,7 @@ poetry run ingest -i INPUT_PATH -s .md5 ### Custom description ``` -poetry run ingest -i INPUT_PATH -d "Date/Time" "Barcode" +poetry run ingest -i INPUT_PATH -d "date/time" "barcode" ``` ### Parse x files by filename @@ -64,15 +69,15 @@ input_folder |A|P|S|X| |:-------:|:-------:|:-------:|:-------:| |-a or _a|-p or _p|-s or _s|-x or _x| -|-am or _am|-pm or _pm|spectrogram|-Asset or _Asset| -|-am- or _am\_|-pm- or _pm\_|.json|Back.| -|||.log|-Can or _Can| -|||.pdf|-Ephemera or _Ephemera| -|||.xml|Front.| -|||.xml.gz| -|||.framemd5| -|||.qctool.mkv| -|||dpx.txt| +|-am or _am|-pm or _pm|spectrogram|-asset or _asset| +|-am- or _am\_|-pm- or _pm\_|.json|-Asset or _Asset| +|||.log|back or Back| +|||.pdf|front or Front| +|||.xml|-can or _can| +|||.xml.gz|-Can or _Can| +|||.framemd5|-ephemera or _ephemera| +|||.qctool.mkv|-Ephemera or _Ephemera| +|||dpx.txt|.jpg| Anything that can't be identified will be set to 'S' From ac7e1b14e45a3e606c5a42ac0c48f8a9e3436960 Mon Sep 17 00:00:00 2001 From: Alec Bertoy Date: Fri, 17 Nov 2023 13:13:48 -0600 Subject: [PATCH 4/4] readme fix --- nulrdcscripts/ingest/README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nulrdcscripts/ingest/README.md b/nulrdcscripts/ingest/README.md index f2b3512..a888134 100644 --- a/nulrdcscripts/ingest/README.md +++ b/nulrdcscripts/ingest/README.md @@ -20,7 +20,7 @@ poetry run ingest -i INPUT_PATH -o OUTPUT_FILEPATH poetry run ingest -i INPUT_PATH -l INVENTORY_PATH ``` -### Parse x files by pattern +### Parse x files by filename ``` poetry run ingest -i INPUT_PATH -x parse ``` @@ -35,11 +35,6 @@ poetry run ingest -i INPUT_PATH -s .md5 poetry run ingest -i INPUT_PATH -d "date/time" "barcode" ``` -### Parse x files by filename -``` -poetry run ingest -i INPUT_PATH -x parse -``` - ### Example File Structure ``` input_folder