Finalize fixes
This commit is contained in:
1 parent
b3e3a97c2b
commit
1f216a8e8d
2 files changed
+122
-16
No files matched your search
@@ -113,21 +113,33 @@ def index():
|
||||
def report():
|
||||
week_start, week_end, _ = current_week() # This is the week range for display (e.g., Feb 15-21)
|
||||
total_episodes = int(os.environ.get("TOTAL_EPISODES", 1155))
|
||||
latest = get_latest_sunday() # This is the cutoff for searching (e.g., Feb 21 16:00 UTC)
|
||||
previous = get_previous_sunday()
|
||||
latest = get_latest_sunday() # e.g., 2026-02-21T16:00:00.000Z
|
||||
previous = get_previous_sunday() # e.g., 2026-02-14T16:00:00.000Z
|
||||
|
||||
jellyfin.clear_debug_logs()
|
||||
|
||||
# Convert latest_sunday string back to datetime for cutoff
|
||||
# Convert to datetime for cutoff
|
||||
latest_sunday_dt = datetime.fromisoformat(latest.replace("Z", "+00:00"))
|
||||
previous_sunday_dt = datetime.fromisoformat(previous.replace("Z", "+00:00"))
|
||||
user_id = os.environ["JELLYFIN_USER_ID"]
|
||||
|
||||
# Fetch latest episode (watched before latest Sunday)
|
||||
try:
|
||||
ep_info = jellyfin.find_last_one_piece_episode(latest_sunday_dt, user_id)
|
||||
except Exception as e:
|
||||
debug_output = jellyfin.get_debug_logs()
|
||||
return jsonify({"error": str(e), "debug": debug_output}), 502
|
||||
|
||||
# Fetch previous week episode (watched before previous Sunday)
|
||||
try:
|
||||
prev_ep_info = jellyfin.find_last_one_piece_before_previous_sunday(previous_sunday_dt, user_id)
|
||||
previous_episode = prev_ep_info["episode_number"]
|
||||
except Exception as e:
|
||||
_debug.add(f"✗ Could not find previous Sunday episode: {e}")
|
||||
_debug.add("✓ Falling back to DB seed or latest episode")
|
||||
prev = db.get_previous_episode(week_start.isoformat())
|
||||
previous_episode = prev["episode_number"] if prev else ep_info["episode_number"]
|
||||
|
||||
db.save_episode(
|
||||
episode_number=ep_info["episode_number"],
|
||||
week_start=week_start.isoformat(),
|
||||
@@ -137,8 +149,6 @@ def report():
|
||||
watched_at=ep_info.get("watched_at"),
|
||||
)
|
||||
|
||||
prev = db.get_previous_episode(week_start.isoformat())
|
||||
previous_episode = prev["episode_number"] if prev else ep_info["episode_number"]
|
||||
watched_this_week = ep_info["episode_number"] - previous_episode
|
||||
|
||||
date_range = format_date_range(week_start, week_end)
|
||||
|
||||
Reference in new issue
Block a user