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

[scrobbles] Clean up references to book_page_data

Browse Source
This commit is contained in:
Colin Powell
2024-09-08 00:52:50 -04:00
parent d69d7311d5
commit 6c0bd2e409
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vrobbler/apps/scrobbles/models.py
View File

@ -512,7 +512,9 @@ class Scrobble(TimeStampedModel):
LifeEvent, on_delete=models.DO_NOTHING, **BNULL LifeEvent, on_delete=models.DO_NOTHING, **BNULL
) )
mood = models.ForeignKey(Mood, on_delete=models.DO_NOTHING, **BNULL) mood = models.ForeignKey(Mood, on_delete=models.DO_NOTHING, **BNULL)
brickset = models.ForeignKey(BrickSet, on_delete=models.DO_NOTHING, **BNULL) brickset = models.ForeignKey(
BrickSet, on_delete=models.DO_NOTHING, **BNULL
)
media_type = models.CharField( media_type = models.CharField(
max_length=14, choices=MediaType.choices, default=MediaType.VIDEO max_length=14, choices=MediaType.choices, default=MediaType.VIDEO
) )
@ -894,15 +896,15 @@ class Scrobble(TimeStampedModel):
def calc_reading_duration(self) -> int: def calc_reading_duration(self) -> int:
duration = 0 duration = 0
if self.book_page_data: if self.logdata.page_data:
for k, v in self.book_page_data.items(): for k, v in self.logdata.page_data.items():
duration += v.get("duration") duration += v.get("duration")
return duration return duration
def calc_pages_read(self) -> int: def calc_pages_read(self) -> int:
pages_read = 0 pages_read = 0
if self.book_page_data: if self.logdata.page_data:
pages = [int(k) for k in self.book_page_data.keys()] pages = [int(k) for k in self.logdata.page_data.keys()]
pages.sort() pages.sort()
if len(pages) == 1: if len(pages) == 1:
pages_read = 1 pages_read = 1
@ -915,8 +917,8 @@ class Scrobble(TimeStampedModel):
@property @property
def last_page_read(self) -> int: def last_page_read(self) -> int:
last_page = 0 last_page = 0
if self.book_page_data: if self.logdata.page_data:
pages = [int(k) for k in self.book_page_data.keys()] pages = [int(k) for k in self.logdata.page_data.keys()]
pages.sort() pages.sort()
last_page = pages[-1] last_page = pages[-1]
return last_page return last_page