Merge pull request #34 from jessielw/rc2

Rc2

Author: jessielw

.github/workflows/build.yml

@@ -2,8 +2,9 @@ name: Build Desktop
 
 on:
   push:
-    # tags:
-    #   - 'v*'
+    branches: ["main"]
+  release:
+    types: [published]
   workflow_dispatch:
 
 jobs:

.gitignore

@@ -25,6 +25,7 @@ Thumbs.db
 # misc
 .scraps/
 
-# runtime
-runtime/
+# runtime (ignore everything except images)
+runtime/*
 !runtime/images/
+!runtime/.gitkeep

CHANGELOG.md

@@ -5,6 +5,47 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0-rc2] - 2025-12-07
+
+### Added
+
+- Pop up for failure to load MediaInfo
+- Multiple track import when opening a video on the **Video** tab:
+  - New window to select which track(s) a user would like to import
+    - This supports audio(s), subtitle(s) and chapters
+- Error handling when a file is opened for video file without a video track
+- Now detects language _(based off of MediaInfo)_ and applies it from input
+- Now detects title and applies it from input
+- Now detects default/forced flags where applicable and applies them from mediainfo if being imported from the video tab
+- Default flags to audio/subtitles
+  - Automatically unchecks other default flags if checked in another tab in the same category _(category: audio/subtitles)_
+- Forced flags to subtitles
+- Audio/subtitles are now importable from mp4/m4v files
+- Button to see where log files are stored in the settings panel
+- Now automatically cleans up log files over 50 log files ~1 seconds after UI initializes
+- Added a **Details** column in the **Output** tab that will allow the user to click on it in the event of a failure and see the output from mp4box when a job fails
+- Remembers last opened path in the context to open new file browsers at that same path
+- Generates a default output name based on the input from the video tab _(file input_new.mp4)_
+- Asks to overwrite if file already exists on adding new job to queue
+- Now attempts to detects language from filename as a fallback if mediainfo doesn't have it
+- Detects forced/foreign in subtitle filename and auto checks the track in the UI if input is not mp4/m4v
+
+### Changed
+
+- Subtitle tab now accepts **.mp4/.m4v**
+- Improved logging (still some work to be done)
+- All tabs contents are now wrapped in a scrolled area box - allowing the program to stay compact but also have larger default widget sizes if needed
+- Changed to a slightly better icon for the program (still could use improvement)
+- Error window pop can now be maximized
+
+### Fixed
+
+- Settings mp4box path was set to the wrong icon
+
+### Removed
+
+-
+
 ## [2.0.0-rc1] - 2025-12-07
 
 ### Added

build_desktop.py

@@ -36,7 +36,7 @@ def build_app():
 
     # define paths before changing directory
     desktop_script = Path(project_root / "frontend_desktop" / "main.py")
-    icon_path = Path(dev_runtime / "images" / "mp4mux.ico")
+    icon_path = Path(dev_runtime / "images" / "mp4.ico")
 
     # get extra deps
     # site_packages = get_site_packages()

core/job_states.py

@@ -61,6 +61,7 @@ class SubtitleState:
     title: str = ""
     default: bool = False
     forced: bool = False
+    track_id: int | None = None  # for multi-track MP4 inputs
 
     def to_dict(self) -> dict:
         """Convert to dictionary for serialization."""
@@ -70,6 +71,7 @@ def to_dict(self) -> dict:
             "title": self.title,
             "default": self.default,
             "forced": self.forced,
+            "track_id": self.track_id,
         }
 
 

core/muxer.py

@@ -189,7 +189,13 @@ def _mux_with_mp4box(self, job: MuxJob) -> None:
             # add subtitle tracks with default/forced logic
             subtitle_defaults_set = any(sub.default for sub in job.subtitle_tracks)
             for subtitle in job.subtitle_tracks:
-                subtitle_opts = ""
+                # determine track selector (for multi-track MP4 inputs)
+                if subtitle.track_id is not None:
+                    track_selector = f"#{subtitle.track_id}"
+                else:
+                    track_selector = "#text"  # default to first text track
+
+                subtitle_opts = track_selector
                 if subtitle.language:
                     subtitle_opts += f":lang={subtitle.language.part3}"
                 subtitle_opts += (

core/utils/autoqpf.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+from auto_qpf.enums import ChapterType
 from auto_qpf.generate_chapters import ChapterGenerator
 from pymediainfo import MediaInfo
 
@@ -13,3 +14,27 @@ def auto_gen_chapters(mi: MediaInfo) -> str | None:
     if isinstance(chapters, Path):
         raise RuntimeError("Chapters should only be str or None")
     return chapters
+
+
+def determine_chapter_type(mi: MediaInfo) -> str | None:
+    """Determine chapter type based on MediaInfo."""
+    mi_chaps = ChapterGenerator()._get_media_info_obj_chapters(mi)
+    if not mi_chaps:
+        return None
+    chapters_data = ChapterGenerator()._determine_chapter_type(mi_chaps)
+    if chapters_data:
+        try:
+            chap_enum = chapters_data[0]
+            if chap_enum is ChapterType.NUMBERED and len(chapters_data) >= 4:
+                chap_num_details = f" ({chapters_data[2]} - {chapters_data[3]})"
+            else:
+                chap_num_details = ""
+            chap_type_str_map = {
+                ChapterType.NAMED: "Named",
+                ChapterType.NUMBERED: f"Numbered{chap_num_details}",
+                ChapterType.TAGGED: "Tagged",
+            }
+
+            return chap_type_str_map[chap_enum]
+        except Exception:
+            return None

core/utils/language.py

@@ -1,3 +1,5 @@
+import re
+
 from iso639 import Language, LanguageNotFoundError
 from pymediainfo import Track
 
@@ -88,3 +90,54 @@ def get_language_obj(language_str: str) -> Language | None:
         except LanguageNotFoundError:
             return None
     return None
+
+
+def detect_language_from_filename(filename: str) -> Language | None:
+    """Detect language code from filename by searching for common patterns.
+
+    Looks for ISO 639-1 (2-letter), ISO 639-2 (3-letter), and common language names.
+    Prioritizes: naturally lowercase > naturally UPPERCASE > mixed case words
+
+    Args:
+        filename (str): The filename to search for language codes
+
+    Returns:
+        Language | None: Matched Language object or None
+    """
+    # remove extension but keep original case
+    name_no_ext = filename.rsplit(".", 1)[0]
+
+    # common patterns: "movie.eng.srt", "movie_eng_sub.srt", "movie.en.srt", etc.
+    # look for word boundaries or underscores/dots around language codes
+    patterns = [
+        r"[._-]([a-zA-Z]{2,3})[._-]",  # .eng. or _en_ or -jpn-
+        r"[._-]([a-zA-Z]{2,3})$",  # .eng or _en at end
+        r"^([a-zA-Z]{2,3})[._-]",  # eng. or en_ at start
+    ]
+
+    # collect all candidates with their case type
+    candidates = []
+    for pattern in patterns:
+        matches = re.finditer(pattern, name_no_ext)
+        for match in matches:
+            lang_code = match.group(1)
+            # determine case type for priority
+            if lang_code.islower():
+                priority = 0  # highest priority
+            elif lang_code.isupper():
+                priority = 1  # medium priority
+            else:
+                priority = 2  # lowest priority (mixed case)
+            candidates.append((priority, lang_code))
+
+    # sort by priority (lower number = higher priority)
+    candidates.sort(key=lambda x: x[0])
+
+    # try to match in priority order
+    for _, lang_code in candidates:
+        try:
+            return Language.match(lang_code.lower())
+        except LanguageNotFoundError:
+            continue
+
+    return None

frontend_desktop/context.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+from pathlib import Path
+
+
+@dataclass
+class Context:
+    """Holds shared context data for the frontend desktop application."""
+
+    last_used_path: Path | None = None
+
+
+context = Context()

frontend_desktop/global_signals.py

@@ -17,6 +17,19 @@ class GlobalSignals(QObject):
     # chapters
     chapters_updated = Signal(str)
 
+    # video audio tracks
+    video_audio_tracks_detected = Signal(
+        object, object, list
+    )  # MediaInfo, Path, selected_track_ids
+
+    # video subtitle tracks
+    video_subtitle_tracks_detected = Signal(
+        object, object, list
+    )  # MediaInfo, Path, selected_track_ids
+
+    # video generate output filepath
+    video_generate_output_filepath = Signal(object)  # suggested Path
+
     # scaling # TODO: add this feature in
     # scale_factor_changed_by_user = Signal(float)  # user hotkey changes (auto-save)
     # scale_factor_changed = Signal(float)  # all changes (UI sync)