Fix font subset failure handling

Correct font subsetting flow and tidy imports. planner.py: import FontSubsetIntent and move subset-failure handling to use config.font.subset_failure_action (ensures fallback-full falls back to full fonts instead of skipping video); remove duplicated/incorrect code path. muxer.py: small import cleanup and add module logger. Tests: adjust import ordering in test_ass_font_embedder, test_font_subset, and test_muxer to match refactors. This fixes a bug where subsetting failures could incorrectly block muxing.

Author: Masterain98

plexmuxy/muxer.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import logging
 import os
 import re
 import subprocess
@@ -9,9 +10,7 @@
 from collections import Counter
 from dataclasses import replace
 from pathlib import Path
-from typing import Any, Iterable
-
-import logging
+from typing import Any
 
 from .ass_font_embedder import embed_fonts_into_ass
 from .dependencies import resolve_mkvmerge
@@ -28,7 +27,6 @@
     font_mime_type_for_suffix,
 )
 
-
 logger = logging.getLogger(__name__)
 
 

plexmuxy/planner.py

@@ -16,6 +16,7 @@
     AttachmentPlan,
     AudioTrackPlan,
     FontResult,
+    FontSubsetIntent,
     FontUsage,
     MuxPlan,
     PlanBuildResult,
@@ -205,6 +206,15 @@ def plan_font_subsets(
         # paths are display-only here; the muxer ignores them in the subset-success
         # path and only uses ``plan.attachments`` for the fallback-full policy.
         return _subset_preview_fonts(intent), intent, warnings, None
+    # Subset failures are governed by subset_failure_action (default "fallback-full"),
+    # NOT missing_font_action (which only applies to the "referenced" font mode). Using
+    # the wrong field here meant subsetting always skipped the video instead of falling
+    # back to the full fonts, even with the default fallback policy.
+    warnings.extend(f"{issue.code}:{issue.message}" for issue in intent.issues)
+    if config.font.subset_failure_action == "fallback-full":
+        return fonts, intent, [*warnings, "font_subset_fallback_all"], None
+    reason = "font_subset_blocked"
+    return [], intent, warnings, reason
 
 
 def _subset_preview_fonts(intent: FontSubsetIntent) -> list[Path]:
@@ -225,16 +235,6 @@ def _subset_preview_fonts(intent: FontSubsetIntent) -> list[Path]:
                 paths.append(resolved)
     return paths
 
-    warnings.extend(f"{issue.code}:{issue.message}" for issue in intent.issues)
-    # Subset failures are governed by subset_failure_action (default "fallback-full"),
-    # NOT missing_font_action (which only applies to the "referenced" font mode). Using
-    # the wrong field here meant subsetting always skipped the video instead of falling
-    # back to the full fonts, even with the default fallback policy.
-    if config.font.subset_failure_action == "fallback-full":
-        return fonts, intent, [*warnings, "font_subset_fallback_all"], None
-    reason = "font_subset_blocked"
-    return [], intent, warnings, reason
-
 
 def build_output_path(video: Path, input_dir: Path, config: AppConfig) -> Path:
     output_dir = resolve_output_dir(video, input_dir, config)

tests/test_ass_font_embedder.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 import re
+from pathlib import Path
 
 from fontTools.ttLib import TTFont
-from pathlib import Path
 
 from plexmuxy.ass_font_embedder import embed_fonts_into_ass
-
 from tests.font_test_utils import build_test_ttf
 
 

tests/test_font_subset.py

@@ -7,7 +7,7 @@
 from fontTools.ttLib import TTCollection, TTFont
 
 from plexmuxy.font_catalog import build_font_catalog
-from plexmuxy.font_subset import FontSubsetError, validate_subset_font, subset_font_face
+from plexmuxy.font_subset import FontSubsetError, subset_font_face, validate_subset_font
 from tests.font_test_utils import build_test_ttf
 
 

tests/test_muxer.py

@@ -1,9 +1,8 @@
 from pathlib import Path
 
 from plexmuxy.config import default_config
-from plexmuxy.models import AttachmentPlan, MuxPlan, MuxResult, SubtitleTrackPlan
+from plexmuxy.models import AttachmentPlan, MuxPlan, MuxResult, PreparedMuxPlan, SubtitleTrackPlan
 from plexmuxy.muxer import execute_mux_plan, execute_prepared_mux_plan
-from plexmuxy.models import PreparedMuxPlan
 from tests.font_test_utils import build_test_ttf