Changeset 36015 for main/trunk

Timestamp:

2022-01-17T23:02:44+13:00 (2 years ago)

Author:

davidb

Message:

Changes after testing

File:

• main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/08b-COPY-CSV-AND-AUDIO-FEATURES-TO-IMPORT_support.py (modified) (3 diffs)

main/trunk/model-sites-dev/eurovision-lod/collect/eurovision/prepare/08b-COPY-CSV-AND-AUDIO-FEATURES-TO-IMPORT_support.py

@@ -60 +60 @@
 
      for f in os.listdir(audio_year_dir):
-          if re.search(r"\.json$",f):
+          if re.search(r"\.json$",f) and (not f.endswith("-musicbrainz.json")):
                year_entrant = os.path.join(year,f)
                all_af_json_files.append(year_entrant)
@@ -178 +178 @@
           af_nul_file_errata = None
           
-          if af_nul_file == "Germany1956Imw.nul":
-               af_nul_file_errata = "Germany1956ImW.nul"
+          #if af_nul_file == "Germany1956Imw.nul":
+          #     af_nul_file_errata = "Germany1956ImW.nul"
 
           if af_nul_file == "Yugoslavia1992.nul":
@@ -230 +230 @@
           shutil.copy(src_json_file,dst_assoc_json_file)
                     
-
+          src_musicbrainz_json_file = src_json_file.replace(".json","-musicbrainz.json")
+          dst_musicbrainz_json_file = re.sub(r"^(.*)/(.*?)-Essentia.json",r"\g<1>/metadata-\g<2>-musicbrainz.json",dst_json_file)
+
+          if os.path.exists(src_musicbrainz_json_file):
+               print("  Copying: " + src_musicbrainz_json_file + " => " + dst_musicbrainz_json_file)
+               shutil.copy(src_musicbrainz_json_file,dst_musicbrainz_json_file)
+
+          
 # Sort out contestant CSV files to copy into ../import area