Rhythm Selection & Cleanup

generator/score.py

@@ -1,46 +1,45 @@
 from __future__ import annotations
 
 import copy
-import hashlib
 import json
+import pathlib
 import re
-from pathlib import Path
 
-from generator.model import validate_document
+import generator.engraving.validation
+import generator.model
+import generator.pico_artwork
+import generator.playback
 
-def load_json(path: Path) -> dict:
+def load_json(path: pathlib.Path) -> dict:
   document = json.loads(path.read_text(encoding='utf-8'))
   return validate_json(document, path)
 
-def validate_json(document: dict, path: Path) -> dict:
+def validate_json(document: dict, path: pathlib.Path, validated_pages: set[str] | None = None) -> dict:
   if not isinstance(document, dict):
     raise ValueError('expected a score object')
   if 'music' in document:
-    from generator.engraving import ENGINE_NAME, PAGE_HEIGHT, PAGE_WIDTH, check_page
     presentation = document.get('presentation', {})
     if not isinstance(document['music'], dict) or not isinstance(presentation, dict) or not isinstance(presentation.get('pages'), list) or not presentation['pages']:
       raise ValueError('invalid score bundle; regenerate score assets')
-    if (presentation.get('engine'), presentation.get('width'), presentation.get('height')) != (ENGINE_NAME, PAGE_WIDTH, PAGE_HEIGHT):
+    if (presentation.get('engine'), presentation.get('width'), presentation.get('height')) != (generator.engraving.validation.ENGINE_NAME, generator.engraving.validation.PAGE_WIDTH, generator.engraving.validation.PAGE_HEIGHT):
       raise ValueError('unsupported score presentation; regenerate score assets')
     for page in presentation['pages']:
       if not isinstance(page, dict) or not isinstance(page.get('path'), str) or not isinstance(page.get('sha256'), str):
         raise ValueError('invalid score page manifest')
       name = page['path']
-      relative = Path(name)
+      relative = pathlib.Path(name)
       if '\x00' in name or '\\' in name or relative.is_absolute() or any(part in ('', '.', '..') for part in name.split('/')) or relative.suffix != '.png':
         raise ValueError('invalid score page path')
       resolved = (path.parent / relative).resolve()
       if not resolved.is_relative_to(path.parent.resolve()):
         raise ValueError('score page escapes its asset directory')
-      if not re.fullmatch('[0-9a-f]{64}', page['sha256']) or hashlib.sha256(resolved.read_bytes()).hexdigest() != page['sha256']:
-        raise ValueError('score page checksum mismatch')
-      check_page(resolved)
+      generator.engraving.validation.check_page(resolved, validated_pages, expected_sha256=page['sha256'])
     document = document['music']
-  validate_document(document)
+  generator.model.validate_document(document)
   return document
 
-def write_json(path: Path, document: dict) -> None:
-  validate_document(document)
+def write_json(path: pathlib.Path, document: dict) -> None:
+  generator.model.validate_document(document)
   path.parent.mkdir(parents=True, exist_ok=True)
   path.write_text(json.dumps(document, indent=2, ensure_ascii=False) + '\n', encoding='utf-8')
 
@@ -121,14 +120,16 @@ def reidentify(measures: list[dict], source_tuplets: list[dict]) -> list[dict]:
 def make_arranged_document(source_document: dict, staff: dict, *, staff_id: str, staff_name: str, role: str, arrangement_part_type: str, measures: list[dict], tuplets=None, octave_shifts=None) -> dict:
   return {'metadata': copy.deepcopy(source_document['metadata']), 'staves': [{'id': staff_id, 'name': staff_name, 'clef': copy.deepcopy(staff['clef']), 'role': role, 'arranged': True, 'arrangement_part_type': arrangement_part_type, 'measures': measures, 'tuplets': tuplets or [], 'octave_shifts': copy.deepcopy(octave_shifts or []), 'instruments': copy.deepcopy(staff.get('instruments', []))}]}
 
-def count_json_files(root: Path) -> int:
+def count_json_files(root: pathlib.Path) -> int:
   return sum(1 for p in root.rglob('*.json') if p.is_file())
 
-def validate_generated_tree(root: Path) -> None:
+def validate_generated_tree(root: pathlib.Path, validated_pages: set[str] | None = None) -> None:
   audio_cache = {}
+  validated_pages = set() if validated_pages is None else validated_pages
   for path in root.rglob('*.json'):
     document = json.loads(path.read_text(encoding='utf-8'))
-    validate_json(document, path)
+    validate_json(document, path, validated_pages)
+    if 'presentation' in document:
+      generator.pico_artwork.validate_title(root, document['presentation'].get('title_image'))
     if 'playback' in document:
-      from generator.playback import validate_assets
-      validate_assets(document['playback'], root, audio_cache)
+      generator.playback.validate_assets(document['playback'], root, audio_cache)