secstate/vrobbler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[books] Fix timezones and duplicated scrobbles

Browse Source
This commit is contained in:
Colin Powell
2024-03-23 02:11:06 -04:00
parent 261f2eb9ce
commit 134bd3f650
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vrobbler/apps/books/koreader.py
View File

@ -1,7 +1,7 @@
import logging import logging
import re import re
import sqlite3 import sqlite3
from datetime import datetime from datetime import datetime, timedelta
from enum import Enum from enum import Enum
import pytz import pytz
@ -222,14 +222,12 @@ def build_scrobbles_from_book_map(
last_page_number = 0 last_page_number = 0
pages_processed = 0 pages_processed = 0
total_pages = len(book_map[koreader_book_id]["pages"]) total_pages_read = len(book_map[koreader_book_id]["pages"])
for cur_page_number, stats in book_map[koreader_book_id][ for cur_page_number, stats in book_map[koreader_book_id][
"pages" "pages"
].items(): ].items():
pages_processed += 1 pages_processed += 1
# Accumulate our page data for this scrobble
scrobble_page_data[cur_page_number] = stats
seconds_from_last_page = 0 seconds_from_last_page = 0
if prev_page_stats: if prev_page_stats:
@ -241,17 +239,13 @@ def build_scrobbles_from_book_map(
"duration" "duration"
) )
end_of_reading = pages_processed == total_pages end_of_reading = pages_processed == total_pages_read
big_jump_to_this_page = (cur_page_number - last_page_number) > 10 big_jump_to_this_page = (cur_page_number - last_page_number) > 10
is_session_gap = seconds_from_last_page > SESSION_GAP_SECONDS
if ( if (
seconds_from_last_page > SESSION_GAP_SECONDS is_session_gap and not big_jump_to_this_page
and not big_jump_to_this_page
) or end_of_reading: ) or end_of_reading:
should_create_scrobble = True should_create_scrobble = True
else:
logger.info(
f"{koreader_book_id}, {big_jump_to_this_page}, {seconds_from_last_page}"
)
if should_create_scrobble: if should_create_scrobble:
first_page = scrobble_page_data.get( first_page = scrobble_page_data.get(
@ -282,6 +276,13 @@ def build_scrobbles_from_book_map(
): ):
timestamp.replace(tzinfo=pytz.timezone("Europe/Paris")) timestamp.replace(tzinfo=pytz.timezone("Europe/Paris"))
elif (
timestamp.tzinfo._dst.seconds == 0
or stop_timestamp.tzinfo._dst.seconds == 0
):
timestamp = timestamp - timedelta(hours=1)
stop_timestamp = stop_timestamp - timedelta(hours=1)
scrobble = Scrobble.objects.filter( scrobble = Scrobble.objects.filter(
timestamp=timestamp, timestamp=timestamp,
book_id=book_id, book_id=book_id,
@ -314,6 +315,9 @@ def build_scrobbles_from_book_map(
playback_position_seconds = 0 playback_position_seconds = 0
scrobble_page_data = {} scrobble_page_data = {}
# We accumulate pages for the scrobble until we should create a new one
scrobble_page_data[cur_page_number] = stats
last_page_number = cur_page_number last_page_number = cur_page_number
prev_page_stats = stats prev_page_stats = stats
if pages_not_found: if pages_not_found: