Cleanup

generator/catalog.py

@@ -10,7 +10,7 @@ import sys
 if __name__ == '__main__' and __package__ is None:
   sys.path.insert(0, str(pathlib.Path(__file__).resolve().parents[1]))
 
-import generator.performance
+import generator.audio_assets
 
 APPLICATION_ID = 0x56414D50
 SONG_COLUMNS = """
@@ -58,12 +58,12 @@ def populate(connection: sqlite3.Connection, root: pathlib.Path, audio_assets=No
     for path in sorted(root.glob('sounds/*.wav')):
       if path.name not in ('beat1.wav', 'beat2.wav'):
         raise ValueError(f'{path}: unknown metronome sample')
-      audio_assets.append(generator.performance.describe_wav(path, root))
+      audio_assets.append(generator.audio_assets.describe_wav(path, root))
     for path in sorted(root.glob('backing/*.wav')):
       match = re.fullmatch(r'([a-z0-9]+(?:_[a-z0-9]+)*)_(60|70|80|90|100|110|120)\.wav', path.name)
       if not match:
         raise ValueError(f'{path}: invalid backing filename')
-      audio_assets.append(generator.performance.describe_wav(path, root, song_id=match[1], bpm=int(match[2])))
+      audio_assets.append(generator.audio_assets.describe_wav(path, root, song_id=match[1], bpm=int(match[2])))
   folder = root / 'songs'
   if (folder.exists() or folder.is_symlink()) and not folder.is_dir():
     raise ValueError(f'{folder}: score asset directory not found')