Compare commits
3
Commits
db460fb9b3
...
v1.0.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
69f759b6ce | ||
|
|
c54ee7876c | ||
|
|
9ba2c68ff9 |
Binary file not shown.
+8
-10
@@ -14,7 +14,8 @@ VERSION="$(tr -d '[:space:]' < VERSION 2>/dev/null || echo "")"
|
|||||||
echo "=== Installing build deps ==="
|
echo "=== Installing build deps ==="
|
||||||
pip install -q -r requirements.txt -r requirements-build.txt
|
pip install -q -r requirements.txt -r requirements-build.txt
|
||||||
|
|
||||||
echo "=== Running PyInstaller ==="
|
echo "=== Running PyInstaller (clean) ==="
|
||||||
|
rm -rf build dist HSRename.spec
|
||||||
pyinstaller --noconfirm --onedir --windowed \
|
pyinstaller --noconfirm --onedir --windowed \
|
||||||
-n "$EXE_NAME" \
|
-n "$EXE_NAME" \
|
||||||
--hidden-import=engine \
|
--hidden-import=engine \
|
||||||
@@ -36,13 +37,6 @@ echo "$VERSION" > "$APPDIR/usr/share/hsrename/VERSION"
|
|||||||
if [[ -f "packaging/release-stamp-${VERSION}.txt" ]]; then
|
if [[ -f "packaging/release-stamp-${VERSION}.txt" ]]; then
|
||||||
cp "packaging/release-stamp-${VERSION}.txt" "$APPDIR/usr/share/hsrename/release-stamp.txt"
|
cp "packaging/release-stamp-${VERSION}.txt" "$APPDIR/usr/share/hsrename/release-stamp.txt"
|
||||||
fi
|
fi
|
||||||
# Gear Lever compares file sizes; incompressible pad for patch releases (zeros squash to nothing).
|
|
||||||
dd if=/dev/urandom of="$APPDIR/usr/share/hsrename/.buildpad" bs=1024 count=300 status=none
|
|
||||||
cat > "$APPDIR/usr/share/hsrename/changelog.txt" << EOF
|
|
||||||
HSRename ${VERSION}
|
|
||||||
- Fix TheTVDB search dropping results (parse series-76320 style IDs)
|
|
||||||
- Gear Lever Forgejo update docs
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > "$APPDIR/AppRun" << EOF
|
cat > "$APPDIR/AppRun" << EOF
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
@@ -70,7 +64,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "=== Building AppImage (requires appimagetool) ==="
|
echo "=== Building AppImage (requires appimagetool) ==="
|
||||||
# Note: appimagetool does not accept plain https URLs for -u; use zsync/gh-releases-zsync per AppImage docs.
|
|
||||||
if command -v appimagetool &>/dev/null; then
|
if command -v appimagetool &>/dev/null; then
|
||||||
OUT="${APP_NAME}.AppImage"
|
OUT="${APP_NAME}.AppImage"
|
||||||
appimagetool "$APPDIR" "$OUT"
|
appimagetool "$APPDIR" "$OUT"
|
||||||
@@ -79,5 +72,10 @@ else
|
|||||||
echo "AppDir is ready at $APPDIR/"
|
echo "AppDir is ready at $APPDIR/"
|
||||||
echo "To create the .AppImage, install appimagetool and run:"
|
echo "To create the .AppImage, install appimagetool and run:"
|
||||||
echo " appimagetool $APPDIR ${APP_NAME}.AppImage"
|
echo " appimagetool $APPDIR ${APP_NAME}.AppImage"
|
||||||
echo " # Get it from: https://github.com/AppImage/appimagetool/releases"
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! strings "dist/$EXE_NAME/$EXE_NAME" | grep -q "engine.tvdb_client"; then
|
||||||
|
echo "ERROR: Built executable is missing TheTVDB modules." >&2
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
+172
-77
@@ -4,63 +4,149 @@ Match episode titles from filenames against a reference episode list (e.g. TheTV
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
from dataclasses import dataclass
|
||||||
from difflib import SequenceMatcher
|
from difflib import SequenceMatcher
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from .tvdb_client import TvdbEpisode
|
from .tvdb_client import TvdbEpisode
|
||||||
|
|
||||||
DEFAULT_EPISODE_PATTERN = r"(.*?[Ss]\d+[Ee])(\d+)(-[Ee](\d+))?(.*)"
|
# S01E05 - Title or S01E05-E06 - Title
|
||||||
|
PATTERN_SXXEXX = re.compile(
|
||||||
|
r"^(.*?[Ss])(\d+)([Ee])(\d+)(-[Ee](\d+))?(.*)$",
|
||||||
|
)
|
||||||
|
# Show Name 04x01 Title, 4x01 - Title, etc.
|
||||||
|
PATTERN_NXNN = re.compile(
|
||||||
|
r"^(.*?)(\d{1,2})[xX](\d{1,4})(?:([\s._-]+)(.+))?$",
|
||||||
|
)
|
||||||
|
|
||||||
|
DEFAULT_EPISODE_PATTERN = PATTERN_SXXEXX.pattern
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class EpisodeTarget:
|
||||||
|
season: int
|
||||||
|
episode: int
|
||||||
|
|
||||||
|
|
||||||
def normalize_title(title: str) -> str:
|
def normalize_title(title: str) -> str:
|
||||||
"""Lowercase, strip punctuation, collapse whitespace for fuzzy comparison."""
|
"""Lowercase, strip punctuation, collapse whitespace for fuzzy comparison."""
|
||||||
t = title.lower()
|
t = title.lower()
|
||||||
t = re.sub(r"[^\w\s]", " ", t, flags=re.UNICODE)
|
t = re.sub(r"[^\w\s]", " ", t, flags=re.UNICODE)
|
||||||
return re.sub(r"\s+", " ", t).strip()
|
t = re.sub(r"\s+", " ", t).strip()
|
||||||
|
if t.startswith("the "):
|
||||||
|
t = t[4:]
|
||||||
|
return t
|
||||||
|
|
||||||
|
|
||||||
def parse_episode_stem(stem: str, pattern: str = DEFAULT_EPISODE_PATTERN) -> Optional[dict]:
|
def _clean_title(rest: str) -> str:
|
||||||
"""
|
|
||||||
Parse SxxExx-style filename stem.
|
|
||||||
Returns dict with prefix, episode numbers, title rest, and span — or None if no match.
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
m = re.match(pattern, stem)
|
|
||||||
except re.error:
|
|
||||||
return None
|
|
||||||
if not m:
|
|
||||||
return None
|
|
||||||
prefix, old_first_s, _range_dash_e, old_second_s, rest = (
|
|
||||||
m.group(1),
|
|
||||||
m.group(2),
|
|
||||||
m.group(3),
|
|
||||||
m.group(4),
|
|
||||||
m.group(5),
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
old_first = int(old_first_s)
|
|
||||||
except ValueError:
|
|
||||||
return None
|
|
||||||
span = 1
|
|
||||||
if old_second_s is not None:
|
|
||||||
try:
|
|
||||||
old_second = int(old_second_s)
|
|
||||||
except ValueError:
|
|
||||||
return None
|
|
||||||
span = old_second - old_first + 1
|
|
||||||
if span < 1:
|
|
||||||
span = 1
|
|
||||||
title = rest.strip()
|
title = rest.strip()
|
||||||
|
for prefix in ("- ", "– ", "_ ", ". "):
|
||||||
|
if title.startswith(prefix):
|
||||||
|
title = title[len(prefix) :].strip()
|
||||||
if title.startswith("-") or title.startswith("–"):
|
if title.startswith("-") or title.startswith("–"):
|
||||||
title = title[1:].strip()
|
title = title[1:].strip()
|
||||||
if title.startswith("_"):
|
if title.startswith("_"):
|
||||||
title = title[1:].strip()
|
title = title[1:].strip()
|
||||||
return {
|
return title
|
||||||
"prefix": prefix,
|
|
||||||
"old_first": old_first,
|
|
||||||
"span": span,
|
def parse_episode_stem(stem: str, pattern: str = DEFAULT_EPISODE_PATTERN) -> Optional[dict]:
|
||||||
"title": title,
|
"""
|
||||||
}
|
Parse common TV filename stems (S01E05 or 04x01 styles).
|
||||||
|
Returns dict with format, season, episode, title, padding hints — or None.
|
||||||
|
"""
|
||||||
|
del pattern # legacy param; auto-detect formats instead
|
||||||
|
|
||||||
|
m = PATTERN_SXXEXX.match(stem)
|
||||||
|
if m:
|
||||||
|
prefix_before_s, season_s, _e, ep_s, _dash, ep2_s, rest = m.groups()
|
||||||
|
try:
|
||||||
|
season = int(season_s)
|
||||||
|
old_first = int(ep_s)
|
||||||
|
except ValueError:
|
||||||
|
return None
|
||||||
|
span = 1
|
||||||
|
if ep2_s is not None:
|
||||||
|
try:
|
||||||
|
old_second = int(ep2_s)
|
||||||
|
except ValueError:
|
||||||
|
return None
|
||||||
|
span = old_second - old_first + 1
|
||||||
|
if span < 1:
|
||||||
|
span = 1
|
||||||
|
title = _clean_title(rest)
|
||||||
|
return {
|
||||||
|
"format": "sxxexx",
|
||||||
|
"prefix_before_s": prefix_before_s,
|
||||||
|
"season": season,
|
||||||
|
"season_pad": len(season_s),
|
||||||
|
"episode_pad": len(ep_s),
|
||||||
|
"old_first": old_first,
|
||||||
|
"span": span,
|
||||||
|
"title": title,
|
||||||
|
"suffix": rest,
|
||||||
|
}
|
||||||
|
|
||||||
|
m = PATTERN_NXNN.match(stem)
|
||||||
|
if m:
|
||||||
|
prefix, season_s, ep_s, sep, title_part = m.groups()
|
||||||
|
try:
|
||||||
|
season = int(season_s)
|
||||||
|
episode = int(ep_s)
|
||||||
|
except ValueError:
|
||||||
|
return None
|
||||||
|
title = _clean_title(title_part or "")
|
||||||
|
sep = sep or " "
|
||||||
|
if title and not sep.strip():
|
||||||
|
sep = " "
|
||||||
|
return {
|
||||||
|
"format": "nxnn",
|
||||||
|
"prefix": prefix,
|
||||||
|
"season": season,
|
||||||
|
"season_pad": len(season_s),
|
||||||
|
"episode_pad": len(ep_s),
|
||||||
|
"old_first": episode,
|
||||||
|
"span": 1,
|
||||||
|
"title": title,
|
||||||
|
"title_sep": sep,
|
||||||
|
}
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def rewrite_episode_stem(
|
||||||
|
stem: str,
|
||||||
|
target: EpisodeTarget,
|
||||||
|
padding: int = 2,
|
||||||
|
pattern: str = DEFAULT_EPISODE_PATTERN,
|
||||||
|
) -> str:
|
||||||
|
"""Replace season/episode block in stem, preserving layout and title."""
|
||||||
|
parsed = parse_episode_stem(stem, pattern)
|
||||||
|
if not parsed:
|
||||||
|
return stem
|
||||||
|
|
||||||
|
pad = max(1, padding)
|
||||||
|
new_season = target.season
|
||||||
|
new_ep = target.episode
|
||||||
|
title = parsed["title"]
|
||||||
|
span = parsed["span"]
|
||||||
|
|
||||||
|
if parsed["format"] == "nxnn":
|
||||||
|
s_pad = max(parsed["season_pad"], len(str(new_season)))
|
||||||
|
e_pad = max(parsed["episode_pad"], pad, len(str(new_ep)))
|
||||||
|
block = f"{new_season:0{s_pad}d}x{new_ep:0{e_pad}d}"
|
||||||
|
if title:
|
||||||
|
return f"{parsed['prefix']}{block}{parsed['title_sep']}{title}"
|
||||||
|
return f"{parsed['prefix']}{block}"
|
||||||
|
|
||||||
|
s_pad = max(parsed["season_pad"], len(str(new_season)))
|
||||||
|
e_pad = max(parsed["episode_pad"], pad, len(str(new_ep)))
|
||||||
|
e1 = str(new_ep).zfill(e_pad)
|
||||||
|
prefix = f"{parsed['prefix_before_s']}S{new_season:0{s_pad}d}E"
|
||||||
|
if span <= 1:
|
||||||
|
return f"{prefix}{e1}{parsed['suffix']}"
|
||||||
|
e2 = str(new_ep + span - 1).zfill(e_pad)
|
||||||
|
return f"{prefix}{e1}-E{e2}{parsed['suffix']}"
|
||||||
|
|
||||||
|
|
||||||
def rewrite_episode_number(
|
def rewrite_episode_number(
|
||||||
@@ -69,25 +155,16 @@ def rewrite_episode_number(
|
|||||||
padding: int = 2,
|
padding: int = 2,
|
||||||
pattern: str = DEFAULT_EPISODE_PATTERN,
|
pattern: str = DEFAULT_EPISODE_PATTERN,
|
||||||
) -> str:
|
) -> str:
|
||||||
"""Replace episode number block in stem, preserving prefix, span, and title."""
|
"""Legacy helper: episode only, keep season from filename."""
|
||||||
parsed = parse_episode_stem(stem, pattern)
|
parsed = parse_episode_stem(stem, pattern)
|
||||||
if not parsed:
|
if not parsed:
|
||||||
return stem
|
return stem
|
||||||
try:
|
return rewrite_episode_stem(
|
||||||
m = re.match(pattern, stem)
|
stem,
|
||||||
except re.error:
|
EpisodeTarget(season=parsed["season"], episode=new_first_ep),
|
||||||
return stem
|
padding=padding,
|
||||||
if not m:
|
pattern=pattern,
|
||||||
return stem
|
)
|
||||||
prefix = m.group(1)
|
|
||||||
rest = m.group(5)
|
|
||||||
span = parsed["span"]
|
|
||||||
pad = max(1, padding)
|
|
||||||
e1 = str(new_first_ep).zfill(pad)
|
|
||||||
if span <= 1:
|
|
||||||
return f"{prefix}{e1}{rest}"
|
|
||||||
e2 = str(new_first_ep + span - 1).zfill(pad)
|
|
||||||
return f"{prefix}{e1}-E{e2}{rest}"
|
|
||||||
|
|
||||||
|
|
||||||
def _similarity(a: str, b: str) -> float:
|
def _similarity(a: str, b: str) -> float:
|
||||||
@@ -98,55 +175,73 @@ def _similarity(a: str, b: str) -> float:
|
|||||||
return SequenceMatcher(None, a, b).ratio()
|
return SequenceMatcher(None, a, b).ratio()
|
||||||
|
|
||||||
|
|
||||||
|
def _coerce_target(value: EpisodeTarget | tuple[int, int] | int, parsed: dict) -> EpisodeTarget:
|
||||||
|
if isinstance(value, EpisodeTarget):
|
||||||
|
return value
|
||||||
|
if isinstance(value, tuple):
|
||||||
|
return EpisodeTarget(season=int(value[0]), episode=int(value[1]))
|
||||||
|
return EpisodeTarget(season=parsed["season"], episode=int(value))
|
||||||
|
|
||||||
|
|
||||||
def match_filenames_to_episodes(
|
def match_filenames_to_episodes(
|
||||||
filenames: list[str],
|
filenames: list[str],
|
||||||
episodes: list[TvdbEpisode],
|
episodes: list[TvdbEpisode],
|
||||||
pattern: str = DEFAULT_EPISODE_PATTERN,
|
pattern: str = DEFAULT_EPISODE_PATTERN,
|
||||||
min_score: float = 0.72,
|
min_score: float = 0.65,
|
||||||
) -> tuple[dict[str, int], list[str], list[str]]:
|
season_filter: int = 0,
|
||||||
|
) -> tuple[dict[str, EpisodeTarget], list[str], list[str]]:
|
||||||
"""
|
"""
|
||||||
Match filenames to TheTVDB episode numbers by title.
|
Match filenames to TheTVDB episodes by title.
|
||||||
|
|
||||||
Returns:
|
season_filter: 0 = use all episodes; else only episodes from that season.
|
||||||
mapping: original filename -> correct episode number
|
Returns mapping filename -> (season, episode), unmatched list, notes.
|
||||||
unmatched_files: filenames that could not be matched
|
|
||||||
notes: human-readable match details for UI
|
|
||||||
"""
|
"""
|
||||||
file_entries: list[tuple[str, str, str]] = []
|
if season_filter > 0:
|
||||||
|
episodes = [ep for ep in episodes if ep.season_number == season_filter]
|
||||||
|
|
||||||
|
file_entries: list[tuple[str, str, str, dict]] = []
|
||||||
for name in filenames:
|
for name in filenames:
|
||||||
stem = name.rsplit(".", 1)[0] if "." in name and not name.startswith(".") else name
|
stem = name.rsplit(".", 1)[0] if "." in name and not name.startswith(".") else name
|
||||||
parsed = parse_episode_stem(stem, pattern)
|
parsed = parse_episode_stem(stem, pattern)
|
||||||
if not parsed or not parsed["title"]:
|
if not parsed or not parsed["title"]:
|
||||||
continue
|
continue
|
||||||
|
if season_filter > 0 and parsed["season"] != season_filter:
|
||||||
|
continue
|
||||||
norm = normalize_title(parsed["title"])
|
norm = normalize_title(parsed["title"])
|
||||||
if norm:
|
if norm:
|
||||||
file_entries.append((name, norm, parsed["title"]))
|
file_entries.append((name, norm, parsed["title"], parsed))
|
||||||
|
|
||||||
ep_entries = [(ep.number, normalize_title(ep.name), ep.name) for ep in episodes]
|
ep_entries = [
|
||||||
|
(ep.season_number, ep.number, normalize_title(ep.name), ep.name)
|
||||||
|
for ep in episodes
|
||||||
|
]
|
||||||
|
|
||||||
pairs: list[tuple[float, str, int, str, str]] = []
|
pairs: list[tuple[float, str, int, int, str, str]] = []
|
||||||
for fname, fnorm, raw_title in file_entries:
|
for fname, fnorm, raw_title, _parsed in file_entries:
|
||||||
for ep_num, enorm, ep_name in ep_entries:
|
for season, ep_num, enorm, ep_name in ep_entries:
|
||||||
score = _similarity(fnorm, enorm)
|
score = _similarity(fnorm, enorm)
|
||||||
pairs.append((score, fname, ep_num, raw_title, ep_name))
|
pairs.append((score, fname, season, ep_num, raw_title, ep_name))
|
||||||
|
|
||||||
pairs.sort(key=lambda x: (-x[0], x[1], x[2]))
|
pairs.sort(key=lambda x: (-x[0], x[1], x[2], x[3]))
|
||||||
|
|
||||||
mapping: dict[str, int] = {}
|
mapping: dict[str, EpisodeTarget] = {}
|
||||||
used_files: set[str] = set()
|
used_files: set[str] = set()
|
||||||
used_eps: set[int] = set()
|
used_eps: set[tuple[int, int]] = set()
|
||||||
notes: list[str] = []
|
notes: list[str] = []
|
||||||
|
|
||||||
for score, fname, ep_num, raw_title, ep_name in pairs:
|
for score, fname, season, ep_num, raw_title, ep_name in pairs:
|
||||||
if score < min_score:
|
if score < min_score:
|
||||||
break
|
break
|
||||||
if fname in used_files or ep_num in used_eps:
|
ep_key = (season, ep_num)
|
||||||
|
if fname in used_files or ep_key in used_eps:
|
||||||
continue
|
continue
|
||||||
mapping[fname] = ep_num
|
mapping[fname] = EpisodeTarget(season=season, episode=ep_num)
|
||||||
used_files.add(fname)
|
used_files.add(fname)
|
||||||
used_eps.add(ep_num)
|
used_eps.add(ep_key)
|
||||||
pct = int(round(score * 100))
|
pct = int(round(score * 100))
|
||||||
notes.append(f"{fname}: E{ep_num:02d} ← “{ep_name}” ({pct}% match, file title “{raw_title}”)")
|
notes.append(
|
||||||
|
f"{fname}: S{season:02d}E{ep_num:02d} ← “{ep_name}” ({pct}% match, file title “{raw_title}”)"
|
||||||
|
)
|
||||||
|
|
||||||
unmatched_files = [
|
unmatched_files = [
|
||||||
name for name in filenames
|
name for name in filenames
|
||||||
|
|||||||
+9
-5
@@ -9,7 +9,7 @@ from dataclasses import dataclass, field
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
|
|
||||||
from .episode_match import rewrite_episode_number
|
from .episode_match import rewrite_episode_stem, EpisodeTarget, _coerce_target, parse_episode_stem
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@@ -279,12 +279,16 @@ class TvdbEpisodeRenumberRule(Rule):
|
|||||||
) -> tuple[str, str]:
|
) -> tuple[str, str]:
|
||||||
if not self.episode_mapping or original_name is None:
|
if not self.episode_mapping or original_name is None:
|
||||||
return stem, ext
|
return stem, ext
|
||||||
new_ep = self.episode_mapping.get(original_name)
|
target_raw = self.episode_mapping.get(original_name)
|
||||||
if new_ep is None:
|
if target_raw is None:
|
||||||
return stem, ext
|
return stem, ext
|
||||||
new_stem = rewrite_episode_number(
|
parsed = parse_episode_stem(stem, self.pattern)
|
||||||
|
if not parsed:
|
||||||
|
return stem, ext
|
||||||
|
target = _coerce_target(target_raw, parsed)
|
||||||
|
new_stem = rewrite_episode_stem(
|
||||||
stem,
|
stem,
|
||||||
int(new_ep),
|
target,
|
||||||
padding=self.padding,
|
padding=self.padding,
|
||||||
pattern=self.pattern,
|
pattern=self.pattern,
|
||||||
)
|
)
|
||||||
|
|||||||
+40
-1
@@ -189,5 +189,44 @@ class TvdbClient:
|
|||||||
if not links.get("next"):
|
if not links.get("next"):
|
||||||
break
|
break
|
||||||
page += 1
|
page += 1
|
||||||
episodes.sort(key=lambda e: e.number)
|
episodes.sort(key=lambda e: (e.season_number, e.number))
|
||||||
|
return episodes
|
||||||
|
|
||||||
|
def get_all_episodes(
|
||||||
|
self,
|
||||||
|
series_id: int,
|
||||||
|
season_type: str = "default",
|
||||||
|
) -> list[TvdbEpisode]:
|
||||||
|
"""Fetch every episode for a series (all seasons), paginated."""
|
||||||
|
episodes: list[TvdbEpisode] = []
|
||||||
|
page = 0
|
||||||
|
while True:
|
||||||
|
payload = self._request(
|
||||||
|
"GET",
|
||||||
|
f"/series/{series_id}/episodes/{season_type}",
|
||||||
|
params={"page": page},
|
||||||
|
)
|
||||||
|
batch = (payload.get("data") or {}).get("episodes") or []
|
||||||
|
if not batch:
|
||||||
|
break
|
||||||
|
for ep in batch:
|
||||||
|
number = ep.get("number")
|
||||||
|
season = ep.get("seasonNumber")
|
||||||
|
name = ep.get("name")
|
||||||
|
if number is None or season is None or not name:
|
||||||
|
continue
|
||||||
|
if int(season) == 0:
|
||||||
|
continue
|
||||||
|
episodes.append(
|
||||||
|
TvdbEpisode(
|
||||||
|
number=int(number),
|
||||||
|
season_number=int(season),
|
||||||
|
name=str(name),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
links = payload.get("links") or {}
|
||||||
|
if not links.get("next"):
|
||||||
|
break
|
||||||
|
page += 1
|
||||||
|
episodes.sort(key=lambda e: (e.season_number, e.number))
|
||||||
return episodes
|
return episodes
|
||||||
|
|||||||
+39
-17
@@ -338,24 +338,39 @@ class _TvdbMatchWorker(QThread):
|
|||||||
season: int,
|
season: int,
|
||||||
season_type: str,
|
season_type: str,
|
||||||
filenames: list[str],
|
filenames: list[str],
|
||||||
|
all_seasons: bool,
|
||||||
):
|
):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.series_id = series_id
|
self.series_id = series_id
|
||||||
self.season = season
|
self.season = season
|
||||||
self.season_type = season_type
|
self.season_type = season_type
|
||||||
self.filenames = filenames
|
self.filenames = filenames
|
||||||
|
self.all_seasons = all_seasons
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
try:
|
try:
|
||||||
client = TvdbClient(TVDB_API_KEY)
|
client = TvdbClient(TVDB_API_KEY)
|
||||||
episodes = client.get_season_episodes(
|
if self.all_seasons:
|
||||||
self.series_id,
|
episodes = client.get_all_episodes(
|
||||||
self.season,
|
self.series_id,
|
||||||
season_type=self.season_type,
|
season_type=self.season_type,
|
||||||
)
|
)
|
||||||
|
season_filter = 0
|
||||||
|
else:
|
||||||
|
episodes = client.get_season_episodes(
|
||||||
|
self.series_id,
|
||||||
|
self.season,
|
||||||
|
season_type=self.season_type,
|
||||||
|
)
|
||||||
|
season_filter = self.season
|
||||||
if not episodes:
|
if not episodes:
|
||||||
raise TvdbError(f"No episodes found for season {self.season}")
|
label = "all seasons" if self.all_seasons else f"season {self.season}"
|
||||||
mapping, unmatched, notes = match_filenames_to_episodes(self.filenames, episodes)
|
raise TvdbError(f"No episodes found for {label}")
|
||||||
|
mapping, unmatched, notes = match_filenames_to_episodes(
|
||||||
|
self.filenames,
|
||||||
|
episodes,
|
||||||
|
season_filter=season_filter,
|
||||||
|
)
|
||||||
self.finished.emit(mapping, unmatched, notes)
|
self.finished.emit(mapping, unmatched, notes)
|
||||||
except TvdbError as e:
|
except TvdbError as e:
|
||||||
self.failed.emit(str(e))
|
self.failed.emit(str(e))
|
||||||
@@ -407,7 +422,8 @@ class TvdbEpisodeRenumberRuleWidget(QWidget):
|
|||||||
self.season = QSpinBox()
|
self.season = QSpinBox()
|
||||||
self.season.setMinimum(0)
|
self.season.setMinimum(0)
|
||||||
self.season.setMaximum(99)
|
self.season.setMaximum(99)
|
||||||
self.season.setValue(1)
|
self.season.setValue(0)
|
||||||
|
self.season.setSpecialValueText("All seasons")
|
||||||
self.season.valueChanged.connect(self._emit)
|
self.season.valueChanged.connect(self._emit)
|
||||||
layout.addRow("Season:", self.season)
|
layout.addRow("Season:", self.season)
|
||||||
|
|
||||||
@@ -422,13 +438,13 @@ class TvdbEpisodeRenumberRuleWidget(QWidget):
|
|||||||
self.match_btn.clicked.connect(self._match_titles)
|
self.match_btn.clicked.connect(self._match_titles)
|
||||||
layout.addRow(self.match_btn)
|
layout.addRow(self.match_btn)
|
||||||
|
|
||||||
self.status = QLabel("Search for a show, choose episode order and season, then match titles.")
|
self.status = QLabel("Search for a show, choose episode order, then match titles (0 = all seasons).")
|
||||||
self.status.setWordWrap(True)
|
self.status.setWordWrap(True)
|
||||||
layout.addRow(self.status)
|
layout.addRow(self.status)
|
||||||
|
|
||||||
info = QLabel(
|
info = QLabel(
|
||||||
"Reads episode titles from filenames like S01E05 - Episode Title. "
|
"Reads titles from S01E05 - Episode Title or Show 04x01 Episode Title filenames. "
|
||||||
"Fetches the chosen TheTVDB episode order for that season and rewrites SxxExx numbers to match."
|
"Use All seasons to match across every season and fix wrong season numbers too."
|
||||||
)
|
)
|
||||||
info.setWordWrap(True)
|
info.setWordWrap(True)
|
||||||
layout.addRow(info)
|
layout.addRow(info)
|
||||||
@@ -492,12 +508,17 @@ class TvdbEpisodeRenumberRuleWidget(QWidget):
|
|||||||
if series_id is None:
|
if series_id is None:
|
||||||
return
|
return
|
||||||
self.match_btn.setEnabled(False)
|
self.match_btn.setEnabled(False)
|
||||||
self.status.setText(f"Fetching episodes ({self._order_label()}) and matching titles…")
|
all_seasons = self.season.value() == 0
|
||||||
|
self.status.setText(
|
||||||
|
f"Fetching episodes ({self._order_label()}, "
|
||||||
|
f"{'all seasons' if all_seasons else f'season {self.season.value()}'}…) and matching titles…"
|
||||||
|
)
|
||||||
self._match_worker = _TvdbMatchWorker(
|
self._match_worker = _TvdbMatchWorker(
|
||||||
int(series_id),
|
int(series_id),
|
||||||
self.season.value(),
|
self.season.value(),
|
||||||
self._order_value(),
|
self._order_value(),
|
||||||
self._file_names,
|
self._file_names,
|
||||||
|
all_seasons,
|
||||||
)
|
)
|
||||||
self._match_worker.finished.connect(self._on_match_finished)
|
self._match_worker.finished.connect(self._on_match_finished)
|
||||||
self._match_worker.failed.connect(self._on_match_failed)
|
self._match_worker.failed.connect(self._on_match_failed)
|
||||||
@@ -508,10 +529,8 @@ class TvdbEpisodeRenumberRuleWidget(QWidget):
|
|||||||
self.match_btn.setEnabled(True)
|
self.match_btn.setEnabled(True)
|
||||||
matched = len(mapping)
|
matched = len(mapping)
|
||||||
total = len(self._file_names)
|
total = len(self._file_names)
|
||||||
msg = (
|
scope = "all seasons" if self.season.value() == 0 else f"season {self.season.value()}"
|
||||||
f"Matched {matched} of {total} file(s) for season {self.season.value()} "
|
msg = f"Matched {matched} of {total} file(s) ({scope}, {self._order_label()})."
|
||||||
f"({self._order_label()})."
|
|
||||||
)
|
|
||||||
if unmatched:
|
if unmatched:
|
||||||
msg += f" {len(unmatched)} file(s) unmatched."
|
msg += f" {len(unmatched)} file(s) unmatched."
|
||||||
self.status.setText(msg)
|
self.status.setText(msg)
|
||||||
@@ -524,7 +543,10 @@ class TvdbEpisodeRenumberRuleWidget(QWidget):
|
|||||||
|
|
||||||
def getRule(self) -> TvdbEpisodeRenumberRule:
|
def getRule(self) -> TvdbEpisodeRenumberRule:
|
||||||
r = TvdbEpisodeRenumberRule(
|
r = TvdbEpisodeRenumberRule(
|
||||||
episode_mapping=dict(self._episode_mapping),
|
episode_mapping={
|
||||||
|
k: (v.season, v.episode) if hasattr(v, "season") else v
|
||||||
|
for k, v in self._episode_mapping.items()
|
||||||
|
},
|
||||||
padding=self.padding.value(),
|
padding=self.padding.value(),
|
||||||
)
|
)
|
||||||
r.enabled = self.enabled_cb.isChecked()
|
r.enabled = self.enabled_cb.isChecked()
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
HSRename 1.0.5
|
||||||
|
- Restore TheTVDB episode match feature in published AppImage (v1.0.4 asset was an outdated binary)
|
||||||
|
- TheTVDB search fix for series-76320 style IDs
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
HSRename 1.0.6
|
||||||
|
- Support 04x01-style filenames (not just S01E05)
|
||||||
|
- Match all seasons at once (season 0) to fix wrong-season edge cases
|
||||||
|
- Improve title fuzzy matching
|
||||||
+36
-16
@@ -2,9 +2,10 @@
|
|||||||
# Push tag to Gitea and publish HSRename.AppImage as a release asset.
|
# Push tag to Gitea and publish HSRename.AppImage as a release asset.
|
||||||
# Usage:
|
# Usage:
|
||||||
# GITEA_TOKEN=your_token ./release_gitea.sh
|
# GITEA_TOKEN=your_token ./release_gitea.sh
|
||||||
# Optional: ./release_gitea.sh --build (rebuild AppImage first)
|
|
||||||
#
|
#
|
||||||
# Requires: curl, git, and network access to your Gitea instance.
|
# Always rebuilds the AppImage before upload so releases never ship a stale binary.
|
||||||
|
#
|
||||||
|
# Requires: curl, git, appimagetool, and network access to your Gitea instance.
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
@@ -22,18 +23,38 @@ APP_IMAGE="HSRename.AppImage"
|
|||||||
VERSION="$(tr -d '[:space:]' < VERSION)"
|
VERSION="$(tr -d '[:space:]' < VERSION)"
|
||||||
TAG="v${VERSION}"
|
TAG="v${VERSION}"
|
||||||
|
|
||||||
if [[ "${1:-}" == "--build" ]]; then
|
verify_appimage() {
|
||||||
export PATH="/tmp:${PATH}"
|
if [[ ! -f "$APP_IMAGE" ]]; then
|
||||||
if ! command -v appimagetool &>/dev/null && [[ -x /tmp/appimagetool ]]; then
|
echo "Missing $APP_IMAGE after build." >&2
|
||||||
export PATH="/tmp:${PATH}"
|
exit 1
|
||||||
fi
|
fi
|
||||||
./build_appimage.sh
|
if [[ ! -f "dist/HSRename/HSRename" ]]; then
|
||||||
|
echo "Missing dist/HSRename/HSRename after build." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! strings "dist/HSRename/HSRename" | grep -q "engine.tvdb_client"; then
|
||||||
|
echo "ERROR: Built executable is missing TheTVDB modules; refusing to publish." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! strings "dist/HSRename/HSRename" | grep -q "engine.episode_match"; then
|
||||||
|
echo "ERROR: Built executable is missing episode matching; refusing to publish." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
export PATH="/tmp:${PATH}"
|
||||||
|
if ! command -v appimagetool &>/dev/null && [[ -x /tmp/appimagetool ]]; then
|
||||||
|
export PATH="/tmp:${PATH}"
|
||||||
|
fi
|
||||||
|
if ! command -v appimagetool &>/dev/null; then
|
||||||
|
curl -fsSL -o /tmp/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
|
||||||
|
chmod +x /tmp/appimagetool
|
||||||
|
export PATH="/tmp:${PATH}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -f "$APP_IMAGE" ]]; then
|
echo "=== Building fresh AppImage for ${TAG} ==="
|
||||||
echo "Missing $APP_IMAGE. Run ./build_appimage.sh or ./release_gitea.sh --build"
|
./build_appimage.sh
|
||||||
exit 1
|
verify_appimage
|
||||||
fi
|
|
||||||
|
|
||||||
if ! git rev-parse "$TAG" >/dev/null 2>&1; then
|
if ! git rev-parse "$TAG" >/dev/null 2>&1; then
|
||||||
echo "Tag $TAG not found. Create it with: git tag $TAG"
|
echo "Tag $TAG not found. Create it with: git tag $TAG"
|
||||||
@@ -46,10 +67,8 @@ git push origin "$TAG"
|
|||||||
|
|
||||||
if [[ -z "${GITEA_TOKEN:-}" ]]; then
|
if [[ -z "${GITEA_TOKEN:-}" ]]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "Code and tag pushed. To upload the AppImage, set GITEA_TOKEN and re-run:"
|
echo "Built and verified $APP_IMAGE. Set GITEA_TOKEN and re-run to upload:"
|
||||||
echo " GITEA_TOKEN=... ./release_gitea.sh"
|
echo " GITEA_TOKEN=... ./release_gitea.sh"
|
||||||
echo ""
|
|
||||||
echo "Or create the release manually on Gitea and attach $APP_IMAGE."
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -57,9 +76,10 @@ API="${GITEA_HOST}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases"
|
|||||||
NOTES="$(cat <<EOF
|
NOTES="$(cat <<EOF
|
||||||
## HSRename ${TAG}
|
## HSRename ${TAG}
|
||||||
|
|
||||||
See repository history for changes in this release.
|
- Fix botched v1.0.4 AppImage (restores TheTVDB episode match + search fix)
|
||||||
|
- Always verify/update via Gear Lever Forgejo: \`https://git.hisora.dev/Dawnsorrow/HS-Rename\`
|
||||||
|
|
||||||
Gear Lever update URL:
|
Download:
|
||||||
\`${GITEA_HOST}/${GITEA_OWNER}/${GITEA_REPO}/releases/download/${TAG}/${APP_IMAGE}\`
|
\`${GITEA_HOST}/${GITEA_OWNER}/${GITEA_REPO}/releases/download/${TAG}/${APP_IMAGE}\`
|
||||||
EOF
|
EOF
|
||||||
)"
|
)"
|
||||||
|
|||||||
Reference in New Issue
Block a user