@@ -3040,7 +2767,6 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
- ${introSectionHtml}
${endSectionHtml}
`;
@@ -3086,28 +2812,6 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
if (!window.__bwDebouncers) window.__bwDebouncers = Object.create(null);
panel.addEventListener('input', (ev) => {
- const introInput = ev.target.closest && ev.target.closest('input.bw-intro-start');
- if (introInput) {
- const series = introInput.dataset.series; if (!series) return;
- const key = '__deb_intro_start_' + series;
- if (window.__bwDebouncers[key]) clearTimeout(window.__bwDebouncers[key]);
- window.__bwDebouncers[key] = setTimeout(() => {
- const seconds = parseInt(introInput.value || '0', 10) || 0;
- localStorage.setItem('bw_intro_start_update', JSON.stringify({ series, seconds }));
- }, 600);
- }
-
- const introEndInput = ev.target.closest && ev.target.closest('input.bw-intro-end');
- if (introEndInput) {
- const series = introEndInput.dataset.series; if (!series) return;
- const key = '__deb_intro_end_' + series;
- if (window.__bwDebouncers[key]) clearTimeout(window.__bwDebouncers[key]);
- window.__bwDebouncers[key] = setTimeout(() => {
- const seconds = parseInt(introEndInput.value || '0', 10) || 0;
- localStorage.setItem('bw_intro_end_update', JSON.stringify({ series, seconds }));
- }, 600);
- }
-
const endInput = ev.target.closest && ev.target.closest('input.bw-end');
if (endInput) {
const series = endInput.dataset.series; if (!series) return;
@@ -3138,9 +2842,6 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
-
@@ -3271,7 +2972,6 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
e.stopPropagation();
const next = {
autoFullscreen: !!document.getElementById('bwOptAutoFullscreen')?.checked,
- autoSkipIntro: !!document.getElementById('bwOptAutoSkipIntro')?.checked,
autoSkipEndScreen: !!document.getElementById('bwOptAutoSkipEndScreen')?.checked,
autoNext: !!document.getElementById('bwOptAutoNext')?.checked,
playbackRate: parseFloat(document.getElementById('bwOptPlaybackRate')?.value || '1'),
@@ -3292,7 +2992,6 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
const s = JSON.parse(localStorage.getItem('bw_settings')||'{}');
const x = id => document.getElementById(id);
if (x('bwOptAutoFullscreen')) x('bwOptAutoFullscreen').checked = (s.autoFullscreen !== false);
- if (x('bwOptAutoSkipIntro')) x('bwOptAutoSkipIntro').checked = (s.autoSkipIntro !== false);
if (x('bwOptAutoSkipEndScreen')) x('bwOptAutoSkipEndScreen').checked = (s.autoSkipEndScreen !== false);
if (x('bwOptAutoNext')) x('bwOptAutoNext').checked = (s.autoNext !== false);
if (x('bwOptPlaybackRate')) x('bwOptPlaybackRate').value = String(s.playbackRate ?? 1);
@@ -3327,11 +3026,9 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
const skipPanelButton = c('.bw-series-settings');
if (skipPanelButton) {
const seriesName = skipPanelButton.getAttribute('data-series');
- const introStart = parseInt(skipPanelButton.getAttribute('data-intro-start') || '0', 10) || 0;
- const introEnd = parseInt(skipPanelButton.getAttribute('data-intro-end') || '0', 10) || 0;
const endSkip = parseInt(skipPanelButton.getAttribute('data-end-skip') || '0', 10) || 0;
if (seriesName) {
- openSeriesSkipPanel(seriesName, introStart, introEnd, endSkip);
+ openSeriesSkipPanel(seriesName, endSkip);
}
return;
}
@@ -3339,11 +3036,10 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
const item = c('.bw-series-item');
if (item) {
// Check if click originated from input field or delete button - don't trigger navigation
- const clickedInput = e.target.closest && (e.target.closest('input.bw-intro-start') || e.target.closest('input.bw-intro-end'));
const clickedEndInput = e.target.closest && e.target.closest('input.bw-end');
const clickedDelete = e.target.closest && e.target.closest('.bw-delete');
const clickedSkipSettings = e.target.closest && e.target.closest('.bw-series-settings');
- if (clickedInput || clickedEndInput || clickedDelete || clickedSkipSettings) return;
+ if (clickedEndInput || clickedDelete || clickedSkipSettings) return;
if (localStorage.getItem('bw_nav_inflight') === '1') return; // throttle
localStorage.setItem('bw_nav_inflight','1');
@@ -3370,31 +3066,9 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
}
});
- // Debounce für Intro-Input und End-Input
+ // Debounce für End-Input
if (!window.__bwDebouncers) window.__bwDebouncers = Object.create(null);
d.addEventListener('input', (e)=>{
- const inp = e.target.closest && e.target.closest('input.bw-intro-start');
- if (inp) {
- const series = inp.dataset.series; if (!series) return;
- const key = '__deb_intro_start_' + series;
- if (window.__bwDebouncers[key]) clearTimeout(window.__bwDebouncers[key]);
- window.__bwDebouncers[key] = setTimeout(()=>{
- const seconds = parseInt(inp.value||'0',10)||0;
- localStorage.setItem('bw_intro_start_update', JSON.stringify({series, seconds}));
- }, 600);
- }
-
- const inpEnd = e.target.closest && e.target.closest('input.bw-intro-end');
- if (inpEnd) {
- const series = inpEnd.dataset.series; if (!series) return;
- const key = '__deb_intro_end_' + series;
- if (window.__bwDebouncers[key]) clearTimeout(window.__bwDebouncers[key]);
- window.__bwDebouncers[key] = setTimeout(()=>{
- const seconds = parseInt(inpEnd.value||'0',10)||0;
- localStorage.setItem('bw_intro_end_update', JSON.stringify({series, seconds}));
- }, 600);
- }
-
const endInp = e.target.closest && e.target.closest('input.bw-end');
if (endInp) {
const series = endInp.dataset.series; if (!series) return;
@@ -3595,60 +3269,6 @@ def main() -> None:
except Exception:
pass
- # Handle intro start updates (from sidebar input) – normalisieren + live anwenden
- try:
- upd = read_localstorage_value(driver, "bw_intro_start_update")
- if upd:
- data = json.loads(upd)
- ser_raw = data.get("series", "")
- secs_raw = data.get("seconds", 0)
- ser = norm_series_key(ser_raw)
- try:
- secs = max(0, int(float(secs_raw)))
- except Exception:
- secs = 0
-
- if ser:
- # Get current end time to preserve it
- current_end = get_intro_skip_end_seconds(ser)
- set_intro_skip_seconds(ser, secs, current_end)
-
- # UI sofort aktualisieren
- html = build_items_html(load_progress(), get_settings(driver))
- driver.execute_script(
- "if (window.__bwSetList){window.__bwSetList(arguments[0]);}",
- html,
- )
- except Exception:
- pass
-
- # Handle intro end updates (from sidebar input) – normalisieren + live anwenden
- try:
- upd = read_localstorage_value(driver, "bw_intro_end_update")
- if upd:
- data = json.loads(upd)
- ser_raw = data.get("series", "")
- secs_raw = data.get("seconds", 0)
- ser = norm_series_key(ser_raw)
- try:
- secs = max(0, int(float(secs_raw)))
- except Exception:
- secs = 0
-
- if ser:
- # Get current start time to preserve it
- current_start = get_intro_skip_seconds(ser)
- set_intro_skip_seconds(ser, current_start, secs)
-
- # UI sofort aktualisieren
- html = build_items_html(load_progress(), get_settings(driver))
- driver.execute_script(
- "if (window.__bwSetList){window.__bwSetList(arguments[0]);}",
- html,
- )
- except Exception:
- pass
-
# Handle end screen updates (from sidebar input) – normalisieren + live anwenden
try:
upd = read_localstorage_value(driver, "bw_end_update")
diff --git a/SerienJunkie/settings.json b/SerienJunkie/settings.json
index 3413039..7aca940 100644
--- a/SerienJunkie/settings.json
+++ b/SerienJunkie/settings.json
@@ -1,9 +1,8 @@
{
"useTorProxy": false,
"autoFullscreen": true,
- "autoSkipIntro": true,
"autoSkipEndScreen": true,
"autoNext": true,
"playbackRate": 1,
"volume": 1
-}
\ No newline at end of file
+}
From 05e8f32dd04b16cf93450f23cb3db97eb55bc2c6 Mon Sep 17 00:00:00 2001
From: Moritz Nonnemann <44306276+FieteGM@users.noreply.github.com>
Date: Wed, 4 Feb 2026 16:03:38 +0100
Subject: [PATCH 02/26] Add optional intro fingerprint skipping
---
README.md | 23 ++++++
SerienJunkie/intro_fingerprints.json | 7 ++
SerienJunkie/s.toBot.py | 101 +++++++++++++++++++++++++++
3 files changed, 131 insertions(+)
create mode 100644 SerienJunkie/intro_fingerprints.json
diff --git a/README.md b/README.md
index 46fd91f..6518ca1 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Automated binge-watching helper for **s.to** and **aniworld.to** with progress
- **Multi-provider support**: s.to and aniworld.to with automatic provider
detection.
- **Progress tracking**: resume by series/season/episode with saved timestamps.
+- **Optional intro skip**: fingerprint-configured per season.
- **End screen skip**: jump past credits/outro if configured.
- **Auto fullscreen**: multiple fallback strategies for stubborn players.
- **Sidebar UI**: search, sort, quick actions, and settings panel.
@@ -84,9 +85,30 @@ Important keys:
- `playbackRate` (number)
- `volume` (number, `0.0`–`1.0`)
+### Intro fingerprints (optional)
+
+To enable intro skipping per season, create `intro_fingerprints.json` with keys
+like `
_s`, for example `one_piece_s07`:
+
+```json
+{
+ "one_piece_s07": {
+ "fingerprint": "A_LONG_FP_STRING",
+ "fingerprintDuration": 10,
+ "fullIntroDurationSeconds": 145
+ }
+}
+```
+
+If `fingerprint` is omitted but `fullIntroDurationSeconds` is present, the
+player will skip the first N seconds at the start of the episode. If a
+fingerprint is present, an external matcher can signal a match by writing the
+matched key into `localStorage` as `bw_intro_fp_match`.
+
## Data Files
- `progress.json`: persisted progress by series.
+- `intro_fingerprints.json`: optional intro fingerprint configuration.
- `settings.json`: app settings.
## Sidebar Highlights
@@ -111,6 +133,7 @@ SerienJunkie/
├── README.md # This file
├── geckodriver.exe # Firefox WebDriver
├── progress.json # Progress database (auto-created)
+├── intro_fingerprints.json # Optional intro fingerprint data
└── user.BingeWatcher/ # Firefox profile (auto-created)
```
diff --git a/SerienJunkie/intro_fingerprints.json b/SerienJunkie/intro_fingerprints.json
new file mode 100644
index 0000000..02afacf
--- /dev/null
+++ b/SerienJunkie/intro_fingerprints.json
@@ -0,0 +1,7 @@
+{
+ "one_piece_s07": {
+ "fingerprint": "A_LONG_FP_STRING",
+ "fingerprintDuration": 10,
+ "fullIntroDurationSeconds": 145
+ }
+}
diff --git a/SerienJunkie/s.toBot.py b/SerienJunkie/s.toBot.py
index 1173ebd..cd71850 100644
--- a/SerienJunkie/s.toBot.py
+++ b/SerienJunkie/s.toBot.py
@@ -30,6 +30,7 @@
PROGRESS_DB_FILE = os.path.join(SCRIPT_DIR, "progress.json")
SETTINGS_DB_FILE = os.path.join(SCRIPT_DIR, "settings.json")
+INTRO_FINGERPRINTS_FILE = os.path.join(SCRIPT_DIR, "intro_fingerprints.json")
# === STREAMING PROVIDERS ===
STREAMING_PROVIDERS = {
@@ -175,6 +176,90 @@ def norm_series_key(s: str) -> str:
return str(s or "").strip()
+def build_intro_fingerprint_key(series: str, season: int) -> str:
+ safe_series: str = re.sub(r"[^a-z0-9_]+", "_", (series or "").lower())
+ safe_series = safe_series.strip("_")
+ season_value: int = max(0, int(season))
+ return f"{safe_series}_s{season_value:02d}"
+
+
+def load_intro_fingerprints() -> Dict[str, Dict[str, Any]]:
+ try:
+ if os.path.exists(INTRO_FINGERPRINTS_FILE):
+ with open(INTRO_FINGERPRINTS_FILE, "r", encoding="utf-8") as f:
+ data = json.load(f)
+ if isinstance(data, dict):
+ return data
+ return {}
+ except Exception as e:
+ logging.error(f"Intro fingerprints could not be loaded: {e}")
+ return {}
+
+
+def get_intro_fingerprint_entry(series: str, season: int) -> Optional[Dict[str, Any]]:
+ intro_fingerprint_key: str = build_intro_fingerprint_key(series, season)
+ intro_fingerprints: Dict[str, Dict[str, Any]] = load_intro_fingerprints()
+ entry_raw: Optional[Dict[str, Any]] = intro_fingerprints.get(intro_fingerprint_key)
+ if not isinstance(entry_raw, dict):
+ return None
+ return entry_raw
+
+
+def read_intro_fingerprint_match(driver: webdriver.Firefox) -> Optional[str]:
+ try:
+ driver.switch_to.default_content()
+ value = driver.execute_script(
+ """
+ let r = localStorage.getItem('bw_intro_fp_match');
+ if (r) localStorage.removeItem('bw_intro_fp_match');
+ return r;
+ """
+ )
+ return value if isinstance(value, str) else None
+ except Exception:
+ return None
+
+
+def maybe_apply_intro_skip(
+ driver: webdriver.Firefox,
+ series: str,
+ season: int,
+ intro_skip_applied: bool,
+) -> bool:
+ if intro_skip_applied:
+ return True
+
+ entry = get_intro_fingerprint_entry(series, season)
+ if not entry:
+ return intro_skip_applied
+
+ intro_duration_raw: int = int(entry.get("fullIntroDurationSeconds", 0) or 0)
+ intro_duration_seconds: int = max(0, intro_duration_raw)
+ if intro_duration_seconds <= 0:
+ return intro_skip_applied
+
+ fingerprint_value: str = str(entry.get("fingerprint", "") or "").strip()
+ if not fingerprint_value:
+ seek_to_position(driver, intro_duration_seconds)
+ return True
+
+ matched_key = read_intro_fingerprint_match(driver)
+ if matched_key:
+ intro_fingerprint_key: str = build_intro_fingerprint_key(series, season)
+ if matched_key == intro_fingerprint_key:
+ current_time_value: float = float(
+ driver.execute_script(
+ "return document.querySelector('video')?.currentTime || 0;"
+ )
+ or 0
+ )
+ target_time: int = int(current_time_value + intro_duration_seconds)
+ seek_to_position(driver, target_time)
+ return True
+
+ return intro_skip_applied
+
+
# === BROWSER HANDLING --------------------------- ===
def start_browser() -> webdriver.Firefox:
try:
@@ -877,6 +962,7 @@ def play_episodes_loop(
vol = settings["volume"]
fullscreen_attempted: bool = False
end_skip_applied: bool = False
+ intro_skip_applied: bool = False
print(
f"\n[▶] Playing {series.capitalize()} – Season {current_season}, Episode {current_episode}"
@@ -915,6 +1001,14 @@ def play_episodes_loop(
if position and position > 0:
seek_to_position(driver, position)
+ intro_skip_applied = True
+ else:
+ intro_skip_applied = maybe_apply_intro_skip(
+ driver=driver,
+ series=series,
+ season=current_season,
+ intro_skip_applied=intro_skip_applied,
+ )
position = 0
recovery_tries = 0
@@ -1313,6 +1407,13 @@ def play_episodes_loop(
except Exception:
pass
+ intro_skip_applied = maybe_apply_intro_skip(
+ driver=driver,
+ series=series,
+ season=current_season,
+ intro_skip_applied=intro_skip_applied,
+ )
+
time.sleep(1.0)
if auto_nav:
From 3c1b6d36f2a70a305880424b99ee3fedc0a99564 Mon Sep 17 00:00:00 2001
From: Moritz Nonnemann <44306276+FieteGM@users.noreply.github.com>
Date: Wed, 4 Feb 2026 16:16:38 +0100
Subject: [PATCH 03/26] Add per-series intro skip settings
---
README.md | 5 +-
SerienJunkie/s.toBot.py | 386 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 383 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 6518ca1..c45f054 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,8 @@ like `_s`, for example `one_piece_s07`:
If `fingerprint` is omitted but `fullIntroDurationSeconds` is present, the
player will skip the first N seconds at the start of the episode. If a
fingerprint is present, an external matcher can signal a match by writing the
-matched key into `localStorage` as `bw_intro_fp_match`.
+matched key into `localStorage` as `bw_intro_fp_match`. You can also edit these
+values per series/season from the in-app “Skip Settings” panel.
## Data Files
@@ -115,7 +116,7 @@ matched key into `localStorage` as `bw_intro_fp_match`.
- **Series list** with last watched time.
- **Provider tabs** to filter s.to vs. aniworld.to.
-- **Per-series controls** for end skip windows.
+- **Per-series controls** for intro duration/fingerprint and end skip windows.
- **Quick actions**: skip episode, open settings, quit.
## Troubleshooting
diff --git a/SerienJunkie/s.toBot.py b/SerienJunkie/s.toBot.py
index cd71850..44c0996 100644
--- a/SerienJunkie/s.toBot.py
+++ b/SerienJunkie/s.toBot.py
@@ -205,6 +205,87 @@ def get_intro_fingerprint_entry(series: str, season: int) -> Optional[Dict[str,
return entry_raw
+def set_intro_fingerprint_entry(
+ series: str,
+ season: int,
+ full_intro_duration_seconds: int,
+ fingerprint: str,
+ fingerprint_duration: int,
+) -> bool:
+ try:
+ intro_fingerprints: Dict[str, Dict[str, Any]] = load_intro_fingerprints()
+ intro_fingerprint_key: str = build_intro_fingerprint_key(series, season)
+ entry: Dict[str, Any] = intro_fingerprints.get(intro_fingerprint_key, {})
+
+ intro_duration_value: int = max(0, int(full_intro_duration_seconds))
+ fingerprint_value: str = str(fingerprint or "").strip()
+ fingerprint_duration_value: int = max(0, int(fingerprint_duration))
+
+ if intro_duration_value > 0:
+ entry["fullIntroDurationSeconds"] = intro_duration_value
+ else:
+ entry.pop("fullIntroDurationSeconds", None)
+
+ if fingerprint_value:
+ entry["fingerprint"] = fingerprint_value
+ if fingerprint_duration_value > 0:
+ entry["fingerprintDuration"] = fingerprint_duration_value
+ else:
+ entry.pop("fingerprintDuration", None)
+ else:
+ entry.pop("fingerprint", None)
+ entry.pop("fingerprintDuration", None)
+
+ if not entry:
+ intro_fingerprints.pop(intro_fingerprint_key, None)
+ else:
+ intro_fingerprints[intro_fingerprint_key] = entry
+
+ with open(INTRO_FINGERPRINTS_FILE, "w", encoding="utf-8") as f:
+ json.dump(intro_fingerprints, f, indent=2, ensure_ascii=False)
+ return True
+ except Exception as e:
+ logging.error(f"Intro fingerprint could not be saved: {e}")
+ return False
+
+
+def merge_intro_fingerprint_entry(
+ series: str,
+ season: int,
+ full_intro_duration_seconds: Optional[int],
+ fingerprint: Optional[str],
+ fingerprint_duration: Optional[int],
+) -> bool:
+ entry: Optional[Dict[str, Any]] = get_intro_fingerprint_entry(series, season)
+ current_duration: int = int((entry or {}).get("fullIntroDurationSeconds", 0) or 0)
+ current_fingerprint: str = str((entry or {}).get("fingerprint", "") or "")
+ current_fp_duration: int = int((entry or {}).get("fingerprintDuration", 0) or 0)
+
+ next_duration: int = (
+ int(full_intro_duration_seconds)
+ if full_intro_duration_seconds is not None
+ else current_duration
+ )
+ next_fingerprint: str = (
+ str(fingerprint or "")
+ if fingerprint is not None
+ else current_fingerprint
+ )
+ next_fp_duration: int = (
+ int(fingerprint_duration)
+ if fingerprint_duration is not None
+ else current_fp_duration
+ )
+
+ return set_intro_fingerprint_entry(
+ series=series,
+ season=season,
+ full_intro_duration_seconds=next_duration,
+ fingerprint=next_fingerprint,
+ fingerprint_duration=next_fp_duration,
+ )
+
+
def read_intro_fingerprint_match(driver: webdriver.Firefox) -> Optional[str]:
try:
driver.switch_to.default_content()
@@ -1273,6 +1354,89 @@ def play_episodes_loop(
# --- LIVE SERIES SKIP UPDATES ----------------------------------
try:
skip_settings_changed = False
+ upd = read_localstorage_value(driver, "bw_intro_duration_update")
+ if upd:
+ data = json.loads(upd)
+ ser_raw = data.get("series", "")
+ season_raw = data.get("season", 0)
+ secs_raw = data.get("seconds", 0)
+ ser = norm_series_key(ser_raw)
+ try:
+ season_value = max(0, int(float(season_raw)))
+ except Exception:
+ season_value = 0
+ try:
+ secs = max(0, int(float(secs_raw)))
+ except Exception:
+ secs = 0
+
+ if ser and season_value > 0:
+ if merge_intro_fingerprint_entry(
+ series=ser,
+ season=season_value,
+ full_intro_duration_seconds=secs,
+ fingerprint=None,
+ fingerprint_duration=None,
+ ):
+ skip_settings_changed = True
+ except Exception:
+ pass
+
+ try:
+ upd = read_localstorage_value(driver, "bw_intro_fp_update")
+ if upd:
+ data = json.loads(upd)
+ ser_raw = data.get("series", "")
+ season_raw = data.get("season", 0)
+ fingerprint_raw = data.get("fingerprint", "")
+ ser = norm_series_key(ser_raw)
+ try:
+ season_value = max(0, int(float(season_raw)))
+ except Exception:
+ season_value = 0
+ fingerprint_value = str(fingerprint_raw or "").strip()
+
+ if ser and season_value > 0:
+ if merge_intro_fingerprint_entry(
+ series=ser,
+ season=season_value,
+ full_intro_duration_seconds=None,
+ fingerprint=fingerprint_value,
+ fingerprint_duration=None,
+ ):
+ skip_settings_changed = True
+ except Exception:
+ pass
+
+ try:
+ upd = read_localstorage_value(driver, "bw_intro_fp_duration_update")
+ if upd:
+ data = json.loads(upd)
+ ser_raw = data.get("series", "")
+ season_raw = data.get("season", 0)
+ secs_raw = data.get("seconds", 0)
+ ser = norm_series_key(ser_raw)
+ try:
+ season_value = max(0, int(float(season_raw)))
+ except Exception:
+ season_value = 0
+ try:
+ secs = max(0, int(float(secs_raw)))
+ except Exception:
+ secs = 0
+
+ if ser and season_value > 0:
+ if merge_intro_fingerprint_entry(
+ series=ser,
+ season=season_value,
+ full_intro_duration_seconds=None,
+ fingerprint=None,
+ fingerprint_duration=secs,
+ ):
+ skip_settings_changed = True
+ except Exception:
+ pass
+
upd = read_localstorage_value(driver, "bw_end_update")
if upd:
data = json.loads(upd)
@@ -2267,6 +2431,7 @@ def build_items_html(db: Dict[str, Dict[str, Any]], settings: Optional[Dict[str,
"""Erstellt HTML für die Sidebar mit Streaming-Anbieter-Tabs."""
if settings is None:
settings = {}
+ intro_fingerprints: Dict[str, Dict[str, Any]] = load_intro_fingerprints()
# Gruppiere Serien nach Anbietern
provider_series = {}
for series_name, data in db.items():
@@ -2306,11 +2471,16 @@ def build_items_html(db: Dict[str, Dict[str, Any]], settings: Optional[Dict[str,
position = int(data.get("position", 0))
ts_val = float(data.get("timestamp", 0))
end_skip_val = int(data.get("end_skip", 0))
+ intro_fingerprint_key: str = build_intro_fingerprint_key(series_name, season)
+ intro_entry: Dict[str, Any] = intro_fingerprints.get(intro_fingerprint_key, {})
+ intro_duration_val = int(intro_entry.get("fullIntroDurationSeconds", 0) or 0)
+ intro_fp_val = _html.escape(str(intro_entry.get("fingerprint", "") or ""), quote=True)
+ intro_fp_duration_val = int(intro_entry.get("fingerprintDuration", 0) or 0)
safe_name = _html.escape(series_name, quote=True)
series_items.append(f"""
@@ -2326,9 +2496,9 @@ def build_items_html(db: Dict[str, Dict[str, Any]], settings: Optional[Dict[str,
X
-
@@ -2572,10 +2742,28 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
box-shadow: 0 4px 12px rgba(59,130,246,.15);
}
+ #bingeSidebar .bw-intro-duration,
+ #bingeSidebar .bw-intro-fingerprint,
+ #bingeSidebar .bw-intro-fp-duration,
#bingeSidebar .bw-end {
transition: all .2s ease !important;
}
+ #bingeSidebar .bw-intro-duration:focus,
+ #bingeSidebar .bw-intro-fingerprint:focus,
+ #bingeSidebar .bw-intro-fp-duration:focus {
+ transform: scale(1.02);
+ box-shadow: 0 0 0 2px rgba(59,130,246,.3);
+ border-color: rgba(59,130,246,.6) !important;
+ }
+
+ #bingeSidebar .bw-intro-duration:hover,
+ #bingeSidebar .bw-intro-fingerprint:hover,
+ #bingeSidebar .bw-intro-fp-duration:hover {
+ border-color: rgba(59,130,246,.5) !important;
+ background: rgba(59,130,246,.15) !important;
+ }
+
#bingeSidebar .bw-end:focus {
transform: scale(1.02);
box-shadow: 0 0 0 2px rgba(239,68,68,.3);
@@ -2588,10 +2776,12 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
}
/* Input field animations */
+ #bingeSidebar .bw-intro-section,
#bingeSidebar .bw-end-section {
transition: all .2s ease;
}
+ #bingeSidebar .bw-intro-section:hover,
#bingeSidebar .bw-end-section:hover {
transform: translateX(2px);
}
@@ -2816,7 +3006,7 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
d.addEventListener('input', (e)=>{ if (e.target && e.target.id==='bwSearch') onFilter(); });
d.addEventListener('change', (e)=>{ if (e.target && e.target.id==='bwSort') onSort(); });
- const openSeriesSkipPanel = (seriesName, endSkip) => {
+ const openSeriesSkipPanel = (seriesName, seasonValue, introDuration, introFingerprint, introFingerprintDuration, endSkip) => {
const existingPanel = document.getElementById('bwSeriesSkipPanel');
if (existingPanel) {
existingPanel.remove();
@@ -2844,6 +3034,39 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
boxShadow: '0 10px 30px rgba(0,0,0,.4)',
});
+ const introSectionHtml = `
+
@@ -2868,6 +3091,7 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
+ ${introSectionHtml}
${endSectionHtml}
`;
@@ -2913,6 +3137,42 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
if (!window.__bwDebouncers) window.__bwDebouncers = Object.create(null);
panel.addEventListener('input', (ev) => {
+ const introDurationInput = ev.target.closest && ev.target.closest('input.bw-intro-duration');
+ if (introDurationInput) {
+ const series = introDurationInput.dataset.series; if (!series) return;
+ const season = parseInt(introDurationInput.dataset.season || '0', 10) || 0;
+ const key = '__deb_intro_duration_' + series + '_' + season;
+ if (window.__bwDebouncers[key]) clearTimeout(window.__bwDebouncers[key]);
+ window.__bwDebouncers[key] = setTimeout(() => {
+ const seconds = parseInt(introDurationInput.value || '0', 10) || 0;
+ localStorage.setItem('bw_intro_duration_update', JSON.stringify({ series, season, seconds }));
+ }, 600);
+ }
+
+ const introFingerprintInput = ev.target.closest && ev.target.closest('input.bw-intro-fingerprint');
+ if (introFingerprintInput) {
+ const series = introFingerprintInput.dataset.series; if (!series) return;
+ const season = parseInt(introFingerprintInput.dataset.season || '0', 10) || 0;
+ const key = '__deb_intro_fp_' + series + '_' + season;
+ if (window.__bwDebouncers[key]) clearTimeout(window.__bwDebouncers[key]);
+ window.__bwDebouncers[key] = setTimeout(() => {
+ const fingerprint = String(introFingerprintInput.value || '').trim();
+ localStorage.setItem('bw_intro_fp_update', JSON.stringify({ series, season, fingerprint }));
+ }, 600);
+ }
+
+ const introFingerprintDurationInput = ev.target.closest && ev.target.closest('input.bw-intro-fp-duration');
+ if (introFingerprintDurationInput) {
+ const series = introFingerprintDurationInput.dataset.series; if (!series) return;
+ const season = parseInt(introFingerprintDurationInput.dataset.season || '0', 10) || 0;
+ const key = '__deb_intro_fp_duration_' + series + '_' + season;
+ if (window.__bwDebouncers[key]) clearTimeout(window.__bwDebouncers[key]);
+ window.__bwDebouncers[key] = setTimeout(() => {
+ const seconds = parseInt(introFingerprintDurationInput.value || '0', 10) || 0;
+ localStorage.setItem('bw_intro_fp_duration_update', JSON.stringify({ series, season, seconds }));
+ }, 600);
+ }
+
const endInput = ev.target.closest && ev.target.closest('input.bw-end');
if (endInput) {
const series = endInput.dataset.series; if (!series) return;
@@ -3127,9 +3387,20 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
const skipPanelButton = c('.bw-series-settings');
if (skipPanelButton) {
const seriesName = skipPanelButton.getAttribute('data-series');
+ const seasonValue = parseInt(skipPanelButton.getAttribute('data-season') || '0', 10) || 0;
+ const introDuration = parseInt(skipPanelButton.getAttribute('data-intro-duration') || '0', 10) || 0;
+ const introFingerprint = skipPanelButton.getAttribute('data-intro-fingerprint') || '';
+ const introFingerprintDuration = parseInt(skipPanelButton.getAttribute('data-intro-fp-duration') || '0', 10) || 0;
const endSkip = parseInt(skipPanelButton.getAttribute('data-end-skip') || '0', 10) || 0;
if (seriesName) {
- openSeriesSkipPanel(seriesName, endSkip);
+ openSeriesSkipPanel(
+ seriesName,
+ seasonValue,
+ introDuration,
+ introFingerprint,
+ introFingerprintDuration,
+ endSkip
+ );
}
return;
}
@@ -3138,9 +3409,14 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
if (item) {
// Check if click originated from input field or delete button - don't trigger navigation
const clickedEndInput = e.target.closest && e.target.closest('input.bw-end');
+ const clickedIntroInput = e.target.closest && (
+ e.target.closest('input.bw-intro-duration') ||
+ e.target.closest('input.bw-intro-fingerprint') ||
+ e.target.closest('input.bw-intro-fp-duration')
+ );
const clickedDelete = e.target.closest && e.target.closest('.bw-delete');
const clickedSkipSettings = e.target.closest && e.target.closest('.bw-series-settings');
- if (clickedEndInput || clickedDelete || clickedSkipSettings) return;
+ if (clickedEndInput || clickedIntroInput || clickedDelete || clickedSkipSettings) return;
if (localStorage.getItem('bw_nav_inflight') === '1') return; // throttle
localStorage.setItem('bw_nav_inflight','1');
@@ -3372,6 +3648,104 @@ def main() -> None:
# Handle end screen updates (from sidebar input) – normalisieren + live anwenden
try:
+ upd = read_localstorage_value(driver, "bw_intro_duration_update")
+ if upd:
+ data = json.loads(upd)
+ ser_raw = data.get("series", "")
+ season_raw = data.get("season", 0)
+ secs_raw = data.get("seconds", 0)
+ ser = norm_series_key(ser_raw)
+ try:
+ season_value = max(0, int(float(season_raw)))
+ except Exception:
+ season_value = 0
+ try:
+ secs = max(0, int(float(secs_raw)))
+ except Exception:
+ secs = 0
+
+ if ser and season_value > 0:
+ merge_intro_fingerprint_entry(
+ series=ser,
+ season=season_value,
+ full_intro_duration_seconds=secs,
+ fingerprint=None,
+ fingerprint_duration=None,
+ )
+
+ html = build_items_html(load_progress(), get_settings(driver))
+ driver.execute_script(
+ "if (window.__bwSetList){window.__bwSetList(arguments[0]);}",
+ html,
+ )
+ except Exception:
+ pass
+
+ try:
+ upd = read_localstorage_value(driver, "bw_intro_fp_update")
+ if upd:
+ data = json.loads(upd)
+ ser_raw = data.get("series", "")
+ season_raw = data.get("season", 0)
+ fingerprint_raw = data.get("fingerprint", "")
+ ser = norm_series_key(ser_raw)
+ try:
+ season_value = max(0, int(float(season_raw)))
+ except Exception:
+ season_value = 0
+ fingerprint_value = str(fingerprint_raw or "").strip()
+
+ if ser and season_value > 0:
+ merge_intro_fingerprint_entry(
+ series=ser,
+ season=season_value,
+ full_intro_duration_seconds=None,
+ fingerprint=fingerprint_value,
+ fingerprint_duration=None,
+ )
+
+ html = build_items_html(load_progress(), get_settings(driver))
+ driver.execute_script(
+ "if (window.__bwSetList){window.__bwSetList(arguments[0]);}",
+ html,
+ )
+ except Exception:
+ pass
+
+ try:
+ upd = read_localstorage_value(driver, "bw_intro_fp_duration_update")
+ if upd:
+ data = json.loads(upd)
+ ser_raw = data.get("series", "")
+ season_raw = data.get("season", 0)
+ secs_raw = data.get("seconds", 0)
+ ser = norm_series_key(ser_raw)
+ try:
+ season_value = max(0, int(float(season_raw)))
+ except Exception:
+ season_value = 0
+ try:
+ secs = max(0, int(float(secs_raw)))
+ except Exception:
+ secs = 0
+
+ if ser and season_value > 0:
+ merge_intro_fingerprint_entry(
+ series=ser,
+ season=season_value,
+ full_intro_duration_seconds=None,
+ fingerprint=None,
+ fingerprint_duration=secs,
+ )
+
+ html = build_items_html(load_progress(), get_settings(driver))
+ driver.execute_script(
+ "if (window.__bwSetList){window.__bwSetList(arguments[0]);}",
+ html,
+ )
+ except Exception:
+ pass
+
upd = read_localstorage_value(driver, "bw_end_update")
if upd:
data = json.loads(upd)
From c400974c2b1dd826c5e1d4ff112af66cc38a2b7d Mon Sep 17 00:00:00 2001
From: Moritz Nonnemann <44306276+FieteGM@users.noreply.github.com>
Date: Wed, 4 Feb 2026 17:18:49 +0100
Subject: [PATCH 04/26] Add MP3 picker for intro fingerprints
---
README.md | 7 +
SerienJunkie/intro_uploads/.gitkeep | 1 +
SerienJunkie/s.toBot.py | 282 +++++++++++++++++++++++++++-
3 files changed, 288 insertions(+), 2 deletions(-)
create mode 100644 SerienJunkie/intro_uploads/.gitkeep
diff --git a/README.md b/README.md
index c45f054..ac60272 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,12 @@ fingerprint is present, an external matcher can signal a match by writing the
matched key into `localStorage` as `bw_intro_fp_match`. You can also edit these
values per series/season from the in-app “Skip Settings” panel.
+To generate a fingerprint without editing JSON, drop your MP3 into
+`SerienJunkie/intro_uploads/`, open the per-series “Skip Settings” panel, and
+select the file in the “Select MP3 (intro_uploads)” picker. The app will
+generate the fingerprint, save it into `intro_fingerprints.json`, and delete the
+MP3 after processing.
+
## Data Files
- `progress.json`: persisted progress by series.
@@ -135,6 +141,7 @@ SerienJunkie/
├── geckodriver.exe # Firefox WebDriver
├── progress.json # Progress database (auto-created)
├── intro_fingerprints.json # Optional intro fingerprint data
+├── intro_uploads/ # Optional MP3 drop folder
└── user.BingeWatcher/ # Firefox profile (auto-created)
```
diff --git a/SerienJunkie/intro_uploads/.gitkeep b/SerienJunkie/intro_uploads/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/SerienJunkie/intro_uploads/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/SerienJunkie/s.toBot.py b/SerienJunkie/s.toBot.py
index 44c0996..597d19d 100644
--- a/SerienJunkie/s.toBot.py
+++ b/SerienJunkie/s.toBot.py
@@ -3,8 +3,11 @@
import logging
import os
import re
+import shutil
+import subprocess
+import tempfile
import time
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
from urllib.parse import unquote
from selenium import webdriver
@@ -31,6 +34,7 @@
PROGRESS_DB_FILE = os.path.join(SCRIPT_DIR, "progress.json")
SETTINGS_DB_FILE = os.path.join(SCRIPT_DIR, "settings.json")
INTRO_FINGERPRINTS_FILE = os.path.join(SCRIPT_DIR, "intro_fingerprints.json")
+INTRO_UPLOAD_DIR = os.path.join(SCRIPT_DIR, "intro_uploads")
# === STREAMING PROVIDERS ===
STREAMING_PROVIDERS = {
@@ -286,6 +290,93 @@ def merge_intro_fingerprint_entry(
)
+def _resolve_fpcalc_binary() -> Optional[str]:
+ fpcalc_binary: Optional[str] = shutil.which("fpcalc")
+ if fpcalc_binary:
+ return fpcalc_binary
+ return shutil.which("fpcalc.exe")
+
+
+def extract_fingerprint_from_mp3(mp3_bytes: bytes) -> Optional[Dict[str, Any]]:
+ fpcalc_binary: Optional[str] = _resolve_fpcalc_binary()
+ if not fpcalc_binary:
+ logging.error("fpcalc binary not found. Please install Chromaprint.")
+ return None
+
+ temp_file = None
+ try:
+ temp_file = tempfile.NamedTemporaryFile(
+ mode="wb",
+ suffix=".mp3",
+ delete=False,
+ dir=SCRIPT_DIR,
+ )
+ temp_file.write(mp3_bytes)
+ temp_file.flush()
+ temp_file.close()
+
+ result = subprocess.run(
+ [fpcalc_binary, "-json", temp_file.name],
+ capture_output=True,
+ text=True,
+ check=False,
+ )
+ if result.returncode != 0:
+ logging.error(
+ f"fpcalc failed: {result.stderr.strip() or 'unknown error'}"
+ )
+ return None
+
+ payload = json.loads(result.stdout or "{}")
+ if not isinstance(payload, dict):
+ return None
+
+ fingerprint_value: str = str(payload.get("fingerprint", "") or "").strip()
+ duration_value: int = int(payload.get("duration", 0) or 0)
+ if not fingerprint_value:
+ return None
+
+ return {
+ "fingerprint": fingerprint_value,
+ "fingerprintDuration": duration_value,
+ }
+ except Exception as e:
+ logging.error(f"Fingerprint extraction failed: {e}")
+ return None
+ finally:
+ try:
+ if temp_file is not None and os.path.exists(temp_file.name):
+ os.remove(temp_file.name)
+ except Exception:
+ pass
+
+
+def list_intro_upload_files() -> List[str]:
+ try:
+ os.makedirs(INTRO_UPLOAD_DIR, exist_ok=True)
+ files = [
+ name
+ for name in os.listdir(INTRO_UPLOAD_DIR)
+ if name.lower().endswith(".mp3")
+ ]
+ return sorted(files)
+ except Exception:
+ return []
+
+
+def resolve_intro_upload_path(filename: str) -> Optional[str]:
+ safe_name: str = os.path.basename(filename or "")
+ if not safe_name:
+ return None
+ candidate: str = os.path.join(INTRO_UPLOAD_DIR, safe_name)
+ try:
+ if os.path.exists(candidate):
+ return candidate
+ except Exception:
+ return None
+ return None
+
+
def read_intro_fingerprint_match(driver: webdriver.Firefox) -> Optional[str]:
try:
driver.switch_to.default_content()
@@ -2431,6 +2522,7 @@ def build_items_html(db: Dict[str, Dict[str, Any]], settings: Optional[Dict[str,
"""Erstellt HTML für die Sidebar mit Streaming-Anbieter-Tabs."""
if settings is None:
settings = {}
+ intro_upload_files: List[str] = list_intro_upload_files()
intro_fingerprints: Dict[str, Dict[str, Any]] = load_intro_fingerprints()
# Gruppiere Serien nach Anbietern
provider_series = {}
@@ -2511,7 +2603,9 @@ def build_items_html(db: Dict[str, Dict[str, Any]], settings: Optional[Dict[str,
''')
# Kombiniere alles
+ upload_meta = _html.escape(json.dumps(intro_upload_files), quote=True)
tabs_container = f'''
+
{"".join(tabs_html)}
@@ -3064,6 +3158,19 @@ def inject_sidebar(driver: webdriver.Firefox, db: Dict[str, Dict[str, Any]]) ->
placeholder="0" title="Fingerprint duration in seconds"/>
+