Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a681b4d63b | |||
| c452ac24e0 | |||
| ae889bff7d | |||
| 99dc86dc27 | |||
| 8eefcb8290 | |||
| ad0f9a54d0 | |||
| 1531b77b5c | |||
| 9437fdba60 | |||
| a7551ef162 | |||
| c20204a6ea | |||
| 685de842ea | |||
| 7d13967708 | |||
| 109697a746 | |||
| dde28f4aff | |||
| 2f6ed3770f | |||
| e3d1cfb838 | |||
| 1821ac0d7b | |||
| 4eb8289e55 | |||
| 66e805542c | |||
| f91b127a2c | |||
| b2077678e2 | |||
| 5427198185 | |||
| 2bdba14cd6 | |||
| 95d8c4e4d6 |
48
PROJECT.org
48
PROJECT.org
@ -79,20 +79,7 @@ fetching and simple saving.
|
|||||||
:LOGBOOK:
|
:LOGBOOK:
|
||||||
CLOCK: [2025-07-09 Wed 09:55]--[2025-07-09 Wed 10:15] => 0:20
|
CLOCK: [2025-07-09 Wed 09:55]--[2025-07-09 Wed 10:15] => 0:20
|
||||||
:END:
|
:END:
|
||||||
* Backlog [4/27]
|
* Backlog [1/22]
|
||||||
** STRT Only create a LastFM import if there are files to import :vrobbler:feature:lastfm:importers:project:personal:
|
|
||||||
:PROPERTIES:
|
|
||||||
:ID: 7a1456af-c5f1-6385-b34f-0be24a6b65b0
|
|
||||||
:END:
|
|
||||||
- Note taken on [2025-07-20 Sun 16:21]
|
|
||||||
|
|
||||||
This thing is kicking my butt. As it stands it works, but the scrobbles are not assigned to the tracks properly.
|
|
||||||
** TODO Add timezone awarness to IMAP importer :personal:project:vrobbler:feature:importer:imap:timezones:
|
|
||||||
** DONE Track timezone changes for profiles :vrobbler:feature:profiles:personal:project:
|
|
||||||
:PROPERTIES:
|
|
||||||
:ID: 89ec867f-29fd-82f1-be17-b49dddc30c78
|
|
||||||
:END:
|
|
||||||
[2025-07-11 14:23]
|
|
||||||
** TODO [#A] Add classmethod for metadata fetching to tracks :vrobbler:feature:music:personal:project:
|
** TODO [#A] Add classmethod for metadata fetching to tracks :vrobbler:feature:music:personal:project:
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:ID: bc4b45e5-4c65-13c5-ab7b-1937d3fbf5c2
|
:ID: bc4b45e5-4c65-13c5-ab7b-1937d3fbf5c2
|
||||||
@ -456,6 +443,39 @@ it's annoying.
|
|||||||
** TODO [#C] Allow users to see tasks on calendar view :vrobbler:personal:project:templates:feature:
|
** TODO [#C] Allow users to see tasks on calendar view :vrobbler:personal:project:templates:feature:
|
||||||
https://codepen.io/oliviale/pen/QYqybo
|
https://codepen.io/oliviale/pen/QYqybo
|
||||||
** TODO [#C] Come up with a possible flow using WebDAV and super-productivity for tasks :personal:feature:project:vrobbler:tasks:
|
** TODO [#C] Come up with a possible flow using WebDAV and super-productivity for tasks :personal:feature:project:vrobbler:tasks:
|
||||||
|
* Version 19.0
|
||||||
|
** DONE Add periodic check for mood :vrobbler:feature:moods:personal:project:
|
||||||
|
:PROPERTIES:
|
||||||
|
:ID: 55404488-c69f-0dd5-838e-1d1e15c873eb
|
||||||
|
:END:
|
||||||
|
* Version 18.7
|
||||||
|
** DONE Use the timezone history log to fix old Scrobbles that fall into those timezone blocks :vrobbler:chore:scrobbles:project:personal:
|
||||||
|
:PROPERTIES:
|
||||||
|
:ID: 9d055ac1-584b-20c8-7ad9-9ce36b329dc7
|
||||||
|
:END:
|
||||||
|
* Version 18.4
|
||||||
|
** DONE Track timezone changes for profiles :vrobbler:feature:profiles:personal:project:
|
||||||
|
:PROPERTIES:
|
||||||
|
:ID: 89ec867f-29fd-82f1-be17-b49dddc30c78
|
||||||
|
:END:
|
||||||
|
[2025-07-11 14:23]
|
||||||
|
** DONE Only create a LastFM import if there are files to import :vrobbler:feature:lastfm:importers:project:personal:
|
||||||
|
:PROPERTIES:
|
||||||
|
:ID: 7a1456af-c5f1-6385-b34f-0be24a6b65b0
|
||||||
|
:END:
|
||||||
|
- Note taken on [2025-07-20 Sun 16:21]
|
||||||
|
|
||||||
|
This thing is kicking my butt. As it stands it works, but the scrobbles are not assigned to the tracks properly.
|
||||||
|
* Version 18.3
|
||||||
|
** DONE Add timezone awarness to IMAP importer :personal:project:vrobbler:feature:importer:imap:timezones:
|
||||||
|
:PROPERTIES:
|
||||||
|
:ID: 05837b7c-96aa-6190-3678-e2ae7c7cac75
|
||||||
|
:END:
|
||||||
|
* Version 18
|
||||||
|
** DONE Condense tracks of the same title by the same artist with multiple albums :vrobbler:feature:music:project:personal:
|
||||||
|
:PROPERTIES:
|
||||||
|
:ID: b39fcec8-59fd-eab0-5809-b8144c7d2708
|
||||||
|
:END:
|
||||||
** DONE Import from BG stats a "learning" log field when "Learning to play" is in the comment :vrobbler:feature:boardgames:project:personal:
|
** DONE Import from BG stats a "learning" log field when "Learning to play" is in the comment :vrobbler:feature:boardgames:project:personal:
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:ID: fda59fab-4349-e99e-54c6-9f1392a1c474
|
:ID: fda59fab-4349-e99e-54c6-9f1392a1c474
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -7,23 +7,24 @@ from rest_framework.authtoken.models import Token
|
|||||||
from boardgames.models import BoardGame
|
from boardgames.models import BoardGame
|
||||||
from music.models import Track, Artist
|
from music.models import Track, Artist
|
||||||
from scrobbles.models import Scrobble
|
from scrobbles.models import Scrobble
|
||||||
|
from people.models import Person
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def boardgame_scrobble():
|
def boardgame_scrobble():
|
||||||
user = User.objects.create(
|
first = Person.objects.create(name="First Player")
|
||||||
email="test@exmaple.com", first_name="Test", last_name="User"
|
second = Person.objects.create(name="Second Player")
|
||||||
)
|
|
||||||
return Scrobble.objects.create(
|
return Scrobble.objects.create(
|
||||||
board_game=BoardGame.objects.create(title="Test Board Game"),
|
board_game=BoardGame.objects.create(title="Test Board Game"),
|
||||||
media_type="BoardGame",
|
media_type="BoardGame",
|
||||||
played_to_completion=True,
|
played_to_completion=True,
|
||||||
log={
|
log={
|
||||||
"players": [
|
"players": [
|
||||||
{"user_id": user.id, "win": True, "score": 30, "color": "Blue"}
|
{"person_id": first.id, "win": True, "score": 30, "color": "Blue"},
|
||||||
]
|
{"person_id": second.id, "win": False, "score": 28, "color": "Red"}
|
||||||
|
],
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -3,14 +3,13 @@ import pytest
|
|||||||
from scrobbles.dataclasses import BoardGameLogData, BoardGameScoreLogData
|
from scrobbles.dataclasses import BoardGameLogData, BoardGameScoreLogData
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.skip("Need to get local tests running working again")
|
||||||
@pytest.mark.django_db
|
@pytest.mark.django_db
|
||||||
def test_boardgame_log_data(boardgame_scrobble):
|
def test_boardgame_log_data(boardgame_scrobble):
|
||||||
assert not boardgame_scrobble.geo_location
|
|
||||||
assert boardgame_scrobble.logdata == BoardGameLogData(
|
assert boardgame_scrobble.logdata == BoardGameLogData(
|
||||||
players=[
|
players=[
|
||||||
BoardGameScoreLogData(
|
BoardGameScoreLogData(
|
||||||
user_id=1,
|
person_id=1,
|
||||||
name_str="",
|
|
||||||
bgg_username="",
|
bgg_username="",
|
||||||
color="Blue",
|
color="Blue",
|
||||||
character=None,
|
character=None,
|
||||||
@ -18,10 +17,24 @@ def test_boardgame_log_data(boardgame_scrobble):
|
|||||||
score=30,
|
score=30,
|
||||||
win=True,
|
win=True,
|
||||||
new=None,
|
new=None,
|
||||||
)
|
rank=None,
|
||||||
|
seat_order=None,
|
||||||
|
role=None
|
||||||
|
),
|
||||||
|
BoardGameScoreLogData(
|
||||||
|
person_id=2,
|
||||||
|
bgg_username="",
|
||||||
|
color="Red",
|
||||||
|
character=None,
|
||||||
|
team=None,
|
||||||
|
score=28,
|
||||||
|
win=False,
|
||||||
|
new=None,
|
||||||
|
rank=None,
|
||||||
|
seat_order=None,
|
||||||
|
role=None
|
||||||
|
),
|
||||||
],
|
],
|
||||||
location=None,
|
|
||||||
geo_location_id=None,
|
|
||||||
difficulty=None,
|
difficulty=None,
|
||||||
solo=None,
|
solo=None,
|
||||||
two_handed=None,
|
two_handed=None,
|
||||||
|
|||||||
@ -3,7 +3,7 @@ from boardgames.models import BoardGame
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from scrobbles.models import Scrobble
|
from scrobbles.models import Scrobble
|
||||||
from scrobbles.notifications import NtfyNotification
|
from scrobbles.notifications import ScrobbleNtfyNotification
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
|
|
||||||
@ -124,5 +124,5 @@ def import_chess_games_for_all_users():
|
|||||||
if scrobbles_to_create:
|
if scrobbles_to_create:
|
||||||
created = Scrobble.objects.bulk_create(scrobbles_to_create)
|
created = Scrobble.objects.bulk_create(scrobbles_to_create)
|
||||||
for scrobble in created:
|
for scrobble in created:
|
||||||
NtfyNotification(scrobble).send()
|
ScrobbleNtfyNotification(scrobble).send()
|
||||||
return scrobbles_to_create
|
return scrobbles_to_create
|
||||||
|
|||||||
@ -3,16 +3,14 @@ import re
|
|||||||
import sqlite3
|
import sqlite3
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
import pendulum
|
|
||||||
from zoneinfo import ZoneInfo
|
from zoneinfo import ZoneInfo
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from books.constants import BOOKS_TITLES_TO_IGNORE
|
from books.constants import BOOKS_TITLES_TO_IGNORE
|
||||||
from django.apps import apps
|
from django.apps import apps
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
|
from scrobbles.notifications import ScrobbleNtfyNotification
|
||||||
from stream_sqlite import stream_sqlite
|
from stream_sqlite import stream_sqlite
|
||||||
from scrobbles.notifications import NtfyNotification
|
|
||||||
from vrobbler.apps.profiles.utils import one_off_fix_colins_profile
|
|
||||||
from webdav.client import get_webdav_client
|
from webdav.client import get_webdav_client
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@ -287,9 +285,6 @@ def build_scrobbles_from_book_map(
|
|||||||
datetime.fromtimestamp(int(last_page.get("end_ts")))
|
datetime.fromtimestamp(int(last_page.get("end_ts")))
|
||||||
)
|
)
|
||||||
|
|
||||||
if user.id == 1 and not user.profile.timezone_change_log:
|
|
||||||
one_off_fix_colins_profile(user.profile)
|
|
||||||
|
|
||||||
# Adjust for Daylight Saving Time
|
# Adjust for Daylight Saving Time
|
||||||
if timestamp.dst() == timedelta(
|
if timestamp.dst() == timedelta(
|
||||||
0
|
0
|
||||||
@ -414,7 +409,7 @@ def process_koreader_sqlite_file(file_path, user_id) -> list:
|
|||||||
if new_scrobbles:
|
if new_scrobbles:
|
||||||
created = Scrobble.objects.bulk_create(new_scrobbles)
|
created = Scrobble.objects.bulk_create(new_scrobbles)
|
||||||
if created:
|
if created:
|
||||||
NtfyNotification(created[-1]).send()
|
ScrobbleNtfyNotification(created[-1]).send()
|
||||||
fix_long_play_stats_for_scrobbles(created)
|
fix_long_play_stats_for_scrobbles(created)
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Created {len(created)} scrobbles",
|
f"Created {len(created)} scrobbles",
|
||||||
|
|||||||
@ -7,6 +7,7 @@ from profiles.models import UserProfile
|
|||||||
class UserProfileAdmin(admin.ModelAdmin):
|
class UserProfileAdmin(admin.ModelAdmin):
|
||||||
date_hierarchy = "created"
|
date_hierarchy = "created"
|
||||||
ordering = ("-created",)
|
ordering = ("-created",)
|
||||||
|
readonly_fields = ("timezone_change_log",)
|
||||||
exclude = (
|
exclude = (
|
||||||
"twitch_token",
|
"twitch_token",
|
||||||
"twitch_client_secret",
|
"twitch_client_secret",
|
||||||
|
|||||||
@ -0,0 +1,23 @@
|
|||||||
|
# Generated by Django 4.2.19 on 2025-07-30 22:27
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('profiles', '0026_userprofile_timezone_change_log'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='userprofile',
|
||||||
|
name='mood_checkin_enabled',
|
||||||
|
field=models.BooleanField(default=False),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='userprofile',
|
||||||
|
name='mood_checkin_frequency',
|
||||||
|
field=models.CharField(default='hourly', max_length=20),
|
||||||
|
),
|
||||||
|
]
|
||||||
@ -16,6 +16,7 @@ BNULL = {"blank": True, "null": True}
|
|||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class UserProfile(TimeStampedModel):
|
class UserProfile(TimeStampedModel):
|
||||||
user = models.OneToOneField(
|
user = models.OneToOneField(
|
||||||
User, on_delete=models.CASCADE, related_name="profile"
|
User, on_delete=models.CASCADE, related_name="profile"
|
||||||
@ -55,6 +56,9 @@ class UserProfile(TimeStampedModel):
|
|||||||
imap_pass = EncryptedField(**BNULL)
|
imap_pass = EncryptedField(**BNULL)
|
||||||
imap_auto_import = models.BooleanField(default=False)
|
imap_auto_import = models.BooleanField(default=False)
|
||||||
|
|
||||||
|
mood_checkin_enabled = models.BooleanField(default=False)
|
||||||
|
mood_checkin_frequency = models.CharField(max_length=20, default="hourly")
|
||||||
|
|
||||||
ntfy_url = models.CharField(max_length=255, **BNULL)
|
ntfy_url = models.CharField(max_length=255, **BNULL)
|
||||||
ntfy_enabled = models.BooleanField(default=False)
|
ntfy_enabled = models.BooleanField(default=False)
|
||||||
|
|
||||||
@ -72,7 +76,10 @@ class UserProfile(TimeStampedModel):
|
|||||||
old_instance = UserProfile.objects.get(pk=self.pk)
|
old_instance = UserProfile.objects.get(pk=self.pk)
|
||||||
is_timezone_change = self.timezone != old_instance.timezone
|
is_timezone_change = self.timezone != old_instance.timezone
|
||||||
if is_timezone_change:
|
if is_timezone_change:
|
||||||
logger.info("Updating timezone changelog for user", extra={"profile_id": self.id})
|
logger.info(
|
||||||
|
"Updating timezone changelog for user",
|
||||||
|
extra={"profile_id": self.id},
|
||||||
|
)
|
||||||
previous_changes = old_instance.timezone_change_log
|
previous_changes = old_instance.timezone_change_log
|
||||||
now = timezone.now().replace(microsecond=0)
|
now = timezone.now().replace(microsecond=0)
|
||||||
new_log = f"{self.timezone} - {now}"
|
new_log = f"{self.timezone} - {now}"
|
||||||
@ -98,7 +105,7 @@ class UserProfile(TimeStampedModel):
|
|||||||
change_list = self.historic_timezone_changes
|
change_list = self.historic_timezone_changes
|
||||||
for idx, start in enumerate(change_list):
|
for idx, start in enumerate(change_list):
|
||||||
try:
|
try:
|
||||||
end = change_list[idx+1]
|
end = change_list[idx + 1]
|
||||||
except IndexError:
|
except IndexError:
|
||||||
end = None
|
end = None
|
||||||
|
|
||||||
@ -111,6 +118,28 @@ class UserProfile(TimeStampedModel):
|
|||||||
|
|
||||||
return timestamp.replace(tzinfo=timezone)
|
return timestamp.replace(tzinfo=timezone)
|
||||||
|
|
||||||
|
def adjust_timezone_of_scrobbles(self, commit=False):
|
||||||
|
current_dt = None
|
||||||
|
scrobbles_to_change_qs_list = []
|
||||||
|
for boundry_dt in self.historic_timezone_changes:
|
||||||
|
if current_dt and boundry_dt:
|
||||||
|
logger.info(
|
||||||
|
f"Checking for scrobbles between {current_dt} and {boundry_dt} to update to {current_dt.tzinfo.name}"
|
||||||
|
)
|
||||||
|
scrobbles = self.user.scrobble_set.filter(
|
||||||
|
timestamp__gte=current_dt,
|
||||||
|
timestamp__lt=boundry_dt,
|
||||||
|
).exclude(timezone=current_dt.tzinfo.name)
|
||||||
|
scrobbles_to_change_qs_list.append(scrobbles)
|
||||||
|
logger.info(
|
||||||
|
f"Updating {scrobbles.count()} scrobble timezones to {current_dt.tzinfo.name}"
|
||||||
|
)
|
||||||
|
if commit:
|
||||||
|
scrobbles.update(timezone=current_dt.tzinfo.name)
|
||||||
|
|
||||||
|
current_dt = boundry_dt
|
||||||
|
return scrobbles_to_change_qs_list
|
||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
def task_context_tags(self) -> list[str]:
|
def task_context_tags(self) -> list[str]:
|
||||||
tag_list = [
|
tag_list = [
|
||||||
|
|||||||
@ -59,25 +59,27 @@ def start_of_year(dt, profile) -> datetime:
|
|||||||
return start_of_day(dt, profile).replace(month=1, day=1)
|
return start_of_day(dt, profile).replace(month=1, day=1)
|
||||||
|
|
||||||
|
|
||||||
def one_off_fix_colins_profile(profile):
|
def fix_profile_historic_timezones(profile):
|
||||||
home_tz = "America/New_York"
|
home_tz = "America/New_York"
|
||||||
|
|
||||||
europe = "2022-10-15"
|
europe = "2023-10-15 06:00:00"
|
||||||
|
europe_end = "2023-12-16 12:00:00"
|
||||||
europe_tz = "Europe/Paris"
|
europe_tz = "Europe/Paris"
|
||||||
europe_end = "2023-12-15"
|
|
||||||
|
|
||||||
washington = "2023-04-28"
|
washington = "2024-04-28 06:00:00"
|
||||||
|
washington_end = "2024-05-04 12:00:00"
|
||||||
washington_tz = "America/Los_Angeles"
|
washington_tz = "America/Los_Angeles"
|
||||||
washington_end = "2023-05-04"
|
|
||||||
|
|
||||||
camp = "2024-08-04"
|
camp = "2024-08-04 17:00:00"
|
||||||
camp_end = "2024-08-10"
|
camp_end = "2024-08-10 12:00:00"
|
||||||
camp_tz = "America/Halifax"
|
camp_tz = "America/Halifax"
|
||||||
|
|
||||||
summer = "2025-07-09 12:00:00"
|
summer = "2025-07-09 06:00:00"
|
||||||
summer_end = "2025-07-13 20:30:00"
|
summer_end = "2025-07-11 23:30:00"
|
||||||
summer_tz = "America/Los_Angeles"
|
summer_tz = "America/Los_Angeles"
|
||||||
|
|
||||||
|
profile.timezone_change_log = None
|
||||||
|
|
||||||
profile.timezone_change_log = ""
|
profile.timezone_change_log = ""
|
||||||
profile.timezone_change_log += f"{europe_tz} - {pendulum.parse(europe)}\n"
|
profile.timezone_change_log += f"{europe_tz} - {pendulum.parse(europe)}\n"
|
||||||
profile.timezone_change_log += (
|
profile.timezone_change_log += (
|
||||||
|
|||||||
@ -102,7 +102,7 @@ class ChartRecordAdmin(admin.ModelAdmin):
|
|||||||
|
|
||||||
@admin.register(Scrobble)
|
@admin.register(Scrobble)
|
||||||
class ScrobbleAdmin(admin.ModelAdmin):
|
class ScrobbleAdmin(admin.ModelAdmin):
|
||||||
# date_hierarchy = "timestamp"
|
date_hierarchy = "timestamp"
|
||||||
list_display = (
|
list_display = (
|
||||||
"timestamp",
|
"timestamp",
|
||||||
"media_name",
|
"media_name",
|
||||||
@ -112,6 +112,7 @@ class ScrobbleAdmin(admin.ModelAdmin):
|
|||||||
"in_progress",
|
"in_progress",
|
||||||
"is_paused",
|
"is_paused",
|
||||||
"played_to_completion",
|
"played_to_completion",
|
||||||
|
"user",
|
||||||
)
|
)
|
||||||
raw_id_fields = (
|
raw_id_fields = (
|
||||||
"video",
|
"video",
|
||||||
@ -140,6 +141,7 @@ class ScrobbleAdmin(admin.ModelAdmin):
|
|||||||
"long_play_complete",
|
"long_play_complete",
|
||||||
"source",
|
"source",
|
||||||
"timezone",
|
"timezone",
|
||||||
|
"user",
|
||||||
)
|
)
|
||||||
ordering = ("-timestamp",)
|
ordering = ("-timestamp",)
|
||||||
|
|
||||||
@ -148,3 +150,7 @@ class ScrobbleAdmin(admin.ModelAdmin):
|
|||||||
|
|
||||||
def playback_percent(self, obj):
|
def playback_percent(self, obj):
|
||||||
return obj.percent_played
|
return obj.percent_played
|
||||||
|
|
||||||
|
def get_queryset(self, request):
|
||||||
|
qs = super().get_queryset(request).exclude(timestamp__year=None)
|
||||||
|
return qs
|
||||||
|
|||||||
@ -7,6 +7,7 @@ from typing import Optional
|
|||||||
from dataclass_wizard import JSONWizard
|
from dataclass_wizard import JSONWizard
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from locations.models import GeoLocation
|
from locations.models import GeoLocation
|
||||||
|
from people.models import Person
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
|
|
||||||
@ -66,8 +67,7 @@ class WithOthersLogData(JSONDataclass):
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class BoardGameScoreLogData(JSONDataclass):
|
class BoardGameScoreLogData(JSONDataclass):
|
||||||
user_id: Optional[int] = None
|
person_id: Optional[int] = None
|
||||||
name_str: str = ""
|
|
||||||
bgg_username: str = ""
|
bgg_username: str = ""
|
||||||
color: Optional[str] = None
|
color: Optional[str] = None
|
||||||
character: Optional[str] = None
|
character: Optional[str] = None
|
||||||
@ -75,19 +75,27 @@ class BoardGameScoreLogData(JSONDataclass):
|
|||||||
score: Optional[int] = None
|
score: Optional[int] = None
|
||||||
win: Optional[bool] = None
|
win: Optional[bool] = None
|
||||||
new: Optional[bool] = None
|
new: Optional[bool] = None
|
||||||
|
rank: Optional[int] = None
|
||||||
|
seat_order: Optional[int] = None
|
||||||
|
role: Optional[str] = None
|
||||||
|
rank: Optional[int] = None
|
||||||
|
seat_order: Optional[int] = None
|
||||||
|
role: Optional[str] = None
|
||||||
|
lichess_username: Optional[str] = None
|
||||||
|
# Legacy
|
||||||
|
user_id: Optional[int] = None
|
||||||
|
name_str: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def user(self) -> Optional[User]:
|
def person(self) -> Optional[Person]:
|
||||||
user = None
|
return Person.objects.filter(id=self.person_id).first()
|
||||||
if self.user_id:
|
|
||||||
user = User.objects.filter(id=self.user_id).first()
|
|
||||||
return user
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self) -> str:
|
def name(self) -> str:
|
||||||
name = self.name_str
|
name = ""
|
||||||
if self.user_id:
|
if self.person:
|
||||||
name = self.user.first_name
|
name = self.person.name
|
||||||
return name
|
return name
|
||||||
|
|
||||||
def __str__(self) -> str:
|
def __str__(self) -> str:
|
||||||
@ -106,17 +114,34 @@ class BoardGameLogData(LongPlayLogData):
|
|||||||
serial_scrobble_id: Optional[int] = None
|
serial_scrobble_id: Optional[int] = None
|
||||||
long_play_complete: Optional[bool] = None
|
long_play_complete: Optional[bool] = None
|
||||||
players: Optional[list[BoardGameScoreLogData]] = None
|
players: Optional[list[BoardGameScoreLogData]] = None
|
||||||
location: Optional[str] = None
|
location_id: Optional[int] = None
|
||||||
geo_location_id: Optional[int] = None
|
|
||||||
difficulty: Optional[int] = None
|
difficulty: Optional[int] = None
|
||||||
solo: Optional[bool] = None
|
solo: Optional[bool] = None
|
||||||
two_handed: Optional[bool] = None
|
two_handed: Optional[bool] = None
|
||||||
|
expansion_ids: Optional[int] = None
|
||||||
|
moves: Optional[list] = None
|
||||||
|
rated: Optional[str] = None
|
||||||
|
speed: Optional[str] = None
|
||||||
|
variant: Optional[str] = None
|
||||||
|
lichess_id: Optional[int] = None
|
||||||
|
board: Optional[str] = None
|
||||||
|
rounds: Optional[int] = None
|
||||||
|
details: Optional[str] = None
|
||||||
|
# Legacy
|
||||||
|
learning: Optional[bool] = None
|
||||||
|
location: Optional[str] = None
|
||||||
|
geo_location_id: Optional[int] = None
|
||||||
|
scenario: Optional[str] = None
|
||||||
@cached_property
|
@cached_property
|
||||||
def geo_location(self) -> Optional[GeoLocation]:
|
def geo_location(self) -> Optional[GeoLocation]:
|
||||||
if self.geo_location_id:
|
if self.geo_location_id:
|
||||||
return GeoLocation.objects.filter(id=self.geo_location_id).first()
|
return GeoLocation.objects.filter(id=self.geo_location_id).first()
|
||||||
|
|
||||||
|
@cached_property
|
||||||
|
def player_log(self) -> str:
|
||||||
|
if self.players:
|
||||||
|
return ", ".join([BoardGameScoreLogData(**player).__str__() for player in self.players])
|
||||||
|
return ""
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class BookPageLogData(JSONDataclass):
|
class BookPageLogData(JSONDataclass):
|
||||||
|
|||||||
@ -50,20 +50,23 @@ class LastFM:
|
|||||||
enrich=True,
|
enrich=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
timezone = settings.TIME_ZONE
|
tz_timestamp = self.vrobbler_user.profile.get_timestamp_with_tz(
|
||||||
if self.vrobbler_user.profile:
|
lfm_scrobble.get("timestamp")
|
||||||
timezone = self.vrobbler_user.profile.timezone
|
)
|
||||||
|
|
||||||
timestamp = lfm_scrobble.get("timestamp")
|
timestamp = lfm_scrobble.get("timestamp")
|
||||||
|
stop_timestamp = timestamp + timedelta(
|
||||||
|
seconds=track.run_time_seconds
|
||||||
|
)
|
||||||
new_scrobble = Scrobble(
|
new_scrobble = Scrobble(
|
||||||
user=self.vrobbler_user,
|
user=self.vrobbler_user,
|
||||||
timestamp=timestamp,
|
timestamp=timestamp,
|
||||||
|
stop_timestamp=stop_timestamp,
|
||||||
source=source,
|
source=source,
|
||||||
track=track,
|
track=track,
|
||||||
timezone=timezone,
|
|
||||||
played_to_completion=True,
|
played_to_completion=True,
|
||||||
in_progress=False,
|
in_progress=False,
|
||||||
media_type=Scrobble.MediaType.TRACK,
|
media_type=Scrobble.MediaType.TRACK,
|
||||||
|
timezone=tz_timestamp.tzinfo.name,
|
||||||
)
|
)
|
||||||
# Vrobbler scrobbles on finish, LastFM scrobbles on start
|
# Vrobbler scrobbles on finish, LastFM scrobbles on start
|
||||||
seconds_eariler = timestamp - timedelta(seconds=20)
|
seconds_eariler = timestamp - timedelta(seconds=20)
|
||||||
@ -91,7 +94,7 @@ class LastFM:
|
|||||||
)
|
)
|
||||||
return created
|
return created
|
||||||
|
|
||||||
def get_last_scrobbles(self, time_from=None, time_to=None):
|
def get_last_scrobbles(self, time_from=None, time_to=None, check=False):
|
||||||
"""Given a user, Last.fm api key, and secret key, grab a list of scrobbled
|
"""Given a user, Last.fm api key, and secret key, grab a list of scrobbled
|
||||||
tracks"""
|
tracks"""
|
||||||
lfm_params = {}
|
lfm_params = {}
|
||||||
@ -107,6 +110,9 @@ class LastFM:
|
|||||||
found_scrobbles = self.user.get_recent_tracks(**lfm_params)
|
found_scrobbles = self.user.get_recent_tracks(**lfm_params)
|
||||||
# TOOD spin this out into a celery task over certain threshold of found scrobbles?
|
# TOOD spin this out into a celery task over certain threshold of found scrobbles?
|
||||||
|
|
||||||
|
if check and found_scrobbles:
|
||||||
|
return True
|
||||||
|
|
||||||
for scrobble in found_scrobbles:
|
for scrobble in found_scrobbles:
|
||||||
logger.info(f"Processing {scrobble}")
|
logger.info(f"Processing {scrobble}")
|
||||||
run_time = None
|
run_time = None
|
||||||
|
|||||||
@ -1,9 +1,11 @@
|
|||||||
|
import logging
|
||||||
|
|
||||||
from books.koreader import fetch_file_from_webdav
|
from books.koreader import fetch_file_from_webdav
|
||||||
from profiles.models import UserProfile
|
from profiles.models import UserProfile
|
||||||
from scrobbles.models import KoReaderImport
|
from scrobbles.models import KoReaderImport
|
||||||
from scrobbles.tasks import process_koreader_import
|
from scrobbles.tasks import process_koreader_import
|
||||||
|
from scrobbles.utils import get_file_md5_hash
|
||||||
from webdav.client import get_webdav_client
|
from webdav.client import get_webdav_client
|
||||||
import logging
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -11,7 +13,7 @@ logger = logging.getLogger(__name__)
|
|||||||
def import_from_webdav_for_all_users(restart=False):
|
def import_from_webdav_for_all_users(restart=False):
|
||||||
"""Grab a list of all users with WebDAV enabled and kickoff imports for them"""
|
"""Grab a list of all users with WebDAV enabled and kickoff imports for them"""
|
||||||
|
|
||||||
# LastFmImport = apps.get_model("scrobbles", "LastFMImport")
|
# WebDavImport = apps.get_model("scrobbles", "WebDavImport")
|
||||||
webdav_enabled_user_ids = UserProfile.objects.filter(
|
webdav_enabled_user_ids = UserProfile.objects.filter(
|
||||||
webdav_url__isnull=False,
|
webdav_url__isnull=False,
|
||||||
webdav_user__isnull=False,
|
webdav_user__isnull=False,
|
||||||
@ -42,7 +44,7 @@ def import_from_webdav_for_all_users(restart=False):
|
|||||||
KoReaderImport.objects.filter(
|
KoReaderImport.objects.filter(
|
||||||
user_id=user_id, processed_finished__isnull=False
|
user_id=user_id, processed_finished__isnull=False
|
||||||
)
|
)
|
||||||
.order_by("Processed_finished")
|
.order_by("processed_finished")
|
||||||
.last()
|
.last()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,10 @@
|
|||||||
|
from django.core.management.base import BaseCommand
|
||||||
|
from vrobbler.apps.scrobbles.utils import (
|
||||||
|
send_mood_checkin_reminders
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Command(BaseCommand):
|
||||||
|
def handle(self, *args, **options):
|
||||||
|
sent_count = send_mood_checkin_reminders()
|
||||||
|
print(f"Sent {sent_count} mood check-in notifications")
|
||||||
@ -33,6 +33,7 @@ from profiles.utils import (
|
|||||||
end_of_day,
|
end_of_day,
|
||||||
end_of_month,
|
end_of_month,
|
||||||
end_of_week,
|
end_of_week,
|
||||||
|
fix_profile_historic_timezones,
|
||||||
start_of_day,
|
start_of_day,
|
||||||
start_of_month,
|
start_of_month,
|
||||||
start_of_week,
|
start_of_week,
|
||||||
@ -41,7 +42,7 @@ from puzzles.models import Puzzle
|
|||||||
from scrobbles import dataclasses as logdata
|
from scrobbles import dataclasses as logdata
|
||||||
from scrobbles.constants import LONG_PLAY_MEDIA, MEDIA_END_PADDING_SECONDS
|
from scrobbles.constants import LONG_PLAY_MEDIA, MEDIA_END_PADDING_SECONDS
|
||||||
from scrobbles.importers.lastfm import LastFM
|
from scrobbles.importers.lastfm import LastFM
|
||||||
from scrobbles.notifications import NtfyNotification
|
from scrobbles.notifications import ScrobbleNtfyNotification
|
||||||
from scrobbles.stats import build_charts
|
from scrobbles.stats import build_charts
|
||||||
from scrobbles.utils import get_file_md5_hash, media_class_to_foreign_key
|
from scrobbles.utils import get_file_md5_hash, media_class_to_foreign_key
|
||||||
from sports.models import SportEvent
|
from sports.models import SportEvent
|
||||||
@ -205,6 +206,9 @@ class KoReaderImport(BaseFileImportMixin):
|
|||||||
|
|
||||||
def process(self, force=False):
|
def process(self, force=False):
|
||||||
|
|
||||||
|
if self.user.id == 1:
|
||||||
|
fix_profile_historic_timezones(self.user.profile)
|
||||||
|
|
||||||
if self.processed_finished and not force:
|
if self.processed_finished and not force:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"{self} already processed on {self.processed_finished}"
|
f"{self} already processed on {self.processed_finished}"
|
||||||
@ -250,6 +254,9 @@ class AudioScrobblerTSVImport(BaseFileImportMixin):
|
|||||||
def process(self, force=False):
|
def process(self, force=False):
|
||||||
from scrobbles.importers.tsv import import_audioscrobbler_tsv_file
|
from scrobbles.importers.tsv import import_audioscrobbler_tsv_file
|
||||||
|
|
||||||
|
if self.user.id == 1:
|
||||||
|
fix_profile_historic_timezones(self.user.profile)
|
||||||
|
|
||||||
if self.processed_finished and not force:
|
if self.processed_finished and not force:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"{self} already processed on {self.processed_finished}"
|
f"{self} already processed on {self.processed_finished}"
|
||||||
@ -280,6 +287,10 @@ class LastFmImport(BaseFileImportMixin):
|
|||||||
|
|
||||||
def process(self, import_all=False):
|
def process(self, import_all=False):
|
||||||
"""Import scrobbles found on LastFM"""
|
"""Import scrobbles found on LastFM"""
|
||||||
|
|
||||||
|
if self.user.id == 1:
|
||||||
|
fix_profile_historic_timezones(self.user.profile)
|
||||||
|
|
||||||
if self.processed_finished:
|
if self.processed_finished:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"{self} already processed on {self.processed_finished}"
|
f"{self} already processed on {self.processed_finished}"
|
||||||
@ -327,6 +338,9 @@ class RetroarchImport(BaseFileImportMixin):
|
|||||||
|
|
||||||
def process(self, import_all=False, force=False):
|
def process(self, import_all=False, force=False):
|
||||||
"""Import scrobbles found on Retroarch"""
|
"""Import scrobbles found on Retroarch"""
|
||||||
|
if self.user.id == 1:
|
||||||
|
fix_profile_historic_timezones(self.user.profile)
|
||||||
|
|
||||||
if self.processed_finished and not force:
|
if self.processed_finished and not force:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"{self} already processed on {self.processed_finished}"
|
f"{self} already processed on {self.processed_finished}"
|
||||||
@ -722,7 +736,7 @@ class Scrobble(TimeStampedModel):
|
|||||||
if not log_dict:
|
if not log_dict:
|
||||||
log_dict = {}
|
log_dict = {}
|
||||||
|
|
||||||
return logdata_cls.from_dict(log_dict)
|
return logdata_cls(**log_dict)
|
||||||
|
|
||||||
def redirect_url(self, user_id) -> str:
|
def redirect_url(self, user_id) -> str:
|
||||||
user = User.objects.filter(id=user_id).first()
|
user = User.objects.filter(id=user_id).first()
|
||||||
@ -1087,6 +1101,7 @@ class Scrobble(TimeStampedModel):
|
|||||||
key = media_class_to_foreign_key(media.__class__.__name__)
|
key = media_class_to_foreign_key(media.__class__.__name__)
|
||||||
media_query = models.Q(**{key: media})
|
media_query = models.Q(**{key: media})
|
||||||
scrobble_data[key + "_id"] = media.id
|
scrobble_data[key + "_id"] = media.id
|
||||||
|
skip_in_progress_check = kwargs.get("skip_in_progress_check", False)
|
||||||
|
|
||||||
# Find our last scrobble of this media item (track, video, etc)
|
# Find our last scrobble of this media item (track, video, etc)
|
||||||
scrobble = (
|
scrobble = (
|
||||||
@ -1110,27 +1125,31 @@ class Scrobble(TimeStampedModel):
|
|||||||
)
|
)
|
||||||
return scrobble
|
return scrobble
|
||||||
|
|
||||||
logger.info(
|
if not skip_in_progress_check:
|
||||||
f"[create_or_update] check for existing scrobble to update ",
|
logger.info(
|
||||||
extra={
|
f"[create_or_update] check for existing scrobble to update ",
|
||||||
"scrobble_id": scrobble.id if scrobble else None,
|
extra={
|
||||||
"media_type": mtype,
|
"scrobble_id": scrobble.id if scrobble else None,
|
||||||
"media_id": media.id,
|
"media_type": mtype,
|
||||||
"scrobble_data": scrobble_data,
|
"media_id": media.id,
|
||||||
},
|
"scrobble_data": scrobble_data,
|
||||||
)
|
},
|
||||||
scrobble_data["playback_status"] = scrobble_data.pop("status", None)
|
)
|
||||||
# If it's marked as stopped, send it through our update mechanism, which will complete it
|
scrobble_data["playback_status"] = scrobble_data.pop(
|
||||||
if scrobble and (
|
"status", None
|
||||||
scrobble.can_be_updated
|
)
|
||||||
or scrobble_data["playback_status"] == "stopped"
|
# If it's marked as stopped, send it through our update mechanism, which will complete it
|
||||||
):
|
if scrobble and (
|
||||||
if "log" in scrobble_data.keys() and scrobble.log:
|
scrobble.can_be_updated
|
||||||
scrobble_data["log"] = scrobble.log | scrobble_data["log"]
|
or scrobble_data["playback_status"] == "stopped"
|
||||||
return scrobble.update(scrobble_data)
|
):
|
||||||
|
if "log" in scrobble_data.keys() and scrobble.log:
|
||||||
|
scrobble_data["log"] = scrobble.log | scrobble_data["log"]
|
||||||
|
return scrobble.update(scrobble_data)
|
||||||
|
|
||||||
|
# Discard status before creating
|
||||||
|
scrobble_data.pop("playback_status")
|
||||||
|
|
||||||
# Discard status before creating
|
|
||||||
scrobble_data.pop("playback_status")
|
|
||||||
logger.info(
|
logger.info(
|
||||||
f"[scrobbling] creating new scrobble",
|
f"[scrobbling] creating new scrobble",
|
||||||
extra={
|
extra={
|
||||||
@ -1297,7 +1316,7 @@ class Scrobble(TimeStampedModel):
|
|||||||
scrobble_data: dict,
|
scrobble_data: dict,
|
||||||
) -> "Scrobble":
|
) -> "Scrobble":
|
||||||
scrobble = cls.objects.create(**scrobble_data)
|
scrobble = cls.objects.create(**scrobble_data)
|
||||||
NtfyNotification(scrobble).send()
|
ScrobbleNtfyNotification(scrobble).send()
|
||||||
return scrobble
|
return scrobble
|
||||||
|
|
||||||
def stop(self, timestamp=None, force_finish=False) -> None:
|
def stop(self, timestamp=None, force_finish=False) -> None:
|
||||||
|
|||||||
@ -3,13 +3,26 @@ import requests
|
|||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.sites.models import Site
|
from django.contrib.sites.models import Site
|
||||||
|
from django.urls import reverse
|
||||||
|
|
||||||
class Notification(ABC):
|
class BasicNtfyNotification(ABC):
|
||||||
scrobble: "Scrobble"
|
|
||||||
ntfy_headers: dict = {}
|
ntfy_headers: dict = {}
|
||||||
ntfy_url: str = ""
|
ntfy_url: str = ""
|
||||||
title: str = ""
|
title: str = ""
|
||||||
|
|
||||||
|
def __init__(self, profile: "UserProfile"):
|
||||||
|
self.profile = profile.user
|
||||||
|
protocol = "http" if settings.DEBUG else "https"
|
||||||
|
domain = Site.objects.get_current().domain
|
||||||
|
self.url_tmpl = f'{protocol}://{domain}' + '{path}'
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def send(self) -> None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
class ScrobbleNotification(BasicNtfyNotification):
|
||||||
|
scrobble: "Scrobble"
|
||||||
|
|
||||||
def __init__(self, scrobble: "Scrobble"):
|
def __init__(self, scrobble: "Scrobble"):
|
||||||
self.scrobble = scrobble
|
self.scrobble = scrobble
|
||||||
self.user = scrobble.user
|
self.user = scrobble.user
|
||||||
@ -19,13 +32,12 @@ class Notification(ABC):
|
|||||||
self.url_tmpl = f'{protocol}://{domain}' + '{path}'
|
self.url_tmpl = f'{protocol}://{domain}' + '{path}'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def send(self) -> None:
|
def send(self) -> None:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class NtfyNotification(Notification):
|
class ScrobbleNtfyNotification(ScrobbleNotification):
|
||||||
def __init__(self, scrobble, **kwargs):
|
def __init__(self, scrobble, **kwargs):
|
||||||
super().__init__(scrobble)
|
super().__init__(scrobble)
|
||||||
self.ntfy_str: str = f"{self.scrobble.media_obj}"
|
self.ntfy_str: str = f"{self.scrobble.media_obj}"
|
||||||
@ -55,3 +67,27 @@ class NtfyNotification(Notification):
|
|||||||
"Click": self.click_url,
|
"Click": self.click_url,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
class MoodNtfyNotification(BasicNtfyNotification):
|
||||||
|
def __init__(self, profile, **kwargs):
|
||||||
|
super().__init__(profile)
|
||||||
|
self.ntfy_str: str = "Would you like to check in about your mood?"
|
||||||
|
self.click_url = self.url_tmpl.format(path=reverse("moods:mood-list"))
|
||||||
|
self.title = "Mood Check-in!"
|
||||||
|
|
||||||
|
def send(self):
|
||||||
|
if (
|
||||||
|
self.profile
|
||||||
|
and self.profile.ntfy_enabled
|
||||||
|
and self.profile.ntfy_url
|
||||||
|
):
|
||||||
|
requests.post(
|
||||||
|
self.profile.ntfy_url,
|
||||||
|
data=self.ntfy_str.encode(encoding="utf-8"),
|
||||||
|
headers={
|
||||||
|
"Title": self.title,
|
||||||
|
"Priority": "high",
|
||||||
|
"Tags": "smiley, check",
|
||||||
|
"Click": self.click_url,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|||||||
@ -18,6 +18,7 @@ from music.models import Track
|
|||||||
from people.models import Person
|
from people.models import Person
|
||||||
from podcasts.models import PodcastEpisode
|
from podcasts.models import PodcastEpisode
|
||||||
from podcasts.utils import parse_mopidy_uri
|
from podcasts.utils import parse_mopidy_uri
|
||||||
|
from profiles.models import UserProfile
|
||||||
from puzzles.models import Puzzle
|
from puzzles.models import Puzzle
|
||||||
from scrobbles.constants import (
|
from scrobbles.constants import (
|
||||||
JELLYFIN_AUDIO_ITEM_TYPES,
|
JELLYFIN_AUDIO_ITEM_TYPES,
|
||||||
@ -25,6 +26,7 @@ from scrobbles.constants import (
|
|||||||
SCROBBLE_CONTENT_URLS,
|
SCROBBLE_CONTENT_URLS,
|
||||||
)
|
)
|
||||||
from scrobbles.models import Scrobble
|
from scrobbles.models import Scrobble
|
||||||
|
from scrobbles.notifications import ScrobbleNtfyNotification
|
||||||
from scrobbles.utils import convert_to_seconds, extract_domain
|
from scrobbles.utils import convert_to_seconds, extract_domain
|
||||||
from sports.models import SportEvent
|
from sports.models import SportEvent
|
||||||
from sports.thesportsdb import lookup_event_from_thesportsdb
|
from sports.thesportsdb import lookup_event_from_thesportsdb
|
||||||
@ -390,10 +392,25 @@ def email_scrobble_board_game(
|
|||||||
locations[location_dict.get("id")] = location
|
locations[location_dict.get("id")] = location
|
||||||
|
|
||||||
scrobbles_created = []
|
scrobbles_created = []
|
||||||
|
second = 0
|
||||||
for play_dict in bgstat_data.get("plays", []):
|
for play_dict in bgstat_data.get("plays", []):
|
||||||
|
hour = None
|
||||||
|
minute = None
|
||||||
|
second = None
|
||||||
if "comments" in play_dict.keys():
|
if "comments" in play_dict.keys():
|
||||||
if "Learning to play" in play_dict.get("comments"):
|
for line in play_dict.get("comments", "").split("\n"):
|
||||||
log_data["learning"] = True
|
if "Learning to play" in line:
|
||||||
|
log_data["learning"] = True
|
||||||
|
if "Start time:" in line:
|
||||||
|
start_time = line.split(": ")[1]
|
||||||
|
pieces = start_time.split(":")
|
||||||
|
hour = int(pieces[0])
|
||||||
|
minute = int(pieces[1])
|
||||||
|
try:
|
||||||
|
second = int(pieces[2])
|
||||||
|
except IndexError:
|
||||||
|
second = 0
|
||||||
|
|
||||||
log_data["details"] = play_dict.get("comments")
|
log_data["details"] = play_dict.get("comments")
|
||||||
log_data["expansion_ids"] = []
|
log_data["expansion_ids"] = []
|
||||||
try:
|
try:
|
||||||
@ -402,7 +419,6 @@ def email_scrobble_board_game(
|
|||||||
try:
|
try:
|
||||||
base_game = expansions[play_dict.get("gameRefId")]
|
base_game = expansions[play_dict.get("gameRefId")]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
print(play_dict)
|
|
||||||
logger.info(
|
logger.info(
|
||||||
"Skipping scrobble of play, can't find game",
|
"Skipping scrobble of play, can't find game",
|
||||||
extra={"play_dict": play_dict},
|
extra={"play_dict": play_dict},
|
||||||
@ -440,35 +456,56 @@ def email_scrobble_board_game(
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
start = parse(play_dict.get("playDate"))
|
timestamp = parse(play_dict.get("playDate"))
|
||||||
|
if hour and minute:
|
||||||
|
logger.info(f"Scrobble playDate has manual start time {timestamp}")
|
||||||
|
timestamp = timestamp.replace(
|
||||||
|
hour=hour, minute=minute, second=second or 0
|
||||||
|
)
|
||||||
|
logger.info(f"Update to {timestamp}")
|
||||||
|
|
||||||
|
profile = UserProfile.objects.filter(user_id=user_id).first()
|
||||||
|
timestamp = profile.get_timestamp_with_tz(timestamp)
|
||||||
|
|
||||||
if play_dict.get("durationMin") > 0:
|
if play_dict.get("durationMin") > 0:
|
||||||
duration_seconds = play_dict.get("durationMin") * 60
|
duration_seconds = play_dict.get("durationMin") * 60
|
||||||
else:
|
else:
|
||||||
duration_seconds = base_game.run_time_seconds
|
duration_seconds = base_game.run_time_seconds
|
||||||
stop = start + timedelta(seconds=duration_seconds)
|
stop_timestamp = timestamp + timedelta(seconds=duration_seconds)
|
||||||
|
|
||||||
|
logger.info(f"Creating scrobble for {base_game} at {timestamp}")
|
||||||
scrobble_dict = {
|
scrobble_dict = {
|
||||||
"user_id": user_id,
|
"user_id": user_id,
|
||||||
"timestamp": start,
|
"timestamp": timestamp,
|
||||||
"playback_position_seconds": duration_seconds,
|
"playback_position_seconds": duration_seconds,
|
||||||
"source": "BG Stats",
|
"source": "BG Stats",
|
||||||
"log": log_data,
|
"log": log_data,
|
||||||
}
|
}
|
||||||
|
|
||||||
scrobble = Scrobble.objects.filter(
|
scrobble = None
|
||||||
board_game=base_game, user_id=user_id, timestamp=start
|
if timestamp.year > 2023:
|
||||||
).first()
|
logger.info(
|
||||||
|
"Scrobbles older than 2024 likely have no time associated just create it"
|
||||||
|
)
|
||||||
|
scrobble = Scrobble.objects.filter(
|
||||||
|
board_game=base_game, user_id=user_id, timestamp=timestamp
|
||||||
|
).first()
|
||||||
if scrobble:
|
if scrobble:
|
||||||
logger.info(
|
logger.info(
|
||||||
"Scrobble already exists, skipping",
|
"Scrobble already exists, skipping",
|
||||||
extra={"scrobble_dict": scrobble_dict, "user_id": user_id},
|
extra={"scrobble_dict": scrobble_dict, "user_id": user_id},
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
scrobble = Scrobble.create_or_update(base_game, user_id, scrobble_dict)
|
scrobble = Scrobble.create_or_update(
|
||||||
scrobble.stop_timestamp = stop
|
base_game, user_id, scrobble_dict, skip_in_progress_check=True
|
||||||
|
)
|
||||||
|
scrobble.timezone = timestamp.tzinfo.name
|
||||||
|
scrobble.stop_timestamp = stop_timestamp
|
||||||
scrobble.in_progress = False
|
scrobble.in_progress = False
|
||||||
scrobble.played_to_completion = True
|
scrobble.played_to_completion = True
|
||||||
scrobble.save()
|
scrobble.save()
|
||||||
scrobbles_created.append(scrobble)
|
scrobbles_created.append(scrobble)
|
||||||
|
ScrobbleNtfyNotification(scrobble).send()
|
||||||
|
|
||||||
return scrobbles_created
|
return scrobbles_created
|
||||||
|
|
||||||
|
|||||||
@ -13,7 +13,7 @@ from django.utils import timezone
|
|||||||
from profiles.models import UserProfile
|
from profiles.models import UserProfile
|
||||||
from profiles.utils import now_user_timezone
|
from profiles.utils import now_user_timezone
|
||||||
from scrobbles.constants import LONG_PLAY_MEDIA
|
from scrobbles.constants import LONG_PLAY_MEDIA
|
||||||
from scrobbles.notifications import NtfyNotification
|
from scrobbles.notifications import MoodNtfyNotification, ScrobbleNtfyNotification
|
||||||
from scrobbles.tasks import (
|
from scrobbles.tasks import (
|
||||||
process_koreader_import,
|
process_koreader_import,
|
||||||
process_lastfm_import,
|
process_lastfm_import,
|
||||||
@ -114,6 +114,8 @@ def get_long_plays_completed(user: User) -> list:
|
|||||||
|
|
||||||
def import_lastfm_for_all_users(restart=False):
|
def import_lastfm_for_all_users(restart=False):
|
||||||
"""Grab a list of all users with LastFM enabled and kickoff imports for them"""
|
"""Grab a list of all users with LastFM enabled and kickoff imports for them"""
|
||||||
|
from scrobbles.importers.lastfm import LastFM
|
||||||
|
|
||||||
LastFmImport = apps.get_model("scrobbles", "LastFMImport")
|
LastFmImport = apps.get_model("scrobbles", "LastFMImport")
|
||||||
lastfm_enabled_user_ids = UserProfile.objects.filter(
|
lastfm_enabled_user_ids = UserProfile.objects.filter(
|
||||||
lastfm_username__isnull=False,
|
lastfm_username__isnull=False,
|
||||||
@ -124,6 +126,31 @@ def import_lastfm_for_all_users(restart=False):
|
|||||||
lastfm_import_count = 0
|
lastfm_import_count = 0
|
||||||
|
|
||||||
for user_id in lastfm_enabled_user_ids:
|
for user_id in lastfm_enabled_user_ids:
|
||||||
|
|
||||||
|
lfm_import = LastFmImport.objects.filter(
|
||||||
|
user_id=user_id, processed_finished__isnull=False
|
||||||
|
).last()
|
||||||
|
if lfm_import:
|
||||||
|
last_processed = lfm_import.processed_finished
|
||||||
|
else:
|
||||||
|
logger.info(
|
||||||
|
f"Not resuming failed LastFM import {lfm_import.id} for user {user_id}, use restart=True to restart"
|
||||||
|
"No existing LastFM import, we should start a monthly parsing of lastFm for this user going back to 2002"
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
|
lfm_client = LastFM(
|
||||||
|
user=get_user_model().objects.filter(id=user_id).first()
|
||||||
|
)
|
||||||
|
|
||||||
|
has_scrobbles = lfm_client.get_last_scrobbles(
|
||||||
|
time_from=last_processed, check=True
|
||||||
|
)
|
||||||
|
|
||||||
|
if not has_scrobbles:
|
||||||
|
logger.info("No new scrobbles to import from LastFM")
|
||||||
|
continue
|
||||||
|
|
||||||
lfm_import, created = LastFmImport.objects.get_or_create(
|
lfm_import, created = LastFmImport.objects.get_or_create(
|
||||||
user_id=user_id, processed_finished__isnull=True
|
user_id=user_id, processed_finished__isnull=True
|
||||||
)
|
)
|
||||||
@ -291,7 +318,20 @@ def send_stop_notifications_for_in_progress_scrobbles() -> int:
|
|||||||
).seconds
|
).seconds
|
||||||
|
|
||||||
if elapsed_scrobble_seconds > scrobble.media_obj.run_time_seconds:
|
if elapsed_scrobble_seconds > scrobble.media_obj.run_time_seconds:
|
||||||
NtfyNotification(scrobble, end=True).send()
|
ScrobbleNtfyNotification(scrobble, end=True).send()
|
||||||
|
notifications_sent += 1
|
||||||
|
|
||||||
|
return notifications_sent
|
||||||
|
|
||||||
|
def send_mood_checkin_reminders() -> int:
|
||||||
|
"""Get all profiles with mood check-ins enabled and checkin!"""
|
||||||
|
from profiles.models import UserProfile
|
||||||
|
|
||||||
|
now = timezone.now()
|
||||||
|
notifications_sent = 0
|
||||||
|
for profile in UserProfile.objects.filter(mood_checkin_enabled=True):
|
||||||
|
if profile.mood_checkin_frequency == "hourly" and now.minute == 0:
|
||||||
|
MoodNtfyNotification(profile).send()
|
||||||
notifications_sent += 1
|
notifications_sent += 1
|
||||||
|
|
||||||
return notifications_sent
|
return notifications_sent
|
||||||
|
|||||||
@ -19,6 +19,8 @@ from django.views.generic import DetailView, FormView, TemplateView
|
|||||||
from django.views.generic.edit import CreateView
|
from django.views.generic.edit import CreateView
|
||||||
from django.views.generic.list import ListView
|
from django.views.generic.list import ListView
|
||||||
from music.aggregators import live_charts, scrobble_counts, week_of_scrobbles
|
from music.aggregators import live_charts, scrobble_counts, week_of_scrobbles
|
||||||
|
|
||||||
|
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||||
from rest_framework import status
|
from rest_framework import status
|
||||||
from rest_framework.decorators import (
|
from rest_framework.decorators import (
|
||||||
api_view,
|
api_view,
|
||||||
@ -54,6 +56,7 @@ from scrobbles.utils import (
|
|||||||
get_long_plays_completed,
|
get_long_plays_completed,
|
||||||
get_long_plays_in_progress,
|
get_long_plays_in_progress,
|
||||||
)
|
)
|
||||||
|
from moods.models import Mood
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -64,29 +67,48 @@ class ScrobbleableListView(ListView):
|
|||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
queryset = super().get_queryset()
|
queryset = super().get_queryset()
|
||||||
if not self.request.user.is_anonymous:
|
if self.model == Mood:
|
||||||
queryset = queryset.annotate(
|
return queryset
|
||||||
scrobble_count=Count("scrobble"),
|
|
||||||
filter=Q(scrobble__user=self.request.user),
|
|
||||||
).order_by("-scrobble_count")
|
|
||||||
else:
|
|
||||||
queryset = queryset.annotate(
|
|
||||||
scrobble_count=Count("scrobble")
|
|
||||||
).order_by("-scrobble_count")
|
|
||||||
return queryset
|
|
||||||
|
|
||||||
|
user_filter = Q()
|
||||||
|
if not self.request.user.is_anonymous:
|
||||||
|
user_filter = Q(scrobble__user=self.request.user)
|
||||||
|
|
||||||
|
queryset = (
|
||||||
|
queryset.filter(user_filter).annotate(
|
||||||
|
scrobble_count=Count("scrobble")
|
||||||
|
).filter(scrobble_count__gt=0).order_by("-scrobble_count")
|
||||||
|
)
|
||||||
|
return queryset
|
||||||
|
|
||||||
class ScrobbleableDetailView(DetailView):
|
class ScrobbleableDetailView(DetailView):
|
||||||
model = None
|
model = None
|
||||||
slug_field = "uuid"
|
slug_field = "uuid"
|
||||||
|
|
||||||
|
paginate_by = 200 # You can set this to whatever page size you want
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
context_data = super().get_context_data(**kwargs)
|
context_data = super().get_context_data(**kwargs)
|
||||||
context_data["scrobbles"] = list()
|
scrobbles = []
|
||||||
if not self.request.user.is_anonymous:
|
if not self.request.user.is_anonymous:
|
||||||
context_data["scrobbles"] = self.object.scrobble_set.filter(
|
scrobbles = self.object.scrobble_set.filter(
|
||||||
user=self.request.user
|
user=self.request.user
|
||||||
)
|
).order_by("-timestamp")
|
||||||
|
|
||||||
|
paginator = Paginator(scrobbles, self.paginate_by)
|
||||||
|
page_number = self.request.GET.get("page")
|
||||||
|
|
||||||
|
try:
|
||||||
|
page_obj = paginator.page(page_number)
|
||||||
|
except PageNotAnInteger:
|
||||||
|
page_obj = paginator.page(1)
|
||||||
|
except EmptyPage:
|
||||||
|
page_obj = paginator.page(paginator.num_pages)
|
||||||
|
|
||||||
|
context_data["page_obj"] = page_obj
|
||||||
|
context_data["scrobbles"] = page_obj.object_list
|
||||||
|
context_data["is_paginated"] = paginator.num_pages > 1
|
||||||
|
|
||||||
return context_data
|
return context_data
|
||||||
|
|
||||||
|
|
||||||
@ -201,7 +223,7 @@ class RecentScrobbleList(ListView):
|
|||||||
processed_finished__isnull=True,
|
processed_finished__isnull=True,
|
||||||
user=self.request.user,
|
user=self.request.user,
|
||||||
)
|
)
|
||||||
data["counts"] = [] #scrobble_counts(user)
|
data["counts"] = [] # scrobble_counts(user)
|
||||||
else:
|
else:
|
||||||
data["weekly_data"] = week_of_scrobbles()
|
data["weekly_data"] = week_of_scrobbles()
|
||||||
data["counts"] = scrobble_counts()
|
data["counts"] = scrobble_counts()
|
||||||
|
|||||||
@ -18,10 +18,34 @@ class TaskLogData(JSONDataclass):
|
|||||||
description: Optional[str] = None
|
description: Optional[str] = None
|
||||||
title: Optional[str] = None
|
title: Optional[str] = None
|
||||||
project: Optional[str] = None
|
project: Optional[str] = None
|
||||||
|
notes: Optional[dict] = None
|
||||||
|
updated_at: Optional[str] = None
|
||||||
todoist_id: Optional[str] = None
|
todoist_id: Optional[str] = None
|
||||||
todoist_event: Optional[str] = None
|
todoist_event: Optional[str] = None
|
||||||
todoist_type: Optional[str] = None
|
todoist_type: Optional[str] = None
|
||||||
notes: Optional[dict] = None
|
todoist_type: Optional[str] = None
|
||||||
|
todoist_label_list: Optional[list] = None
|
||||||
|
todoist_project_id: Optional[str] = None
|
||||||
|
body: Optional[str] = None
|
||||||
|
state: Optional[str] = None
|
||||||
|
labels: Optional[str] = None
|
||||||
|
properties: Optional[list] = None
|
||||||
|
drawers: Optional[list] = None
|
||||||
|
source: Optional[str] = None
|
||||||
|
source_id: Optional[str] = None
|
||||||
|
timestamps: Optional[list] = None
|
||||||
|
|
||||||
|
|
||||||
|
def notes_as_str(self) -> str:
|
||||||
|
"""Return formatted notes with line breaks and no keys"""
|
||||||
|
note_block = ""
|
||||||
|
if isinstance(self.notes, list):
|
||||||
|
note_block = "</br>".join(self.notes)
|
||||||
|
|
||||||
|
if isinstance(self.notes, dict):
|
||||||
|
for id, content in self.notes.items():
|
||||||
|
note_block += content + "</br>"
|
||||||
|
return note_block
|
||||||
|
|
||||||
|
|
||||||
class Task(LongPlayScrobblableMixin):
|
class Task(LongPlayScrobblableMixin):
|
||||||
@ -42,9 +66,9 @@ class Task(LongPlayScrobblableMixin):
|
|||||||
def strings(self) -> ScrobblableConstants:
|
def strings(self) -> ScrobblableConstants:
|
||||||
return ScrobblableConstants(verb="Doing", tags="memo")
|
return ScrobblableConstants(verb="Doing", tags="memo")
|
||||||
|
|
||||||
# @property
|
@property
|
||||||
# def logdata_cls(self):
|
def logdata_cls(self):
|
||||||
# return TaskLogData
|
return TaskLogData
|
||||||
|
|
||||||
def source_url_for_user(self, user_id) -> str:
|
def source_url_for_user(self, user_id) -> str:
|
||||||
url = ""
|
url = ""
|
||||||
|
|||||||
@ -39,7 +39,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>{{object.scrobble_set.count}} scrobbles</p>
|
<p>{{scrobbles.count}} scrobbles</p>
|
||||||
<p>
|
<p>
|
||||||
<a href="{{object.start_url}}">Drink again</a>
|
<a href="{{object.start_url}}">Drink again</a>
|
||||||
</p>
|
</p>
|
||||||
@ -55,7 +55,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
|
{% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@ -42,7 +42,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>{{object.scrobble_set.count}} scrobbles</p>
|
<p>{{scrobbles.count}} scrobbles</p>
|
||||||
<p>
|
<p>
|
||||||
<a href="{{object.start_url}}">Play again</a>
|
<a href="{{object.start_url}}">Play again</a>
|
||||||
</p>
|
</p>
|
||||||
@ -56,20 +56,40 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th scope="col">Date</th>
|
<th scope="col">Date</th>
|
||||||
<th scope="col">Publisher</th>
|
<th scope="col">Publisher</th>
|
||||||
<th scope="col">Screenshot</th>
|
<th scope="col">Players</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
|
{% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
<td>{{scrobble.media_obj.publisher}}</td>
|
<td>{{scrobble.media_obj.publisher}}</td>
|
||||||
<td>{% if scrobble.screenshot%}<img src="{{scrobble.screenshot.url}}" width=250 />{% endif %}</td>
|
<td>{% if scrobble.logdata.player_log %}{{scrobble.logdata.player_log}}{% else %}No data{% endif %}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if is_paginated %}
|
||||||
|
<div class="pagination">
|
||||||
|
{% if page_obj.has_previous %}
|
||||||
|
<a href="?page={{ page_obj.previous_page_number }}">« Previous</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% for num in page_obj.paginator.page_range %}
|
||||||
|
{% if num == page_obj.number %}
|
||||||
|
<strong>{{ num }}</strong>
|
||||||
|
{% else %}
|
||||||
|
<a href="?page={{ num }}">{{ num }}</a>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if page_obj.has_next %}
|
||||||
|
<a href="?page={{ page_obj.next_page_number }}">Next »</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -26,10 +26,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>{{object.scrobble_set.count}} scrobbles</p>
|
<p>{{scrobbles.count}} scrobbles</p>
|
||||||
<p>Read {{object.scrobble_set.last.book_pages_read}} pages{% if object.scrobble_set.last.long_play_complete %} and completed{% else %}{% endif %}</p>
|
<p>Read {{scrobbles.last.book_pages_read}} pages{% if scrobbles.last.long_play_complete %} and completed{% else %}{% endif %}</p>
|
||||||
<p>
|
<p>
|
||||||
{% if object.scrobble_set.last.long_play_complete == True %}
|
{% if scrobbles.last.long_play_complete == True %}
|
||||||
<a href="">Read again</a>
|
<a href="">Read again</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="">Resume reading</a>
|
<a href="">Resume reading</a>
|
||||||
@ -50,7 +50,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
|
{% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
<td>{% if scrobble.long_play_complete == True %}Yes{% endif %}</td>
|
<td>{% if scrobble.long_play_complete == True %}Yes{% endif %}</td>
|
||||||
|
|||||||
@ -48,7 +48,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>{{object.scrobble_set.count}} scrobbles</p>
|
<p>{{scrobbles.count}} scrobbles</p>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md">
|
<div class="col-md">
|
||||||
<h3>Last scrobbles</h3>
|
<h3>Last scrobbles</h3>
|
||||||
@ -60,7 +60,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
|
{% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp|naturaltime}}</td>
|
<td>{{scrobble.local_timestamp|naturaltime}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all %}
|
{% for scrobble in scrobbles.all %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>{{object.scrobble_set.count}} scrobbles</p>
|
<p>{{scrobbles.count}} scrobbles</p>
|
||||||
{% if charts %}
|
{% if charts %}
|
||||||
<p>{% for chart in charts %}<em><a href="{{chart.link}}">{{chart}}</a></em>{% if forloop.last %}{% else %} | {% endif %}{% endfor %}</p>
|
<p>{% for chart in charts %}<em><a href="{{chart.link}}">{{chart}}</a></em>{% if forloop.last %}{% else %} | {% endif %}{% endfor %}</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -26,7 +26,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all %}
|
{% for scrobble in scrobbles.all %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
<td><a href="{{scrobble.track.get_absolute_url}}">{{scrobble.track.title}}</a></td>
|
<td><a href="{{scrobble.track.get_absolute_url}}">{{scrobble.track.title}}</a></td>
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all %}
|
{% for scrobble in scrobbles.all %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
<td>{{scrobble.media_obj.round.season.name}}</td>
|
<td>{{scrobble.media_obj.round.season.name}}</td>
|
||||||
|
|||||||
@ -22,6 +22,7 @@
|
|||||||
width: 600px;
|
width: 600px;
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
|
.pagination a { padding: 0 5px 0 5px; }
|
||||||
</style>
|
</style>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
@ -39,7 +40,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>{{object.scrobble_set.count}} scrobbles</p>
|
<p>{{scrobbles.count}} scrobbles</p>
|
||||||
<p>
|
<p>
|
||||||
<a href="{{object.start_url}}">Play again</a>
|
<a href="{{object.start_url}}">Play again</a>
|
||||||
</p>
|
</p>
|
||||||
@ -47,27 +48,49 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md">
|
<div class="col-md">
|
||||||
<h3>Last scrobbles</h3>
|
<h3>Last scrobbles</h3>
|
||||||
|
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-striped table-sm">
|
<table class="table table-striped table-sm">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="col">Date</th>
|
<th scope="col">Date</th>
|
||||||
<th scope="col">Description</th>
|
<th scope="col">Description</th>
|
||||||
|
<th scope="col">Notes</th>
|
||||||
<th scope="col">Source</th>
|
<th scope="col">Source</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
|
{% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
<td><a href="{{scrobble.get_media_source_url}}">{{scrobble.logdata.description}}</a></td>
|
<td><a href="{{scrobble.get_media_source_url}}">{{scrobble.logdata.description}}</a></td>
|
||||||
|
<td>{{scrobble.logdata.notes_as_str|safe}}</td>
|
||||||
<td>{{scrobble.source}}</td>
|
<td>{{scrobble.source}}</td>
|
||||||
<td>{{scrobble.log.notes}}</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if is_paginated %}
|
||||||
|
<div class="pagination">
|
||||||
|
{% if page_obj.has_previous %}
|
||||||
|
<a href="?page={{ page_obj.previous_page_number }}">« Previous</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% for num in page_obj.paginator.page_range %}
|
||||||
|
{% if num == page_obj.number %}
|
||||||
|
<strong>{{ num }}</strong>
|
||||||
|
{% else %}
|
||||||
|
<a href="?page={{ num }}">{{ num }}</a>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if page_obj.has_next %}
|
||||||
|
<a href="?page={{ page_obj.next_page_number }}">Next »</a>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -59,12 +59,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>{{object.scrobble_set.count}} scrobbles</p>
|
<p>{{scrobbles.count}} scrobbles</p>
|
||||||
{% if object.scrobble_set.last.long_play_seconds %}
|
{% if scrobbles.last.long_play_seconds %}
|
||||||
<p>{{object.scrobble_set.last.long_play_seconds|natural_duration}}{% if object.scrobble_set.last.long_play_complete %} and completed{% else %} spent playing{% endif %}</p>
|
<p>{{scrobbles.last.long_play_seconds|natural_duration}}{% if scrobbles.last.long_play_complete %} and completed{% else %} spent playing{% endif %}</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<p>
|
<p>
|
||||||
{% if object.scrobble_set.last.long_play_complete == True %}
|
{% if scrobbles.last.long_play_complete == True %}
|
||||||
<a href="">Play again</a>
|
<a href="">Play again</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="{{object.start_url}}">Resume playing</a>
|
<a href="{{object.start_url}}">Resume playing</a>
|
||||||
@ -86,7 +86,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all|dictsortreversed:"timestamp" %}
|
{% for scrobble in scrobbles.all|dictsortreversed:"timestamp" %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local-timestamp}}</td>
|
<td>{{scrobble.local-timestamp}}</td>
|
||||||
<td>{% if scrobble.long_play_complete == True %}Yes{% else %}Not yet{% endif %}</td>
|
<td>{% if scrobble.long_play_complete == True %}Yes{% else %}Not yet{% endif %}</td>
|
||||||
|
|||||||
@ -85,7 +85,7 @@ dd {
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all %}
|
{% for scrobble in scrobbles.all %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@ -51,7 +51,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for scrobble in object.scrobble_set.all %}
|
{% for scrobble in scrobbles.all %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{scrobble.local_timestamp}}</td>
|
<td>{{scrobble.local_timestamp}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user