Bump version to 0.12.0

Version 1.0 approaches!

.drone.yml

@@ -14,7 +14,6 @@ steps:
       # Install dependencies
       - cp vrobbler.conf.test vrobbler.conf
       - pip install poetry
-      - poetry config repositories.unblink "https://pypi.unbl.ink/pypi/simple"
       - poetry install
       # Start with a fresh database (which is already running as a service from Drone)
       - poetry run pytest --cov-report term:skip-covered --cov=vrobbler tests
@@ -24,24 +23,6 @@ steps:
       # Mount pip cache from host
       - name: pip_cache
         path: /root/.cache/pip
-  - name: deploy
-    image: appleboy/drone-ssh
-    settings:
-      host:
-        - vrobbler.service
-      username: root
-      ssh_key:
-        from_secret: ssh_key
-      command_timeout: 2m
-      script:
-        - pip uninstall -y vrobbler
-        - pip install git+https://code.unbl.ink/secstate/vrobbler.git@main
-        - vrobbler migrate
-        - vrobbler collectstatic --noinput
-        - immortalctl restart celery && immortalctl restart vrobbler
-    when:
-      branch:
-      - main
 volumes:
   - name: docker
     host:

manage.py

@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "vrobbler.settings")
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vrobbler.settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
@@ -18,5 +18,5 @@ def main():
     execute_from_command_line(sys.argv)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vrobbler"
-version = "0.11.12"
+version = "0.11.5"
 description = ""
 authors = ["Colin Powell <colin@unbl.ink>"]
 
@@ -26,6 +26,7 @@ django-taggit = "^2.1.0"
 django-markdownify = "^0.9.1"
 gunicorn = "^20.1.0"
 django-simple-history = "^3.1.1"
+whitenoise = "^6.3.0"
 musicbrainzngs = "^0.7.1"
 cinemagoer = "^2022.12.27"
 pysportsdb = "^0.1.0"
@@ -35,12 +36,6 @@ pylast = "^5.1.0"
 django-encrypted-field = "^1.0.5"
 celery = "^5.2.7"
 honcho = "^1.1.0"
-howlongtobeatpy = "^1.0.5"
-beautifulsoup4 = "^4.11.2"
-django-storages = "^1.13.2"
-boto3 = "^1.26.98"
-stream-sqlite = "^0.0.41"
-sorl-thumbnail = "^12.9.0"
 
 [tool.poetry.dev-dependencies]
 Werkzeug = "2.0.3"
@@ -68,6 +63,7 @@ DJANGO_SETTINGS_MODULE='vrobbler.settings'
 
 [tool.black]
 line-length = 79
+skip-string-normalization = true
 target-version = ["py39", "py310"]
 include = ".py$"
 exclude = "migrations"

tests/podcasts_tests/test_scrapers.py

@@ -1,28 +0,0 @@
-from vrobbler.apps.podcasts.scrapers import scrape_data_from_google_podcasts
-
-expected_desc = (
-    "NPR's Up First is the news you need to start your day. "
-    "The three biggest stories of the day, with reporting and analysis "
-    "from NPR News — in 10 minutes. Available weekdays by 6 a.m. ET, "
-    "with hosts Leila Fadel, Steve Inskeep, Rachel Martin and A Martinez. "
-    "Also available on Saturdays by 8 a.m. ET, with Ayesha Rascoe and "
-    "Scott Simon. On Sundays, hear a longer exploration behind the "
-    "headlines with Rachel Martin, available by 8 a.m. ET. Subscribe "
-    "and listen, then support your local NPR station at donate.npr.org.  "
-    "Support NPR's reporting by subscribing to Up First+ and unlock "
-    "sponsor-free listening. Learn more at plus.npr.org/UpFirst"
-)
-
-expected_img_url = "https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcT-PqtK-bauo8wm8dBE__SVGArlvfBYY8rqxr2kA5UwjKzEx8c"
-expected_google_url = "https://podcasts.google.com/feed/aHR0cHM6Ly9mZWVkcy5ucHIub3JnLzUxMDMxOC9wb2RjYXN0LnhtbA"
-
-
-def test_get_not_allowed_from_mopidy():
-    query = "Up First"
-    result_dict = scrape_data_from_google_podcasts(query)
-
-    assert result_dict["title"] == query
-    assert result_dict["description"] == expected_desc
-    assert result_dict["image_url"] == expected_img_url
-    assert result_dict["producer"] == "NPR"
-    assert result_dict["google_url"] == expected_google_url

tests/scrobbles_tests/conftest.py

@@ -1,6 +1,7 @@
 import json
 import pytest
 
+from scrobbles.models import Scrobble
 from rest_framework.authtoken.models import Token
 from django.contrib.auth import get_user_model
 
@@ -18,12 +19,12 @@ class MopidyRequest:
     musicbrainz_track_id = "54214d63-5adf-4909-87cd-c65c37a6d558"
     musicbrainz_album_id = "03b864cd-7761-314c-a892-05a89ddff00d"
     musicbrainz_artist_id = "95f5b748-d370-47fe-85bd-0af2dc450bc0"
-    mopidy_uri = "local:track:Sublime%20-%20Sublime/Disc%201%20-%2004%20-%20Same%20in%20the%20End.mp3"  # noqa
+    mopidy_uri = "local:track:Sublime%20-%20Sublime/Disc%201%20-%2004%20-%20Same%20in%20the%20End.mp3"
     status = "resumed"
 
     def __init__(self, **kwargs):
         self.request_data = {
-            "name": kwargs.get("name", self.name),
+            "name": kwargs.get('name', self.name),
             "artist": kwargs.get("artist", self.artist),
             "album": kwargs.get("album", self.album),
             "track_number": int(kwargs.get("track_number", self.track_number)),
@@ -60,7 +61,7 @@ class MopidyRequest:
 
 @pytest.fixture
 def valid_auth_token():
-    user = User.objects.create(email="test@exmaple.com")
+    user = User.objects.create(email='test@exmaple.com')
     return Token.objects.create(user=user).key
 
 

tests/scrobbles_tests/test_aggregators.py

@@ -11,11 +11,11 @@ from scrobbles.models import Scrobble
 
 
 def build_scrobbles(client, request_data, num=7, spacing=2):
-    url = reverse("scrobbles:mopidy-webhook")
-    user = get_user_model().objects.create(username="Test User")
-    UserProfile.objects.create(user=user, timezone="US/Eastern")
+    url = reverse('scrobbles:mopidy-webhook')
+    user = get_user_model().objects.create(username='Test User')
+    UserProfile.objects.create(user=user, timezone='US/Eastern')
     for i in range(num):
-        client.post(url, request_data, content_type="application/json")
+        client.post(url, request_data, content_type='application/json')
         s = Scrobble.objects.last()
         s.user = user
         s.timestamp = timezone.now() - timedelta(days=i * spacing)
@@ -30,11 +30,11 @@ def test_scrobble_counts_data(client, mopidy_track_request_data):
     user = get_user_model().objects.first()
     count_dict = scrobble_counts(user)
     assert count_dict == {
-        "alltime": 7,
-        "month": 2,
-        "today": 1,
-        "week": 3,
-        "year": 7,
+        'alltime': 7,
+        'month': 2,
+        'today': 1,
+        'week': 3,
+        'year': 7,
     }
 
 
@@ -58,7 +58,7 @@ def test_top_tracks_by_day(client, mopidy_track_request_data):
 def test_top_tracks_by_week(client, mopidy_track_request_data):
     build_scrobbles(client, mopidy_track_request_data, 7, 1)
     user = get_user_model().objects.first()
-    tops = live_charts(user, chart_period="week")
+    tops = live_charts(user, chart_period='week')
     assert tops[0].title == "Same in the End"
 
 
@@ -66,7 +66,7 @@ def test_top_tracks_by_week(client, mopidy_track_request_data):
 def test_top_tracks_by_month(client, mopidy_track_request_data):
     build_scrobbles(client, mopidy_track_request_data, 7, 1)
     user = get_user_model().objects.first()
-    tops = live_charts(user, chart_period="month")
+    tops = live_charts(user, chart_period='month')
     assert tops[0].title == "Same in the End"
 
 
@@ -74,7 +74,7 @@ def test_top_tracks_by_month(client, mopidy_track_request_data):
 def test_top_tracks_by_year(client, mopidy_track_request_data):
     build_scrobbles(client, mopidy_track_request_data, 7, 1)
     user = get_user_model().objects.first()
-    tops = live_charts(user, chart_period="year")
+    tops = live_charts(user, chart_period='year')
     assert tops[0].title == "Same in the End"
 
 
@@ -82,7 +82,7 @@ def test_top_tracks_by_year(client, mopidy_track_request_data):
 def test_top__artists_by_week(client, mopidy_track_request_data):
     build_scrobbles(client, mopidy_track_request_data, 7, 1)
     user = get_user_model().objects.first()
-    tops = live_charts(user, chart_period="week", media_type="Artist")
+    tops = live_charts(user, chart_period='week', media_type="Artist")
     assert tops[0].name == "Sublime"
 
 
@@ -90,7 +90,7 @@ def test_top__artists_by_week(client, mopidy_track_request_data):
 def test_top__artists_by_month(client, mopidy_track_request_data):
     build_scrobbles(client, mopidy_track_request_data, 7, 1)
     user = get_user_model().objects.first()
-    tops = live_charts(user, chart_period="month", media_type="Artist")
+    tops = live_charts(user, chart_period='month', media_type="Artist")
     assert tops[0].name == "Sublime"
 
 
@@ -98,5 +98,5 @@ def test_top__artists_by_month(client, mopidy_track_request_data):
 def test_top__artists_by_year(client, mopidy_track_request_data):
     build_scrobbles(client, mopidy_track_request_data, 7, 1)
     user = get_user_model().objects.first()
-    tops = live_charts(user, chart_period="year", media_type="Artist")
+    tops = live_charts(user, chart_period='year', media_type="Artist")
     assert tops[0].name == "Sublime"

tests/scrobbles_tests/test_imdb.py

@@ -1,11 +1,11 @@
 import pytest
 
-from videos.imdb import lookup_video_from_imdb
+from vrobbler.apps.scrobbles.imdb import lookup_video_from_imdb
 
 
 @pytest.mark.skip(reason="Need to sort out third party API testing")
 def test_lookup_imdb_bad_id(caplog):
-    data = lookup_video_from_imdb("3409324")
+    data = lookup_video_from_imdb('3409324')
     assert data is None
     assert caplog.records[0].levelname == "WARNING"
     assert caplog.records[0].msg == "IMDB ID should begin with 'tt' 3409324"

tests/scrobbles_tests/test_views.py

@@ -1,27 +1,30 @@
+import json
 import pytest
+
 from django.urls import reverse
+
+from scrobbles.models import Scrobble
 from music.models import Track
 from podcasts.models import Episode
-from scrobbles.models import Scrobble
 
 
 @pytest.mark.django_db
 def test_get_not_allowed_from_mopidy(client, valid_auth_token):
-    url = reverse("scrobbles:mopidy-webhook")
-    headers = {"Authorization": f"Token {valid_auth_token}"}
+    url = reverse('scrobbles:mopidy-webhook')
+    headers = {'Authorization': f'Token {valid_auth_token}'}
     response = client.get(url, headers=headers)
     assert response.status_code == 405
 
 
 @pytest.mark.django_db
 def test_bad_mopidy_request_data(client, valid_auth_token):
-    url = reverse("scrobbles:mopidy-webhook")
-    headers = {"Authorization": f"Token {valid_auth_token}"}
+    url = reverse('scrobbles:mopidy-webhook')
+    headers = {'Authorization': f'Token {valid_auth_token}'}
     response = client.post(url, headers)
     assert response.status_code == 400
     assert (
-        response.data["detail"]
-        == "JSON parse error - Expecting value: line 1 column 1 (char 0)"
+        response.data['detail']
+        == 'JSON parse error - Expecting value: line 1 column 1 (char 0)'
     )
 
 
@@ -29,23 +32,22 @@ def test_bad_mopidy_request_data(client, valid_auth_token):
 def test_scrobble_mopidy_track(
     client, mopidy_track_request_data, valid_auth_token
 ):
-    url = reverse("scrobbles:mopidy-webhook")
-    headers = {"Authorization": f"Token {valid_auth_token}"}
+    url = reverse('scrobbles:mopidy-webhook')
+    headers = {'Authorization': f'Token {valid_auth_token}'}
     response = client.post(
         url,
         mopidy_track_request_data,
-        content_type="application/json",
+        content_type='application/json',
         headers=headers,
     )
     assert response.status_code == 200
-    assert response.data == {"scrobble_id": 1}
+    assert response.data == {'scrobble_id': 1}
 
     scrobble = Scrobble.objects.get(id=1)
     assert scrobble.media_obj.__class__ == Track
     assert scrobble.media_obj.title == "Same in the End"
 
 
-@pytest.mark.skip(reason="API is unstable")
 @pytest.mark.django_db
 def test_scrobble_mopidy_same_track_different_album(
     client,
@@ -53,28 +55,26 @@ def test_scrobble_mopidy_same_track_different_album(
     mopidy_track_diff_album_request_data,
     valid_auth_token,
 ):
-    url = reverse("scrobbles:mopidy-webhook")
-    headers = {"Authorization": f"Token {valid_auth_token}"}
+    url = reverse('scrobbles:mopidy-webhook')
+    headers = {'Authorization': f'Token {valid_auth_token}'}
     response = client.post(
         url,
         mopidy_track_request_data,
-        content_type="application/json",
+        content_type='application/json',
         headers=headers,
     )
     assert response.status_code == 200
-    assert response.data == {"scrobble_id": 1}
-    scrobble = Scrobble.objects.last()
+    assert response.data == {'scrobble_id': 1}
+    scrobble = Scrobble.objects.get(id=1)
     assert scrobble.media_obj.album.name == "Sublime"
 
     response = client.post(
         url,
         mopidy_track_diff_album_request_data,
-        content_type="application/json",
+        content_type='application/json',
     )
 
-    assert response.status_code == 200
-    assert response.data == {"scrobble_id": 2}
-    scrobble = Scrobble.objects.last()
+    scrobble = Scrobble.objects.get(id=2)
     assert scrobble.media_obj.__class__ == Track
     assert scrobble.media_obj.album.name == "Gold"
     assert scrobble.media_obj.title == "Same in the End"
@@ -84,16 +84,16 @@ def test_scrobble_mopidy_same_track_different_album(
 def test_scrobble_mopidy_podcast(
     client, mopidy_podcast_request_data, valid_auth_token
 ):
-    url = reverse("scrobbles:mopidy-webhook")
-    headers = {"Authorization": f"Token {valid_auth_token}"}
+    url = reverse('scrobbles:mopidy-webhook')
+    headers = {'Authorization': f'Token {valid_auth_token}'}
     response = client.post(
         url,
         mopidy_podcast_request_data,
-        content_type="application/json",
+        content_type='application/json',
         headers=headers,
     )
     assert response.status_code == 200
-    assert response.data == {"scrobble_id": 1}
+    assert response.data == {'scrobble_id': 1}
 
     scrobble = Scrobble.objects.get(id=1)
     assert scrobble.media_obj.__class__ == Episode

todos.org

@@ -2,80 +2,14 @@
 
 A fun way to keep track of things in the project to fix or improve.
 
-* Version 1.0.0
-** TODO Add a "finished_timestamp" so we don't rely on content length :improvement:scrobbling:
-
-Essentially, we currently have the timestamp as when the content began
-scrobbling and then calculate the finish time from the length of the content.
-This works pretty well because we know how long most things are.
-
-But in some cases, sports events or long podcasts, we may start mid-way through
-an event or finish halfway through but still want to mark it as done. In these
-cases, knowing the finish time could be useful, especially when interfacing with
-other scrobblers which may have different definitions of when a scrobble
-finishes or started.
-** DONE Fix bug with Various Artist albums being labeled with first artist as album artist :scrobbling:bug:music:
-CLOSED: [2023-03-27 Mon 20:18]
-:LOGBOOK:
-CLOCK: [2023-03-26 Sun 22:01]--[2023-03-27 Mon 01:07] =>  3:06
-:END:
-** DONE Fix bug with weekly aggregator being blank on Sundays :aggregators:music:bug:
-CLOSED: [2023-03-26 Sun 13:52]
-** DONE Fix KoReader scrobbling to use pages rather than time of last read :scrobbling:books:improvement:
-CLOSED: [2023-03-26 Sun 13:51]
-:LOGBOOK:
-CLOCK: [2023-03-26 Sun 13:11]--[2023-03-26 Sun 13:51] =>  0:40
-:END:
-** DONE [#A] Add django-storage to store files on S3 :settings:improvement:
-CLOSED: [2023-03-24 Fri 14:46]
-:LOGBOOK:
-CLOCK: [2023-03-24 Fri 10:47]--[2023-03-24 Fri 14:46] =>  3:59
-CLOCK: [2023-03-24 Fri 10:36]--[2023-03-24 Fri 10:40] =>  0:04
-:END:
-** DONE Fix vrobbler settings not using booleans :settings:bug:
-CLOSED: [2023-03-24 Fri 10:45]
-:LOGBOOK:
-CLOCK: [2023-03-24 Fri 10:40]--[2023-03-24 Fri 10:46] =>  0:06
-:END:
-** DONE Update weekly live chart to be 7-day continuous rather than weekly :views:bug:
-CLOSED: [2023-03-24 Fri 00:31]
-The live view will be blank every Monday, no reason to tie it to a day of the
-week. It should be "the last 7 days"
-** DONE [#B] Implement a detail view for TV shows :improvement:views:
-CLOSED: [2023-03-22 Wed 17:05]
-** DONE [#B] Implement a detail view for Movies :improvement:views:
-CLOSED: [2023-03-22 Wed 17:05]
-** DONE Add "service provider" to TV Series, and use that for source when available :bug:scrobbling:
-CLOSED: [2023-03-22 Wed 17:04]
-** DONE Add view for long-play content (books, video games) to restart them :views:improvement:
-CLOSED: [2023-03-22 Wed 17:01]
-** DONE Add live chart view like Maloja :improvement:views:
-CLOSED: [2023-03-07 Tue 11:13]
-** DONE [#C] Figure out how to add to web-scrobbler :improvement:scrobbling:
-CLOSED: [2023-03-22 Wed 17:06]
-
-An example:
-https://github.com/web-scrobbler/web-scrobbler/blob/master/src/core/background/scrobbler/maloja-scrobbler.js
-
-This is actually going to be moot because we can import from LastFM, and
-web-scrobbler integrates well with LastFM. The only thing to think through here
-now is what to do with all the garbage web-scrobbler sometimes pushes to LastFM
-from Youtube (all videos get pushed, sigh).
-
-* Version 0.11.4
-** DONE Add rudimentary video game scrobbling :improvement:content:videogames:
-CLOSED: [2023-03-07 Tue 11:11]
-** DONE Add ability to scrobble from KOReader statistics files :improvement:books:content:
-CLOSED: [2023-03-07 Tue 11:11]
-
-** DONE [#A] Fix fetching artwork without release group :bug:
+* DONE [#A] Fix fetching artwork without release group :bug:
 CLOSED: [2023-01-29 Sun 14:27]
 
 When we get artwork from Musicbrianz, and it's not found, we should check for
 release groups as well. This will stop issues with missing artwork because of
 obscure MB release matches.
 
-** DONE [#A] Fix Jellyfin music scrobbling N+1 past 90 completion percent :bug:
+* DONE [#A] Fix Jellyfin music scrobbling N+1 past 90 completion percent :bug:
 CLOSED: [2023-01-30 Mon 18:31]
 :LOGBOOK:
 CLOCK: [2023-01-30 Mon 18:00]--[2023-01-30 Mon 18:31] =>  0:31
@@ -92,7 +26,7 @@ as complete for the following conditions:
 
 But if we keep listening beyond 90, we should basically ignore updates (or just
 update the existing scrobble)
-** DONE [#A] Add support for Audioscrobbler tab-separated file uploads :improvement:
+* DONE [#A] Add support for Audioscrobbler tab-separated file uploads :improvement:
 CLOSED: [2023-02-03 Fri 16:52]
 
 An example of the format:
@@ -115,23 +49,25 @@ An example of the format:
 311	311	Misdirected Hostility	7	179	S	1740496085	61ff2c1a-fc9c-44c3-8da1-5e50a44245af
 ,
 #+end_src
-** DONE [#B] Allow scrobbling music without MB IDs by grabbing them before scrobble :improvement:
+* DONE [#B] Allow scrobbling music without MB IDs by grabbing them before scrobble :improvement:
 CLOSED: [2023-02-17 Fri 00:10]
 
 This would allow a few nice flows. One, you'd be able to record the play of an
 entire album by just dropping the muscibrainz_id in. This could be helpful for
 offline listening. It would also mean bad metadata from mopidy would not break
 scrobbling.
-** DONE When updating musicbrainz IDs, clear and run fetch artwrok :improvement:
+* DONE When updating musicbrainz IDs, clear and run fetch artwrok :improvement:
 CLOSED: [2023-02-17 Fri 00:11]
-** DONE [#A] Add ability to manually scrobble albums or tracks from MB :improvement:
-CLOSED: [2023-03-07 Tue 11:09]
+* TODO [#A] Add ability to manually scrobble albums or tracks from MB :improvement:
 
 Given a UUID from musicbrainz, we should be able to scrobble an album or
 individual track.
 
-** DONE [#C] Implement keeping track of week/month/year chart-toppers :improvement:
-CLOSED: [2023-03-07 Tue 11:10]
+* TODO [#A] Add django-storage to store files on S3 :improvement:
+* TODO [#B] Adjust cancel/finish task to use javascript to submit :improvement:
+* TODO [#B] Implement a detail view for TV shows :improvement:
+* TODO [#B] Implement a detail view for Moviews :improvement:
+* TODO [#C] Implement keeping track of week/month/year chart-toppers :improvement:
 :LOGBOOK:
 CLOCK: [2023-01-30 Mon 16:30]--[2023-01-30 Mon 18:00] =>  1:30
 :END:
@@ -147,10 +83,9 @@ a period, along with a one, two, three instance.
 Of course, it could also be a data model without a table, where it runs some fun
 calculations, stores it's values in Redis as a long-term lookup table and just
 has to re-populate when the server restarts.
-* Backlog
-** TODO [#C] Move to using more robust mopidy-webhooks pacakge form pypi :utility:improvement:
-*** Example payloads from mopidy-webhooks
-**** Podcast playback ended
+* TODO [#C] Move to using more robust mopidy-webhooks pacakge form pypi :improvement:
+** Example payloads from mopidy-webhooks
+*** Podcast playback ended
 #+begin_src json
 {
     "type": "event",
@@ -184,7 +119,7 @@ has to re-populate when the server restarts.
     }
 }
 #+end_src
-**** Podcast playback state changes
+*** Podcast playback state changes
 #+begin_src json
 {
     "type": "event",
@@ -206,7 +141,7 @@ has to re-populate when the server restarts.
     }
 }
 #+end_src
-**** Podcast playback started
+*** Podcast playback started
 #+begin_src json
 {
     "type": "event",
@@ -239,7 +174,7 @@ has to re-populate when the server restarts.
     }
 }
 #+end_src
-**** Podcast playback paused
+*** Podcast playback paused
 #+begin_src  json
 {
     "type": "status",
@@ -270,7 +205,7 @@ has to re-populate when the server restarts.
 }
 
 #+end_src
-**** Track playback started
+*** Track playback started
 #+begin_src json
 {
     "type": "event",
@@ -327,7 +262,7 @@ has to re-populate when the server restarts.
     }
 }
 #+end_src
-**** Track playback in progress
+*** Track playback in progress
 #+begin_src json
 {
     "type": "status",
@@ -381,7 +316,7 @@ has to re-populate when the server restarts.
     }
 }
 #+end_src
-**** Track event playback paused
+*** Track event playback paused
 #+begin_src json
 {
     "type": "event",
@@ -439,7 +374,9 @@ has to re-populate when the server restarts.
     }
 }
 #+end_src
-** TODO [#C] Consider a purge command for duplicated and stuck in-progress scrobbles :utililty:improvement:
-** TODO What to do with Youtube videos from LastFM and web-scrobbler :bug:source:lastfm:
-** TODO Fix bug in Jellyfin scrobbles that spam more scrobbles after completion :scrobbling:videos:bug:
-** TODO Fix bug in podcast scrobbling where a second scrobble is created after completion :scrobbling:podcasts:bug:
+* TODO [#C] Consider a purge command for duplicated and stuck in-progress scrobbles :improvement:
+* TODO [#C] Figure out how to add to web-scrobbler :imropvement:
+
+An example:
+https://github.com/web-scrobbler/web-scrobbler/blob/master/src/core/background/scrobbler/maloja-scrobbler.js
+

vrobbler.conf.example

@@ -1,26 +1,11 @@
 # You can use this file to set environment variables for your local setup
 #
 VROBBLER_DEBUG=True
-VROBBLER_LOG_LEVEL="DEBUG"
 VROBBLER_JSON_LOGGING=True
+VROBBLER_LOG_LEVEL="DEBUG"
 VROBBLER_MEDIA_ROOT = "/media/"
-VROBBLER_KEEP_DETAILED_SCROBBLE_LOGS=False
+VROBBLER_TMDB_API_KEY = "KEY"
+VROBBLER_KEEP_DETAILED_SCROBBLE_LOGS=True
 
-VROBBLER_USE_S3=False
-# You may also need to set these in your environment
-AWS_S3_ACCESS_KEY_ID=""
-AWS_S3_SECRET_ACCESS_KEY=""
-AWS_S3_CUSTOM_DOMAIN="https://minio.dev/"
-
-# API keys
-VROBBLER_TMDB_API_KEY = "<key>"
-VROBBLER_LASTFM_API_KEY = "<key>"
-VROBBLER_LASTFM_SECRET_KEY = "<key>"
-VROBBLER_THESPORTSDB_API_KEY="<key>"
-VROBBLER_THEAUDIODB_API_KEY="<key>"
-VROBBLER_IGDB_CLIENT_ID="<id>"
-VROBBLER_IGDB_CLIENT_SECRET="<key>"
-
-# Storages
-# VROBBLER_DATABASE_URL="postgres://USER:PASSWORD@HOST:PORT/NAME"
-# VROBBLER_REDIS_URL="redis://:PASS@HOST:6379/0"
+VROBBLER_DATABASE_URL="postgres://USER:PASSWORD@HOST:PORT/NAME"
+VROBBLER_REDIS_URL="redis://:PASS@HOST:6379/0"

vrobbler/__init__.py

@@ -2,4 +2,4 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app
 
-__all__ = ("celery_app",)
+__all__ = ('celery_app',)

vrobbler/apps/books/admin.py

@@ -1,32 +1,19 @@
 from django.contrib import admin
 
-from books.models import Author, Book, Page
+from books.models import Author, Book
 
 from scrobbles.admin import ScrobbleInline
 
 
 @admin.register(Author)
-class AuthorAdmin(admin.ModelAdmin):
+class AlbumAdmin(admin.ModelAdmin):
     date_hierarchy = "created"
-    list_display = (
-        "name",
-        "openlibrary_id",
-        "bio",
-        "wikipedia_url",
-    )
-    ordering = ("-created",)
-    search_fields = ("name",)
-
-
-@admin.register(Page)
-class PageAdmin(admin.ModelAdmin):
-    date_hierarchy = "created"
-    list_filter = ("book",)
-    ordering = ("book", "number")
+    list_display = ("name", "openlibrary_id")
+    ordering = ("name",)
 
 
 @admin.register(Book)
-class BookAdmin(admin.ModelAdmin):
+class ArtistAdmin(admin.ModelAdmin):
     date_hierarchy = "created"
     list_display = (
         "title",
@@ -35,8 +22,4 @@ class BookAdmin(admin.ModelAdmin):
         "pages",
         "openlibrary_id",
     )
-    search_fields = ("name",)
-    ordering = ("-created",)
-    inlines = [
-        ScrobbleInline,
-    ]
+    ordering = ("title",)

vrobbler/apps/books/api/views.py

@@ -8,12 +8,12 @@ from books.models import Author, Book
 
 
 class AuthorViewSet(viewsets.ModelViewSet):
-    queryset = Author.objects.all().order_by("-created")
+    queryset = Author.objects.all().order_by('-created')
     serializer_class = AuthorSerializer
     permission_classes = [permissions.IsAuthenticated]
 
 
 class BookViewSet(viewsets.ModelViewSet):
-    queryset = Book.objects.all().order_by("-created")
+    queryset = Book.objects.all().order_by('-created')
     serializer_class = BookSerializer
     permission_classes = [permissions.IsAuthenticated]

vrobbler/apps/books/koreader.py

@@ -1,246 +0,0 @@
-import re
-import codecs
-import logging
-import os
-import sqlite3
-from datetime import datetime
-from enum import Enum
-from typing import Iterable, List
-
-import pytz
-import requests
-from books.models import Author, Book, Page
-from pylast import httpx, tempfile
-from scrobbles.models import Scrobble
-from stream_sqlite import stream_sqlite
-from vrobbler.apps.books.openlibrary import get_author_openlibrary_id
-
-logger = logging.getLogger(__name__)
-
-
-class KoReaderBookColumn(Enum):
-    ID = 0
-    TITLE = 1
-    AUTHORS = 2
-    NOTES = 3
-    LAST_OPEN = 4
-    HIGHLIGHTS = 5
-    PAGES = 6
-    SERIES = 7
-    LANGUAGE = 8
-    MD5 = 9
-    TOTAL_READ_TIME = 10
-    TOTAL_READ_PAGES = 11
-
-
-class KoReaderPageStatColumn(Enum):
-    ID_BOOK = 0
-    PAGE = 1
-    START_TIME = 2
-    DURATION = 3
-    TOTAL_PAGES = 4
-
-
-def _sqlite_bytes(sqlite_url):
-    with httpx.stream("GET", sqlite_url) as r:
-        yield from r.iter_bytes(chunk_size=65_536)
-
-
-def get_book_map_from_sqlite(rows: Iterable) -> dict:
-    """Given an interable of sqlite rows from the books table, lookup existing
-    books, create ones that don't exist, and return a mapping of koreader IDs to
-    primary key IDs for page creation.
-
-    """
-    book_id_map = {}
-
-    for book_row in rows:
-        book = Book.objects.filter(
-            koreader_md5=book_row[KoReaderBookColumn.MD5.value]
-        ).first()
-
-        if not book:
-            book, created = Book.objects.get_or_create(
-                title=book_row[KoReaderBookColumn.TITLE.value]
-            )
-
-            if created:
-                total_pages = book_row[KoReaderBookColumn.PAGES.value]
-                run_time = total_pages * book.AVG_PAGE_READING_SECONDS
-                ko_authors = book_row[
-                    KoReaderBookColumn.AUTHORS.value
-                ].replace("\n", ", ")
-                # Strip middle initials, OpenLibrary often fails with these
-                ko_authors = re.sub(" [A-Z]. ", " ", ko_authors)
-                book_dict = {
-                    "title": book_row[KoReaderBookColumn.TITLE.value],
-                    "pages": total_pages,
-                    "koreader_md5": book_row[KoReaderBookColumn.MD5.value],
-                    "koreader_id": int(book_row[KoReaderBookColumn.ID.value]),
-                    "koreader_authors": ko_authors,
-                    "run_time_seconds": run_time,
-                }
-                Book.objects.filter(pk=book.id).update(**book_dict)
-
-                # Add authors
-                authors = ko_authors.split(", ")
-                author_list = []
-                for author_str in authors:
-                    logger.debug(f"Looking up author {author_str}")
-                    if author_str == "N/A":
-                        continue
-
-                    author, created = Author.objects.get_or_create(
-                        name=author_str
-                    )
-                    if created:
-                        author.openlibrary_id = get_author_openlibrary_id(
-                            author_str
-                        )
-                        author.save(update_fields=["openlibrary_id"])
-                        author.fix_metadata()
-                        logger.debug(f"Created author {author}")
-                    book.authors.add(author)
-
-                # This will try to fix metadata by looking it up on OL
-                book.fix_metadata()
-
-        playback_position_seconds = 0
-        if book_row[KoReaderBookColumn.TOTAL_READ_TIME.value]:
-            playback_position_seconds = book_row[
-                KoReaderBookColumn.TOTAL_READ_TIME.value
-            ]
-
-        pages_read = 0
-        if book_row[KoReaderBookColumn.TOTAL_READ_PAGES.value]:
-            pages_read = int(
-                book_row[KoReaderBookColumn.TOTAL_READ_PAGES.value]
-            )
-        timestamp = datetime.utcfromtimestamp(
-            book_row[KoReaderBookColumn.LAST_OPEN.value]
-        ).replace(tzinfo=pytz.utc)
-        book.refresh_from_db()
-        book_id_map[book_row[KoReaderBookColumn.ID.value]] = book.id
-
-    return book_id_map
-
-
-def build_scrobbles_from_pages(
-    rows: Iterable, book_id_map: dict, user_id: int
-) -> List[Scrobble]:
-    new_scrobbles = []
-
-    new_scrobbles = []
-    pages_created = []
-    for page_row in rows:
-        koreader_id = page_row[KoReaderPageStatColumn.ID_BOOK.value]
-        page_number = page_row[KoReaderPageStatColumn.PAGE.value]
-        ts = page_row[KoReaderPageStatColumn.START_TIME.value]
-        book_id = book_id_map[koreader_id]
-
-        page, page_created = Page.objects.get_or_create(
-            book_id=book_id, number=page_number, user_id=user_id
-        )
-        if page_created:
-            page.start_time = datetime.utcfromtimestamp(ts).replace(
-                tzinfo=pytz.utc
-            )
-            page.duration_seconds = page_row[
-                KoReaderPageStatColumn.DURATION.value
-            ]
-            page.save(update_fields=["start_time", "duration_seconds"])
-            pages_created.append(page)
-
-    for page in pages_created:
-        if page.is_scrobblable:
-            # Page number is a placeholder, we'll re-preocess this after creation
-            logger.debug(
-                f"Queueing scrobble for {page.book}, page {page.number}"
-            )
-            new_scrobble = Scrobble(
-                book_id=page.book_id,
-                user_id=user_id,
-                source="KOReader",
-                timestamp=page.start_time,
-                played_to_completion=True,
-                in_progress=False,
-                book_pages_read=page.number,
-                long_play_complete=False,
-            )
-            new_scrobbles.append(new_scrobble)
-    return new_scrobbles
-
-
-def enrich_koreader_scrobbles(scrobbles: list) -> None:
-    """Given a list of scrobbles, update pages read, long play seconds and check
-    for media completion"""
-
-    for scrobble in scrobbles:
-        if scrobble.next:
-            # Set pages read to the starting page of the next scrobble minus one, if it exists
-            scrobble.book_pages_read = scrobble.next.book_pages_read - 1
-            scrobble.save(update_fields=["book_pages_read"])
-        else:
-            # Set pages read to the last page we have
-            scrobble.book_pages_read = scrobble.book.page_set.last().number
-
-        scrobble.save(update_fields=["book_pages_read", "long_play_complete"])
-
-
-def process_koreader_sqlite_url(file_url, user_id) -> list:
-    book_id_map = {}
-    new_scrobbles = []
-
-    for table_name, pragma_table_info, rows in stream_sqlite(
-        _sqlite_bytes(file_url), max_buffer_size=1_048_576
-    ):
-        if table_name == "book":
-            book_id_map = get_book_map_from_sqlite(rows)
-
-        if table_name == "page_stat_data":
-            new_scrobbles = build_scrobbles_from_pages(
-                rows, book_id_map, user_id
-            )
-
-    created = []
-    if new_scrobbles:
-        created = Scrobble.objects.bulk_create(new_scrobbles)
-        enrich_koreader_scrobbles(created)
-        logger.info(
-            f"Created {len(created)} scrobbles",
-            extra={"created_scrobbles": created},
-        )
-    return created
-
-
-def process_koreader_sqlite_file(file_path, user_id) -> list:
-    """Given a sqlite file from KoReader, open the book table, iterate
-    over rows creating scrobbles from each book found"""
-    # Create a SQL connection to our SQLite database
-    con = sqlite3.connect(file_path)
-    cur = con.cursor()
-
-    book_id_map = get_book_map_from_sqlite(cur.execute("SELECT * FROM book"))
-    new_scrobbles = build_scrobbles_from_pages(
-        cur.execute("SELECT * from page_stat_data"), book_id_map, user_id
-    )
-
-    created = []
-    if new_scrobbles:
-        created = Scrobble.objects.bulk_create(new_scrobbles)
-        enrich_koreader_scrobbles(created)
-        logger.info(
-            f"Created {len(created)} scrobbles",
-            extra={"created_scrobbles": created},
-        )
-    return created
-
-
-def process_koreader_sqlite(file_path: str, user_id: int) -> list:
-    is_os_file = "https://" not in file_path
-
-    if is_os_file:
-        created = process_koreader_sqlite_file(file_path, user_id)
-    else:
-        created = process_koreader_sqlite_url(file_path, user_id)
-    return created

vrobbler/apps/books/migrations/0002_book_author_name_book_author_openlibrary_id.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 05:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="book",
-            name="author_name",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="book",
-            name="author_openlibrary_id",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

vrobbler/apps/books/migrations/0003_book_cover.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 05:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0002_book_author_name_book_author_openlibrary_id"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="book",
-            name="cover",
-            field=models.ImageField(
-                blank=True, null=True, upload_to="books/covers/"
-            ),
-        ),
-    ]

vrobbler/apps/books/migrations/0004_remove_book_author_name_and_more.py

@@ -1,69 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 16:31
-
-from django.db import migrations, models
-import django.db.models.deletion
-import django_extensions.db.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0003_book_cover"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="book",
-            name="author_name",
-        ),
-        migrations.RemoveField(
-            model_name="book",
-            name="author_openlibrary_id",
-        ),
-        migrations.AddField(
-            model_name="author",
-            name="headshot",
-            field=models.ImageField(
-                blank=True, null=True, upload_to="books/authors/"
-            ),
-        ),
-        migrations.CreateModel(
-            name="Page",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "created",
-                    django_extensions.db.fields.CreationDateTimeField(
-                        auto_now_add=True, verbose_name="created"
-                    ),
-                ),
-                (
-                    "modified",
-                    django_extensions.db.fields.ModificationDateTimeField(
-                        auto_now=True, verbose_name="modified"
-                    ),
-                ),
-                ("number", models.IntegerField()),
-                ("start_time", models.DateTimeField()),
-                ("duration_seconds", models.IntegerField()),
-                (
-                    "book",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="books.book",
-                    ),
-                ),
-            ],
-            options={
-                "unique_together": {("book", "number")},
-            },
-        ),
-    ]

vrobbler/apps/books/migrations/0005_author_uuid.py

@@ -1,21 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 16:34
-
-from django.db import migrations, models
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0004_remove_book_author_name_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="author",
-            name="uuid",
-            field=models.UUIDField(
-                blank=True, default=uuid.uuid4, editable=False, null=True
-            ),
-        ),
-    ]

vrobbler/apps/books/migrations/0006_alter_page_duration_seconds_alter_page_start_time.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 17:13
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0005_author_uuid"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="page",
-            name="duration_seconds",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name="page",
-            name="start_time",
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/books/migrations/0007_author_amazon_id_author_bio_author_goodreads_id_and_more.py

@@ -1,48 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 17:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0006_alter_page_duration_seconds_alter_page_start_time"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="author",
-            name="amazon_id",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="author",
-            name="bio",
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="author",
-            name="goodreads_id",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="author",
-            name="isni",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="author",
-            name="librarything_id",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="author",
-            name="wikidata_id",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="author",
-            name="wikipedia_url",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

vrobbler/apps/books/migrations/0008_book_first_sentence.py

@@ -1,21 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 18:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "books",
-            "0007_author_amazon_id_author_bio_author_goodreads_id_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="book",
-            name="first_sentence",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

vrobbler/apps/books/migrations/0009_alter_book_run_time.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0008_book_first_sentence"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="book",
-            name="run_time",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/books/migrations/0010_rename_run_time_book_run_time_seconds.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:21
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0009_alter_book_run_time"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="book",
-            old_name="run_time",
-            new_name="run_time_seconds",
-        ),
-    ]

vrobbler/apps/books/migrations/0011_book_genre.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-14 22:27
-
-from django.db import migrations
-import taggit.managers
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0033_genre_objectwithgenres"),
-        ("books", "0010_rename_run_time_book_run_time_seconds"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="book",
-            name="genre",
-            field=taggit.managers.TaggableManager(
-                help_text="A comma-separated list of tags.",
-                through="scrobbles.ObjectWithGenres",
-                to="scrobbles.Genre",
-                verbose_name="Tags",
-            ),
-        ),
-    ]

vrobbler/apps/books/migrations/0012_page_end_time.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.7 on 2023-03-26 02:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("books", "0011_book_genre"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="page",
-            name="end_time",
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/books/migrations/0013_page_user.py

@@ -1,26 +0,0 @@
-# Generated by Django 4.1.7 on 2023-03-26 05:31
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("books", "0012_page_end_time"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="page",
-            name="user",
-            field=models.ForeignKey(
-                default=1,
-                on_delete=django.db.models.deletion.CASCADE,
-                to=settings.AUTH_USER_MODEL,
-            ),
-            preserve_default=False,
-        ),
-    ]

vrobbler/apps/books/models.py

@@ -1,19 +1,14 @@
 import logging
-from datetime import timedelta
-from uuid import uuid4
+from typing import Dict
 
-import requests
-from books.openlibrary import (
-    lookup_author_from_openlibrary,
-    lookup_book_from_openlibrary,
-)
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.files.base import ContentFile
 from django.db import models
 from django.urls import reverse
 from django_extensions.db.models import TimeStampedModel
-from scrobbles.mixins import LongPlayScrobblableMixin, ScrobblableMixin
+from scrobbles.mixins import ScrobblableMixin
+
+from books.utils import lookup_book_from_openlibrary
 from scrobbles.utils import get_scrobbles_for_media
 
 logger = logging.getLogger(__name__)
@@ -23,47 +18,21 @@ BNULL = {"blank": True, "null": True}
 
 class Author(TimeStampedModel):
     name = models.CharField(max_length=255)
-    uuid = models.UUIDField(default=uuid4, editable=False, **BNULL)
     openlibrary_id = models.CharField(max_length=255, **BNULL)
-    headshot = models.ImageField(upload_to="books/authors/", **BNULL)
-    bio = models.TextField(**BNULL)
-    wikipedia_url = models.CharField(max_length=255, **BNULL)
-    isni = models.CharField(max_length=255, **BNULL)
-    wikidata_id = models.CharField(max_length=255, **BNULL)
-    goodreads_id = models.CharField(max_length=255, **BNULL)
-    librarything_id = models.CharField(max_length=255, **BNULL)
-    amazon_id = models.CharField(max_length=255, **BNULL)
 
     def __str__(self):
         return f"{self.name}"
 
-    def fix_metadata(self, data_dict: dict = {}):
-        if not data_dict and self.openlibrary_id:
-            data_dict = lookup_author_from_openlibrary(self.openlibrary_id)
-
-        if not data_dict or not data_dict.get("name"):
-            return
-
-        headshot_url = data_dict.pop("author_headshot_url", "")
-
-        Author.objects.filter(pk=self.id).update(**data_dict)
-        self.refresh_from_db()
-
-        if headshot_url:
-            r = requests.get(headshot_url)
-            if r.status_code == 200:
-                fname = f"{self.name}_{self.uuid}.jpg"
-                self.headshot.save(fname, ContentFile(r.content), save=True)
+    def fix_metadata(self):
+        logger.warn("Not implemented yet")
 
 
-class Book(LongPlayScrobblableMixin):
-    COMPLETION_PERCENT = getattr(settings, "BOOK_COMPLETION_PERCENT", 95)
-    AVG_PAGE_READING_SECONDS = getattr(
-        settings, "AVERAGE_PAGE_READING_SECONDS", 60
-    )
+class Book(ScrobblableMixin):
+    COMPLETION_PERCENT = getattr(settings, 'BOOK_COMPLETION_PERCENT', 95)
 
     title = models.CharField(max_length=255)
     authors = models.ManyToManyField(Author)
+    openlibrary_id = models.CharField(max_length=255, **BNULL)
     goodreads_id = models.CharField(max_length=255, **BNULL)
     koreader_id = models.IntegerField(**BNULL)
     koreader_authors = models.CharField(max_length=255, **BNULL)
@@ -72,88 +41,26 @@ class Book(LongPlayScrobblableMixin):
     pages = models.IntegerField(**BNULL)
     language = models.CharField(max_length=4, **BNULL)
     first_publish_year = models.IntegerField(**BNULL)
-    first_sentence = models.CharField(max_length=255, **BNULL)
-    openlibrary_id = models.CharField(max_length=255, **BNULL)
-    cover = models.ImageField(upload_to="books/covers/", **BNULL)
 
     def __str__(self):
         return f"{self.title} by {self.author}"
 
-    @property
-    def subtitle(self):
-        return f" by {self.author}"
-
-    @property
-    def primary_image_url(self) -> str:
-        url = ""
-        if self.cover:
-            url = self.cover.url
-        return url
-
-    def get_start_url(self):
-        return reverse("scrobbles:start", kwargs={"uuid": self.uuid})
-
-    def get_absolute_url(self):
-        return reverse("books:book_detail", kwargs={"slug": self.uuid})
-
-    def fix_metadata(self, force_update=False):
-        if not self.openlibrary_id or force_update:
-            author_name = ""
-            if self.author:
-                author_name = self.author.name
-            book_dict = lookup_book_from_openlibrary(self.title, author_name)
-            if not book_dict:
-                logger.warn(f"Book not found in OL {self.title}")
-                return
-
-            cover_url = book_dict.pop("cover_url", "")
-            ol_author_id = book_dict.pop("ol_author_id", "")
-            ol_author_name = book_dict.pop("ol_author_name", "")
-            if book_dict.get("pages") == None:
-                book_dict.pop("pages")
-
-            ol_title = book_dict.get("title")
-
-            if ol_title.lower() != self.title.lower():
-                logger.warn(
-                    f"OL and KoReader disagree on this book title {self.title} != {ol_title}"
-                )
-
-            Book.objects.filter(pk=self.id).update(**book_dict)
-            self.refresh_from_db()
-
-            # Process authors
-            author = None
-            author_created = False
-            if ol_author_id:
-                author, author_created = Author.objects.get_or_create(
-                    openlibrary_id=ol_author_id
-                )
-                if author_created or force_update:
-                    author.fix_metadata()
-            if not author and ol_author_name:
-                author, author_created = Author.objects.get_or_create(
-                    name=ol_author_name
-                )
-            self.authors.add(author)
-
-            if cover_url:
-                r = requests.get(cover_url)
-                if r.status_code == 200:
-                    fname = f"{self.title}_{self.uuid}.jpg"
-                    self.cover.save(fname, ContentFile(r.content), save=True)
-
-            if self.pages:
-                self.run_time_seconds = self.pages * int(
-                    self.AVG_PAGE_READING_SECONDS
-                )
-
+    def fix_metadata(self):
+        if not self.openlibrary_id:
+            book_meta = lookup_book_from_openlibrary(self.title, self.author)
+            self.openlibrary_id = book_meta.get("openlibrary_id")
+            self.isbn = book_meta.get("isbn")
+            self.goodreads_id = book_meta.get("goodreads_id")
+            self.first_pubilsh_year = book_meta.get("first_publish_year")
             self.save()
 
     @property
     def author(self):
         return self.authors.first()
 
+    def get_absolute_url(self):
+        return reverse("books:book_detail", kwargs={'slug': self.uuid})
+
     @property
     def pages_for_completion(self) -> int:
         if not self.pages:
@@ -161,113 +68,6 @@ class Book(LongPlayScrobblableMixin):
             return 0
         return int(self.pages * (self.COMPLETION_PERCENT / 100))
 
-    def update_long_play_seconds(self):
-        """Check page timestamps and duration and update"""
-        if self.page_set.all():
-            ...
-
-    def progress_for_user(self, user_id: int) -> int:
-        """Used to keep track of whether the book is complete or not"""
-        user = User.objects.get(id=user_id)
+    def progress_for_user(self, user: User) -> int:
         last_scrobble = get_scrobbles_for_media(self, user).last()
-        progress = 0
-        if last_scrobble:
-            progress = int((last_scrobble.book_pages_read / self.pages) * 100)
-        return progress
-
-    @classmethod
-    def find_or_create(cls, data_dict: dict) -> "Game":
-        from books.utils import update_or_create_book
-
-        return update_or_create_book(
-            data_dict.get("title"), data_dict.get("author")
-        )
-
-
-class Page(TimeStampedModel):
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    book = models.ForeignKey(Book, on_delete=models.CASCADE)
-    number = models.IntegerField()
-    start_time = models.DateTimeField(**BNULL)
-    end_time = models.DateTimeField(**BNULL)
-    duration_seconds = models.IntegerField(**BNULL)
-
-    class Meta:
-        unique_together = (
-            "book",
-            "number",
-        )
-
-    def __str__(self):
-        return f"Page {self.number} of {self.book.pages} in {self.book.title}"
-
-    def save(self, *args, **kwargs):
-        if not self.end_time and self.duration_seconds:
-            self._set_end_time()
-
-        return super(Page, self).save(*args, **kwargs)
-
-    @property
-    def next(self):
-        page = self.book.page_set.filter(number=self.number + 1).first()
-        if not page:
-            page = (
-                self.book.page_set.filter(created__gt=self.created)
-                .order_by("created")
-                .first()
-            )
-        return page
-
-    @property
-    def previous(self):
-        page = self.book.page_set.filter(number=self.number - 1).first()
-        if not page:
-            page = (
-                self.book.page_set.filter(created__lt=self.created)
-                .order_by("-created")
-                .first()
-            )
-        return page
-
-    @property
-    def seconds_to_next_page(self) -> int:
-        seconds = 999999  # Effectively infnity time as we have no next
-        if not self.end_time:
-            self._set_end_time()
-        if self.next:
-            seconds = (self.next.start_time - self.end_time).seconds
-        return seconds
-
-    @property
-    def is_scrobblable(self) -> bool:
-        """A page defines the start of a scrobble if the seconds to next page
-        are greater than an hour, or 3600 seconds, and it's not a single page,
-        so the next seconds to next_page is less than an hour as well.
-
-        As a special case, the first recorded page is a scrobble, so we establish
-        when the book was started.
-
-        """
-        is_scrobblable = False
-        over_an_hour_since_last_page = False
-        if not self.previous:
-            is_scrobblable = True
-
-        if self.previous:
-            over_an_hour_since_last_page = (
-                self.previous.seconds_to_next_page >= 3600
-            )
-        blip = self.seconds_to_next_page >= 3600
-
-        if over_an_hour_since_last_page and not blip:
-            is_scrobblable = True
-        return is_scrobblable
-
-    def _set_end_time(self) -> None:
-        if self.end_time:
-            return
-
-        self.end_time = self.start_time + timedelta(
-            seconds=self.duration_seconds
-        )
-        self.save(update_fields=["end_time"])
+        return int((last_scrobble.book_pages_read / self.pages) * 100)

vrobbler/apps/books/openlibrary.py

@@ -1,129 +0,0 @@
-import json
-import logging
-import urllib
-
-import requests
-
-logger = logging.getLogger(__name__)
-
-ISBN_URL = "https://openlibrary.org/isbn/{isbn}.json"
-SEARCH_URL = "https://openlibrary.org/search.json?q={query}&sort=editions&mode=everything"
-AUTHOR_SEARCH_URL = "https://openlibrary.org/search/authors.json?q={query}"
-COVER_URL = "https://covers.openlibrary.org/b/olid/{id}-L.jpg"
-AUTHOR_URL = "https://openlibrary.org/authors/{id}.json"
-AUTHOR_IMAGE_URL = "https://covers.openlibrary.org/a/olid/{id}-L.jpg"
-
-
-def get_first(key: str, result: dict) -> str:
-    obj = ""
-    if obj_list := result.get(key):
-        obj = obj_list[0]
-    return obj
-
-
-def get_author_openlibrary_id(name: str) -> str:
-    search_url = AUTHOR_SEARCH_URL.format(query=name)
-    response = requests.get(search_url)
-
-    if response.status_code != 200:
-        logger.warn(f"Bad response from OL: {response.status_code}")
-        return ""
-
-    results = json.loads(response.content)
-
-    if not results:
-        logger.warn(f"No author results found from search for {name}")
-        return ""
-
-    result = results.get("docs", [])
-    return result[0].get("key")
-
-
-def lookup_author_from_openlibrary(olid: str) -> dict:
-    author_url = AUTHOR_URL.format(id=olid)
-    response = requests.get(author_url)
-
-    if response.status_code != 200:
-        logger.warn(f"Bad response from OL: {response.status_code}")
-        return {}
-
-    results = json.loads(response.content)
-
-    if not results:
-        logger.warn(f"No author results found from OL for {olid}")
-        return {}
-
-    remote_ids = results.get("remote_ids", {})
-    bio = ""
-    if results.get("bio"):
-        try:
-            bio = results.get("bio").get("value")
-        except AttributeError:
-            bio = results.get("bio")
-    return {
-        "name": results.get("name"),
-        "openlibrary_id": olid,
-        "wikipedia_url": results.get("wikipedia"),
-        "wikidata_id": remote_ids.get("wikidata"),
-        "isni": remote_ids.get("isni"),
-        "goodreads_id": remote_ids.get("goodreads"),
-        "librarything_id": remote_ids.get("librarything"),
-        "amazon_id": remote_ids.get("amazon"),
-        "bio": bio,
-        "author_headshot_url": AUTHOR_IMAGE_URL.format(id=olid),
-    }
-
-
-def lookup_book_from_openlibrary(title: str, author: str = None) -> dict:
-    title_quoted = urllib.parse.quote(title)
-    author_quoted = ""
-    if author:
-        author_quoted = urllib.parse.quote(author)
-    query = f"{title_quoted} {author_quoted}"
-
-    search_url = SEARCH_URL.format(query=query)
-    response = requests.get(search_url)
-
-    if response.status_code != 200:
-        logger.warn(f"Bad response from OL: {response.status_code}")
-        return {}
-
-    results = json.loads(response.content)
-
-    if len(results.get("docs")) == 0:
-        logger.warn(f"No results found from OL for {title}")
-        return {}
-
-    top = None
-    for result in results.get("docs"):
-        # These Summary things suck and ruin our one-shot search
-        if "Summary of" not in result.get("title"):
-            top = result
-            break
-
-    if not top:
-        logger.warn(f"No book found for query {query}")
-        return {}
-
-    ol_id = top.get("cover_edition_key")
-    ol_author_id = get_first("author_key", top)
-    first_sentence = ""
-    if top.get("first_sentence"):
-        try:
-            first_sentence = top.get("first_sentence")[0].get("value")
-        except AttributeError:
-            first_sentence = top.get("first_sentence")[0]
-    isbn = None
-    if top.get("isbn"):
-        isbn = top.get("isbn")[0]
-    return {
-        "title": top.get("title"),
-        "isbn": isbn,
-        "openlibrary_id": ol_id,
-        "goodreads_id": get_first("id_goodreads", top),
-        "first_publish_year": top.get("first_publish_year"),
-        "first_sentence": first_sentence,
-        "pages": top.get("number_of_pages_median", None),
-        "cover_url": COVER_URL.format(id=ol_id),
-        "ol_author_id": ol_author_id,
-    }

vrobbler/apps/books/urls.py

@@ -1,19 +0,0 @@
-from django.urls import path
-from books import views
-
-app_name = "books"
-
-
-urlpatterns = [
-    path("book/", views.BookListView.as_view(), name="book_list"),
-    path(
-        "book/<slug:slug>/",
-        views.BookDetailView.as_view(),
-        name="book_detail",
-    ),
-    path(
-        "author/<slug:slug>/",
-        views.AuthorDetailView.as_view(),
-        name="author_detail",
-    ),
-]

vrobbler/apps/books/utils.py

@@ -1,52 +1,47 @@
-from django.core.files.base import ContentFile
-import requests
+import json
 from typing import Optional
-from books.openlibrary import (
-    lookup_author_from_openlibrary,
-    lookup_book_from_openlibrary,
-)
-from books.models import Author, Book
+import requests
+import logging
+
+logger = logging.getLogger(__name__)
+
+SEARCH_URL = "https://openlibrary.org/search.json?title={title}"
+ISBN_URL = "https://openlibrary.org/isbn/{isbn}.json"
 
 
-def update_or_create_book(
-    title: str, author: Optional[str] = None, force_update=False
-) -> Book:
-    book_dict = lookup_book_from_openlibrary(title, author)
+def get_first(key: str, result: dict) -> str:
+    obj = ""
+    if obj_list := result.get(key):
+        obj = obj_list[0]
+    return obj
 
-    book, book_created = Book.objects.get_or_create(
-        isbn=book_dict.get("isbn"),
-    )
 
-    if book_created or force_update:
-        cover_url = book_dict.pop("cover_url")
-        ol_author_id = book_dict.pop("ol_author_id")
+def lookup_book_from_openlibrary(title: str, author: str = None) -> dict:
+    search_url = SEARCH_URL.format(title=title)
+    response = requests.get(search_url)
 
-        Book.objects.filter(pk=book.id).update(**book_dict)
-        book.refresh_from_db()
+    if response.status_code != 200:
+        logger.warn(f"Bad response from OL: {response.status_code}")
+        return {}
 
-        # Process authors
-        author_dict = lookup_author_from_openlibrary(ol_author_id)
-        author = Author.objects.filter(openlibrary_id=ol_author_id).first()
-        if not author:
-            author_image_url = author_dict.pop("author_headshot_url", None)
+    results = json.loads(response.content)
 
-            author = Author.objects.create(**author_dict)
+    if len(results.get('docs')) == 0:
+        logger.warn(f"No results found from OL for {title}")
+        return {}
 
-            if author_image_url:
-                r = requests.get(author_image_url)
-                if r.status_code == 200:
-                    fname = f"{author.name}_{author.uuid}.jpg"
-                    author.headshot.save(
-                        fname, ContentFile(r.content), save=True
-                    )
-        book.authors.add(author)
+    top = results.get('docs')[0]
+    if author and author not in top['author_name']:
+        logger.warn(
+            f"Lookup for {title} found top result with mismatched author"
+        )
 
-        # Process cover URL
-        r = requests.get(cover_url)
-        if r.status_code == 200:
-            fname = f"{book.title}_{book.uuid}.jpg"
-            book.cover.save(fname, ContentFile(r.content), save=True)
-
-        book.fix_metadata()
-
-    return book
+    return {
+        "title": top.get("title"),
+        "isbn": top.get("isbn")[0],
+        "openlibrary_id": top.get("cover_edition_key"),
+        "author_name": get_first("author_name", top),
+        "author_openlibrary_id": get_first("author_key", top),
+        "goodreads_id": get_first("id_goodreads", top),
+        "first_publish_year": top.get("first_publish_year"),
+    }

vrobbler/apps/books/views.py

@@ -1,17 +0,0 @@
-from django.views import generic
-from books.models import Book, Author
-
-
-class BookListView(generic.ListView):
-    model = Book
-    paginate_by = 20
-
-
-class BookDetailView(generic.DetailView):
-    model = Book
-    slug_field = "uuid"
-
-
-class AuthorDetailView(generic.DetailView):
-    model = Author
-    slug_field = "uuid"

vrobbler/apps/music/admin.py

@@ -11,7 +11,7 @@ class AlbumAdmin(admin.ModelAdmin):
     list_display = (
         "name",
         "year",
-        "album_artist",
+        "primary_artist",
         "theaudiodb_genre",
         "theaudiodb_mood",
         "musicbrainz_id",
@@ -20,28 +20,17 @@ class AlbumAdmin(admin.ModelAdmin):
         "theaudiodb_score",
         "theaudiodb_genre",
     )
-    ordering = ("-created",)
-    search_fields = ("name",)
+    ordering = ("name",)
     filter_horizontal = [
-        "artists",
+        'artists',
     ]
 
 
 @admin.register(Artist)
 class ArtistAdmin(admin.ModelAdmin):
     date_hierarchy = "created"
-    list_display = (
-        "name",
-        "theaudiodb_mood",
-        "theaudiodb_genre",
-        "musicbrainz_id",
-    )
-    list_filter = (
-        "theaudiodb_mood",
-        "theaudiodb_genre",
-    )
-    search_fields = ("name",)
-    ordering = ("-created",)
+    list_display = ("name", "musicbrainz_id")
+    ordering = ("name",)
 
 
 @admin.register(Track)
@@ -51,10 +40,10 @@ class TrackAdmin(admin.ModelAdmin):
         "title",
         "album",
         "artist",
+        "run_time",
         "musicbrainz_id",
     )
     list_filter = ("album", "artist")
-    search_fields = ("title",)
     ordering = ("-created",)
     inlines = [
         ScrobbleInline,

vrobbler/apps/music/aggregators.py

@@ -1,11 +1,13 @@
 from datetime import datetime, timedelta
+from typing import List
 
 from django.apps import apps
 from django.db.models import Count, Q, QuerySet
 from django.utils import timezone
-from profiles.utils import now_user_timezone
+from music.models import Artist, Track
 from scrobbles.models import Scrobble
 from videos.models import Video
+from vrobbler.apps.profiles.utils import now_user_timezone
 
 
 def scrobble_counts(user=None):
@@ -29,24 +31,24 @@ def scrobble_counts(user=None):
         user_filter, played_to_completion=True
     )
     data = {}
-    data["today"] = finished_scrobbles_qs.filter(
+    data['today'] = finished_scrobbles_qs.filter(
         timestamp__gte=start_of_today
     ).count()
-    data["week"] = finished_scrobbles_qs.filter(
+    data['week'] = finished_scrobbles_qs.filter(
         timestamp__gte=starting_day_of_current_week
     ).count()
-    data["month"] = finished_scrobbles_qs.filter(
+    data['month'] = finished_scrobbles_qs.filter(
         timestamp__gte=starting_day_of_current_month
     ).count()
-    data["year"] = finished_scrobbles_qs.filter(
+    data['year'] = finished_scrobbles_qs.filter(
         timestamp__gte=starting_day_of_current_year
     ).count()
-    data["alltime"] = finished_scrobbles_qs.count()
+    data['alltime'] = finished_scrobbles_qs.count()
     return data
 
 
 def week_of_scrobbles(
-    user=None, start=None, media: str = "tracks"
+    user=None, start=None, media: str = 'tracks'
 ) -> dict[str, int]:
 
     now = timezone.now()
@@ -62,15 +64,15 @@ def week_of_scrobbles(
     base_qs = Scrobble.objects.filter(user_filter, played_to_completion=True)
 
     media_filter = Q(track__isnull=False)
-    if media == "movies":
+    if media == 'movies':
         media_filter = Q(video__video_type=Video.VideoType.MOVIE)
-    if media == "series":
+    if media == 'series':
         media_filter = Q(video__video_type=Video.VideoType.TV_EPISODE)
 
     for day in range(6, -1, -1):
         start_day = start - timedelta(days=day)
         end = datetime.combine(start_day, datetime.max.time(), now.tzinfo)
-        day_of_week = start_day.strftime("%A")
+        day_of_week = start_day.strftime('%A')
 
         scrobble_day_dict[day_of_week] = base_qs.filter(
             media_filter,
@@ -95,25 +97,19 @@ def live_charts(
         now = now_user_timezone(user.profile)
         tzinfo = now.tzinfo
 
-    seven_days_ago = now - timedelta(days=7)
-    thirty_days_ago = now - timedelta(days=30)
     start_of_today = datetime.combine(now, datetime.min.time(), tzinfo)
-    start_day_of_week = start_of_today - timedelta(
-        days=now.today().isoweekday() % 7
-    )
+    start_day_of_week = now - timedelta(days=now.today().isoweekday() % 7)
     start_day_of_month = now.replace(day=1)
     start_day_of_year = now.replace(month=1, day=1)
 
-    media_model = apps.get_model(app_label="music", model_name=media_type)
+    media_model = apps.get_model(app_label='music', model_name=media_type)
 
     period_queries = {
-        "today": {"scrobble__timestamp__gte": start_of_today},
-        "week": {"scrobble__timestamp__gte": start_day_of_week},
-        "last7": {"scrobble__timestamp__gte": seven_days_ago},
-        "last30": {"scrobble__timestamp__gte": thirty_days_ago},
-        "month": {"scrobble__timestamp__gte": start_day_of_month},
-        "year": {"scrobble__timestamp__gte": start_day_of_year},
-        "all": {},
+        'today': {'scrobble__timestamp__gte': start_of_today},
+        'week': {'scrobble__timestamp__gte': start_day_of_week},
+        'month': {'scrobble__timestamp__gte': start_day_of_month},
+        'year': {'scrobble__timestamp__gte': start_day_of_year},
+        'all': {},
     }
 
     time_filter = Q()

vrobbler/apps/music/allmusic.py

@@ -1,85 +0,0 @@
-import urllib
-from typing import Optional
-from bs4 import BeautifulSoup
-import requests
-import logging
-
-logger = logging.getLogger(__name__)
-
-ALLMUSIC_SEARCH_URL = "https://www.allmusic.com/search/{subpath}/{query}"
-
-
-def strip_and_clean(text):
-    return text.strip("\n").rstrip().lstrip()
-
-
-def get_rating_from_soup(soup) -> Optional[int]:
-    rating = None
-    try:
-        potential_rating = soup.find("div", class_="allmusic-rating")
-        if potential_rating:
-            rating = int(strip_and_clean(potential_rating.get_text()))
-    except ValueError:
-        pass
-    return rating
-
-
-def get_review_from_soup(soup) -> str:
-    review = ""
-    try:
-        potential_text = soup.find("div", class_="text")
-        if potential_text:
-            review = strip_and_clean(potential_text.get_text())
-    except ValueError:
-        pass
-    return review
-
-
-def scrape_data_from_allmusic(url) -> dict:
-    data_dict = {}
-    headers = {"User-Agent": "Vrobbler 0.11.12"}
-    r = requests.get(url, headers=headers)
-    if r.status_code == 200:
-        soup = BeautifulSoup(r.text, "html.parser")
-        data_dict["rating"] = get_rating_from_soup(soup)
-        data_dict["review"] = get_review_from_soup(soup)
-    return data_dict
-
-
-def get_allmusic_slug(artist_name=None, album_name=None) -> str:
-    slug = ""
-    if not artist_name:
-        return slug
-
-    subpath = "artists"
-    class_ = "name"
-    query = urllib.parse.quote(artist_name)
-    if album_name:
-        subpath = "albums"
-        class_ = "title"
-        query = "+".join([query, urllib.parse.quote(album_name)])
-
-    url = ALLMUSIC_SEARCH_URL.format(subpath=subpath, query=query)
-    headers = {"User-Agent": "Vrobbler 0.11.12"}
-    r = requests.get(url, headers=headers)
-
-    if r.status_code != 200:
-        logger.info(f"Bad http response from Allmusic {r}")
-        return slug
-
-    soup = BeautifulSoup(r.text, "html.parser")
-    results = soup.find("ul", class_="search-results")
-
-    if not results:
-        logger.info(f"No search results for {query}")
-        return slug
-
-    prime_result = results.findAll("div", class_=class_)
-
-    if not prime_result:
-        logger.info(f"Could not find specific result for search {query}")
-
-    result_url = prime_result[0].find_all("a")[0]["href"]
-    slug = result_url.split("/")[-1:][0]
-
-    return slug

vrobbler/apps/music/api/views.py

@@ -9,18 +9,18 @@ from music.models import Artist, Album, Track
 
 
 class ArtistViewSet(viewsets.ModelViewSet):
-    queryset = Artist.objects.all().order_by("-created")
+    queryset = Artist.objects.all().order_by('-created')
     serializer_class = ArtistSerializer
     permission_classes = [permissions.IsAuthenticated]
 
 
 class AlbumViewSet(viewsets.ModelViewSet):
-    queryset = Album.objects.all().order_by("-created")
+    queryset = Album.objects.all().order_by('-created')
     serializer_class = AlbumSerializer
     permission_classes = [permissions.IsAuthenticated]
 
 
 class TrackViewSet(viewsets.ModelViewSet):
-    queryset = Track.objects.all().order_by("-created")
+    queryset = Track.objects.all().order_by('-created')
     serializer_class = TrackSerializer
     permission_classes = [permissions.IsAuthenticated]

vrobbler/apps/music/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class MusicConfig(AppConfig):
-    name = "music"
+    name = 'music'

vrobbler/apps/music/bandcamp.py

@@ -1,49 +0,0 @@
-import logging
-import urllib
-
-import requests
-from bs4 import BeautifulSoup
-
-logger = logging.getLogger(__name__)
-BANDCAMP_SEARCH_URL = "https://bandcamp.com/search?q={query}&item_type={itype}"
-
-
-def get_bandcamp_slug(artist_name=None, album_name=None) -> str:
-    slug = ""
-    if not artist_name:
-        return slug
-
-    query = urllib.parse.quote(artist_name)
-    item_type = "b"
-    class_ = "heading"
-    if album_name:
-        item_type = "a"
-        query = "+".join([query, urllib.parse.quote(album_name)])
-
-    url = BANDCAMP_SEARCH_URL.format(query=query, itype=item_type)
-    headers = {"User-Agent": "Vrobbler 0.11.12"}
-    r = requests.get(url, headers=headers)
-
-    if r.status_code != 200:
-        logger.info(f"Bad http response from Bandcamp {r}")
-        return slug
-
-    soup = BeautifulSoup(r.text, "html.parser")
-
-    results = soup.find("ul", class_="result-items")
-
-    if not results:
-        logger.info(f"No search results for {query}")
-        return slug
-
-    prime_result = results.findAll("div", class_=class_)
-
-    if not prime_result:
-        logger.info(f"Could not find specific result for search {query}")
-
-    result_url = prime_result[0].find_all("a")[0]["href"]
-    if item_type == "b":
-        slug = result_url.split("/")[2].split(".")[0]
-    else:
-        slug = result_url.split("?")[0]
-    return slug

vrobbler/apps/music/constants.py

@@ -1,21 +1,16 @@
-VARIOUS_ARTIST_DICT = {
-    "name": "Various Artists",
-    "theaudiodb_id": "113641",
-    "musicbrainz_id": "89ad4ac3-39f7-470e-963a-56509c546377",
-}
-
 JELLYFIN_POST_KEYS = {
-    "ITEM_TYPE": "ItemType",
-    "RUN_TIME": "RunTime",
-    "TITLE": "Name",
-    "TIMESTAMP": "UtcTimestamp",
-    "YEAR": "Year",
-    "PLAYBACK_POSITION_TICKS": "PlaybackPositionTicks",
-    "PLAYBACK_POSITION": "PlaybackPosition",
-    "ARTIST_MB_ID": "Provider_musicbrainzartist",
-    "ALBUM_MB_ID": "Provider_musicbrainzalbum",
-    "RELEASEGROUP_MB_ID": "Provider_musicbrainzreleasegroup",
-    "TRACK_MB_ID": "Provider_musicbrainztrack",
-    "ALBUM_NAME": "Album",
-    "ARTIST_NAME": "Artist",
+    'ITEM_TYPE': 'ItemType',
+    'RUN_TIME_TICKS': 'RunTimeTicks',
+    'RUN_TIME': 'RunTime',
+    'TITLE': 'Name',
+    'TIMESTAMP': 'UtcTimestamp',
+    'YEAR': 'Year',
+    'PLAYBACK_POSITION_TICKS': 'PlaybackPositionTicks',
+    'PLAYBACK_POSITION': 'PlaybackPosition',
+    'ARTIST_MB_ID': 'Provider_musicbrainzartist',
+    'ALBUM_MB_ID': 'Provider_musicbrainzalbum',
+    'RELEASEGROUP_MB_ID': 'Provider_musicbrainzreleasegroup',
+    'TRACK_MB_ID': 'Provider_musicbrainztrack',
+    'ALBUM_NAME': 'Album',
+    'ARTIST_NAME': 'Artist',
 }

vrobbler/apps/music/migrations/0015_alter_track_run_time.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("music", "0014_album_theaudiodb_year_released"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="track",
-            name="run_time",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/music/migrations/0016_rename_run_time_track_run_time_seconds.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:21
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("music", "0015_alter_track_run_time"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="track",
-            old_name="run_time",
-            new_name="run_time_seconds",
-        ),
-    ]

vrobbler/apps/music/migrations/0017_track_genre.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-14 22:27
-
-from django.db import migrations
-import taggit.managers
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0033_genre_objectwithgenres"),
-        ("music", "0016_rename_run_time_track_run_time_seconds"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="track",
-            name="genre",
-            field=taggit.managers.TaggableManager(
-                help_text="A comma-separated list of tags.",
-                through="scrobbles.ObjectWithGenres",
-                to="scrobbles.Genre",
-                verbose_name="Tags",
-            ),
-        ),
-    ]

vrobbler/apps/music/migrations/0018_album_allmusic_rating_album_allmusic_review.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-15 01:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("music", "0017_track_genre"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="album",
-            name="allmusic_rating",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="album",
-            name="allmusic_review",
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/music/migrations/0019_artist_allmusic_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-15 03:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("music", "0018_album_allmusic_rating_album_allmusic_review"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="artist",
-            name="allmusic_id",
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-    ]

vrobbler/apps/music/migrations/0020_album_bandcamp_id_artist_bandcamp_id.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-15 03:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("music", "0019_artist_allmusic_id"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="album",
-            name="bandcamp_id",
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-        migrations.AddField(
-            model_name="artist",
-            name="bandcamp_id",
-            field=models.CharField(blank=True, max_length=100, null=True),
-        ),
-    ]

vrobbler/apps/music/migrations/0021_album_album_artist.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-15 16:22
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("music", "0020_album_bandcamp_id_artist_bandcamp_id"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="album",
-            name="album_artist",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="albums",
-                to="music.artist",
-            ),
-        ),
-    ]

vrobbler/apps/music/migrations/0022_artist_theaudiodb_id.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-15 16:29
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("music", "0021_album_album_artist"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="artist",
-            name="theaudiodb_id",
-            field=models.CharField(
-                blank=True, max_length=255, null=True, unique=True
-            ),
-        ),
-    ]

vrobbler/apps/music/models.py

@@ -5,17 +5,15 @@ from urllib.request import urlopen
 from uuid import uuid4
 
 import musicbrainzngs
-import requests
 from django.conf import settings
 from django.core.files.base import ContentFile, File
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django_extensions.db.models import TimeStampedModel
-from music.allmusic import get_allmusic_slug, scrape_data_from_allmusic
-from music.bandcamp import get_bandcamp_slug
-from music.theaudiodb import lookup_album_from_tadb, lookup_artist_from_tadb
 from scrobbles.mixins import ScrobblableMixin
+from scrobbles.theaudiodb import lookup_artist_from_tadb
+from vrobbler.apps.scrobbles.theaudiodb import lookup_album_from_tadb
 
 logger = logging.getLogger(__name__)
 BNULL = {"blank": True, "null": True}
@@ -25,16 +23,13 @@ class Artist(TimeStampedModel):
     uuid = models.UUIDField(default=uuid4, editable=False, **BNULL)
     name = models.CharField(max_length=255)
     biography = models.TextField(**BNULL)
-    theaudiodb_id = models.CharField(max_length=255, unique=True, **BNULL)
     theaudiodb_genre = models.CharField(max_length=255, **BNULL)
     theaudiodb_mood = models.CharField(max_length=255, **BNULL)
     musicbrainz_id = models.CharField(max_length=255, **BNULL)
-    allmusic_id = models.CharField(max_length=100, **BNULL)
-    bandcamp_id = models.CharField(max_length=100, **BNULL)
     thumbnail = models.ImageField(upload_to="artist/", **BNULL)
 
     class Meta:
-        unique_together = [["name", "musicbrainz_id"]]
+        unique_together = [['name', 'musicbrainz_id']]
 
     def __str__(self):
         return self.name
@@ -43,58 +38,28 @@ class Artist(TimeStampedModel):
     def mb_link(self):
         return f"https://musicbrainz.org/artist/{self.musicbrainz_id}"
 
-    @property
-    def allmusic_link(self):
-        if self.allmusic_id:
-            return f"https://www.allmusic.com/artist/{self.allmusic_id}"
-        return ""
-
-    @property
-    def bandcamp_link(self):
-        if self.bandcamp_id:
-            return f"https://{self.bandcamp_id}.bandcamp.com/"
-        return ""
-
     def get_absolute_url(self):
-        return reverse("music:artist_detail", kwargs={"slug": self.uuid})
+        return reverse('music:artist_detail', kwargs={'slug': self.uuid})
 
     def scrobbles(self):
         from scrobbles.models import Scrobble
 
         return Scrobble.objects.filter(
             track__in=self.track_set.all()
-        ).order_by("-timestamp")
+        ).order_by('-timestamp')
 
     @property
     def tracks(self):
         return (
             self.track_set.all()
-            .annotate(scrobble_count=models.Count("scrobble"))
-            .order_by("-scrobble_count")
+            .annotate(scrobble_count=models.Count('scrobble'))
+            .order_by('-scrobble_count')
         )
 
     def charts(self):
         from scrobbles.models import ChartRecord
 
-        return ChartRecord.objects.filter(track__artist=self).order_by("-year")
-
-    def scrape_allmusic(self, force=False) -> None:
-        if not self.allmusic_id or force:
-            slug = get_allmusic_slug(self.name)
-            if not slug:
-                logger.info(f"No allmsuic link for {self}")
-                return
-            self.allmusic_id = slug
-            self.save(update_fields=["allmusic_id"])
-
-    def scrape_bandcamp(self, force=False) -> None:
-        if not self.bandcamp_id or force:
-            slug = get_bandcamp_slug(self.name)
-            if not slug:
-                logger.info(f"No bandcamp link for {self}")
-                return
-            self.bandcamp_id = slug
-            self.save(update_fields=["bandcamp_id"])
+        return ChartRecord.objects.filter(track__artist=self).order_by('-year')
 
     def fix_metadata(self):
         tadb_info = lookup_artist_from_tadb(self.name)
@@ -102,34 +67,20 @@ class Artist(TimeStampedModel):
             logger.warn(f"No response from TADB for artist {self.name}")
             return
 
-        self.biography = tadb_info["biography"]
-        self.theaudiodb_genre = tadb_info["genre"]
-        self.theaudiodb_mood = tadb_info["mood"]
+        self.biography = tadb_info['biography']
+        self.theaudiodb_genre = tadb_info['genre']
+        self.theaudiodb_mood = tadb_info['mood']
 
-        thumb_url = tadb_info.get("thumb_url", "")
-        if thumb_url:
-            r = requests.get(thumb_url)
-            if r.status_code == 200:
-                fname = f"{self.name}_{self.uuid}.jpg"
-                self.thumbnail.save(fname, ContentFile(r.content), save=True)
-
-    @property
-    def rym_link(self):
-        artist_slug = self.name.lower().replace(" ", "-")
-        return f"https://rateyourmusic.com/artist/{artist_slug}/"
-
-    @property
-    def bandcamp_search_link(self):
-        artist = self.name.lower()
-        return f"https://bandcamp.com/search?q={artist}&item_type=b"
+        img_temp = NamedTemporaryFile(delete=True)
+        img_temp.write(urlopen(tadb_info['thumb_url']).read())
+        img_temp.flush()
+        img_filename = f"{self.name}_{self.uuid}.jpg"
+        self.thumbnail.save(img_filename, File(img_temp))
 
 
 class Album(TimeStampedModel):
     uuid = models.UUIDField(default=uuid4, editable=False, **BNULL)
     name = models.CharField(max_length=255)
-    album_artist = models.ForeignKey(
-        Artist, related_name="albums", on_delete=models.DO_NOTHING, **BNULL
-    )
     artists = models.ManyToManyField(Artist)
     year = models.IntegerField(**BNULL)
     musicbrainz_id = models.CharField(max_length=255, unique=True, **BNULL)
@@ -147,9 +98,6 @@ class Album(TimeStampedModel):
     theaudiodb_speed = models.CharField(max_length=255, **BNULL)
     theaudiodb_theme = models.CharField(max_length=255, **BNULL)
     allmusic_id = models.CharField(max_length=255, **BNULL)
-    allmusic_rating = models.IntegerField(**BNULL)
-    allmusic_review = models.TextField(**BNULL)
-    bandcamp_id = models.CharField(max_length=100, **BNULL)
     rateyourmusic_id = models.CharField(max_length=255, **BNULL)
     wikipedia_slug = models.CharField(max_length=255, **BNULL)
     discogs_id = models.CharField(max_length=255, **BNULL)
@@ -159,95 +107,57 @@ class Album(TimeStampedModel):
         return self.name
 
     def get_absolute_url(self):
-        return reverse("music:album_detail", kwargs={"slug": self.uuid})
+        return reverse("music:album_detail", kwargs={'slug': self.uuid})
 
     def scrobbles(self):
         from scrobbles.models import Scrobble
 
         return Scrobble.objects.filter(
             track__in=self.track_set.all()
-        ).order_by("-timestamp")
+        ).order_by('-timestamp')
 
     @property
     def tracks(self):
         return (
             self.track_set.all()
-            .annotate(scrobble_count=models.Count("scrobble"))
-            .order_by("-scrobble_count")
+            .annotate(scrobble_count=models.Count('scrobble'))
+            .order_by('-scrobble_count')
         )
 
-    def fix_album_artist(self):
-        from music.utils import get_or_create_various_artists
-
-        multiple_artists = self.artists.count() > 1
-        if multiple_artists:
-            self.album_artist = get_or_create_various_artists()
-        else:
-            self.album_artist = self.artists.first()
-        self.save(update_fields=["album_artist"])
-
-    def scrape_allmusic(self, force=False) -> None:
-        if not self.allmusic_id or force:
-            slug = get_allmusic_slug(self.name, self.album_artist.name)
-            if not slug:
-                logger.info(
-                    f"No allmsuic link for {self} by {self.album_artist}"
-                )
-                return
-            self.allmusic_id = slug
-            self.save(update_fields=["allmusic_id"])
-
-        allmusic_data = scrape_data_from_allmusic(self.allmusic_link)
-
-        if not allmusic_data:
-            logger.info(f"No allmsuic data for {self} by {self.album_artist}")
-            return
-
-        self.allmusic_review = allmusic_data["review"]
-        self.allmusic_rating = allmusic_data["rating"]
-        self.save(update_fields=["allmusic_review", "allmusic_rating"])
+    @property
+    def primary_artist(self):
+        return self.artists.first()
 
     def scrape_theaudiodb(self) -> None:
-        artist = "Various Artists"
-        if self.album_artist:
-            artist = self.album_artist.name
+        artist = self.primary_artist.name
         album_data = lookup_album_from_tadb(self.name, artist)
-        if not album_data.get("theaudiodb_id"):
+        if not album_data.get('theaudiodb_id'):
             logger.info(f"No data for {self} found in TheAudioDB")
             return
 
         Album.objects.filter(pk=self.pk).update(**album_data)
 
-    def scrape_bandcamp(self, force=False) -> None:
-        if not self.bandcamp_id or force:
-            slug = get_bandcamp_slug(self.album_artist.name, self.name)
-            if not slug:
-                logger.info(f"No bandcamp link for {self}")
-                return
-            self.bandcamp_id = slug
-            self.save(update_fields=["bandcamp_id"])
-
     def fix_metadata(self):
         if (
             not self.musicbrainz_albumartist_id
             or not self.year
             or not self.musicbrainz_releasegroup_id
         ):
-            musicbrainzngs.set_useragent("vrobbler", "0.3.0")
+            musicbrainzngs.set_useragent('vrobbler', '0.3.0')
             mb_data = musicbrainzngs.get_release_by_id(
-                self.musicbrainz_id, includes=["artists", "release-groups"]
+                self.musicbrainz_id, includes=['artists', 'release-groups']
             )
             if not self.musicbrainz_releasegroup_id:
-                self.musicbrainz_releasegroup_id = mb_data["release"][
-                    "release-group"
-                ]["id"]
+                self.musicbrainz_releasegroup_id = mb_data['release'][
+                    'release-group'
+                ]['id']
             if not self.musicbrainz_albumartist_id:
-                self.musicbrainz_albumartist_id = mb_data["release"][
-                    "artist-credit"
-                ][0]["artist"]["id"]
+                self.musicbrainz_albumartist_id = mb_data['release'][
+                    'artist-credit'
+                ][0]['artist']['id']
             if not self.year:
                 try:
-                    self.year = mb_data["release"]["date"][0:4]
+                    self.year = mb_data['release']['date'][0:4]
                 except KeyError:
                     pass
                 except IndexError:
@@ -255,9 +165,9 @@ class Album(TimeStampedModel):
 
             self.save(
                 update_fields=[
-                    "musicbrainz_albumartist_id",
-                    "musicbrainz_releasegroup_id",
-                    "year",
+                    'musicbrainz_albumartist_id',
+                    'musicbrainz_releasegroup_id',
+                    'year',
                 ]
             )
 
@@ -271,12 +181,10 @@ class Album(TimeStampedModel):
                     self.artists.add(t.artist)
             if (
                 not self.cover_image
-                or self.cover_image == "default-image-replace-me"
+                or self.cover_image == 'default-image-replace-me'
             ):
                 self.fetch_artwork()
-        self.fix_album_artist()
         self.scrape_theaudiodb()
-        self.scrape_allmusic()
 
     def fetch_artwork(self, force=False):
         if not self.cover_image and not force:
@@ -287,10 +195,10 @@ class Album(TimeStampedModel):
                     )
                     name = f"{self.name}_{self.uuid}.jpg"
                     self.cover_image = ContentFile(img_data, name=name)
-                    logger.info(f"Setting image to {name}")
+                    logger.info(f'Setting image to {name}')
                 except musicbrainzngs.ResponseError:
                     logger.warning(
-                        f"No cover art found for {self.name} by release"
+                        f'No cover art found for {self.name} by release'
                     )
 
             if (
@@ -303,10 +211,10 @@ class Album(TimeStampedModel):
                     )
                     name = f"{self.name}_{self.uuid}.jpg"
                     self.cover_image = ContentFile(img_data, name=name)
-                    logger.info(f"Setting image to {name}")
+                    logger.info(f'Setting image to {name}')
                 except musicbrainzngs.ResponseError:
                     logger.warning(
-                        f"No cover art found for {self.name} by release group"
+                        f'No cover art found for {self.name} by release group'
                     )
             if not self.cover_image:
                 logger.debug(
@@ -321,7 +229,7 @@ class Album(TimeStampedModel):
     @property
     def allmusic_link(self) -> str:
         if self.allmusic_id:
-            return f"https://www.allmusic.com/album/{self.allmusic_id}"
+            return f"https://www.allmusic.com/artist/{self.allmusic_id}"
         return ""
 
     @property
@@ -336,45 +244,27 @@ class Album(TimeStampedModel):
             return f"https://www.theaudiodb.com/album/{self.theaudiodb_id}"
         return ""
 
-    @property
-    def rym_link(self):
-        artist_slug = self.album_artist.name.lower().replace(" ", "-")
-        album_slug = self.name.lower().replace(" ", "-")
-        return f"https://rateyourmusic.com/release/album/{artist_slug}/{album_slug}/"
-
-    @property
-    def bandcamp_link(self):
-        if self.bandcamp_id and self.album_artist.bandcamp_id:
-            return f"https://{self.album_artist.bandcamp_id}.bandcamp.com/album/{self.bandcamp_id}"
-        return ""
-
-    @property
-    def bandcamp_search_link(self):
-        artist = self.album_artist.name.lower()
-        album = self.name.lower()
-        return f"https://bandcamp.com/search?q={album} {artist}&item_type=a"
-
 
 class Track(ScrobblableMixin):
-    COMPLETION_PERCENT = getattr(settings, "MUSIC_COMPLETION_PERCENT", 90)
+    COMPLETION_PERCENT = getattr(settings, 'MUSIC_COMPLETION_PERCENT', 90)
 
     class Opinion(models.IntegerChoices):
-        DOWN = -1, "Thumbs down"
-        NEUTRAL = 0, "No opinion"
-        UP = 1, "Thumbs up"
+        DOWN = -1, 'Thumbs down'
+        NEUTRAL = 0, 'No opinion'
+        UP = 1, 'Thumbs up'
 
     artist = models.ForeignKey(Artist, on_delete=models.DO_NOTHING)
     album = models.ForeignKey(Album, on_delete=models.DO_NOTHING, **BNULL)
     musicbrainz_id = models.CharField(max_length=255, **BNULL)
 
     class Meta:
-        unique_together = [["album", "musicbrainz_id"]]
+        unique_together = [['album', 'musicbrainz_id']]
 
     def __str__(self):
         return f"{self.title} by {self.artist}"
 
     def get_absolute_url(self):
-        return reverse("music:track_detail", kwargs={"slug": self.uuid})
+        return reverse('music:track_detail', kwargs={'slug': self.uuid})
 
     @property
     def subtitle(self):
@@ -388,15 +278,6 @@ class Track(ScrobblableMixin):
     def info_link(self):
         return self.mb_link
 
-    @property
-    def primary_image_url(self) -> str:
-        url = ""
-        if self.artist.thumbnail:
-            url = self.artist.thumbnail.url
-        if self.album and self.album.cover_image:
-            url = self.album.cover_image.url
-        return url
-
     @classmethod
     def find_or_create(
         cls, artist_dict: Dict, album_dict: Dict, track_dict: Dict
@@ -406,8 +287,8 @@ class Track(ScrobblableMixin):
         exist.
 
         """
-        if not artist_dict.get("name") or not artist_dict.get(
-            "musicbrainz_id"
+        if not artist_dict.get('name') or not artist_dict.get(
+            'musicbrainz_id'
         ):
             logger.warning(
                 f"No artist or artist musicbrainz ID found in message from source, not scrobbling"
@@ -421,8 +302,8 @@ class Track(ScrobblableMixin):
         if not album.cover_image:
             album.fetch_artwork()
 
-        track_dict["album_id"] = getattr(album, "id", None)
-        track_dict["artist_id"] = artist.id
+        track_dict['album_id'] = getattr(album, "id", None)
+        track_dict['artist_id'] = artist.id
 
         track, created = cls.objects.get_or_create(**track_dict)
 

vrobbler/apps/music/theaudiodb.py

@@ -1,82 +0,0 @@
-import urllib
-import json
-import logging
-
-import requests
-from django.conf import settings
-
-THEAUDIODB_API_KEY = getattr(settings, "THEAUDIODB_API_KEY")
-ARTIST_SEARCH_URL = f"https://www.theaudiodb.com/api/v1/json/{THEAUDIODB_API_KEY}/search.php?s="
-ALBUM_SEARCH_URL = f"https://www.theaudiodb.com/api/v1/json/{THEAUDIODB_API_KEY}/searchalbum.php?s="
-
-logger = logging.getLogger(__name__)
-
-
-def lookup_artist_from_tadb(name: str) -> dict:
-    artist_info = {}
-    name = urllib.parse.quote(name)
-    response = requests.get(ARTIST_SEARCH_URL + name)
-
-    if response.status_code != 200:
-        logger.warn(f"Bad response from TADB: {response.status_code}")
-        return {}
-
-    if not response.content:
-        logger.warn(f"Bad content from TADB: {response.content}")
-        return {}
-
-    results = json.loads(response.content)
-    if results["artists"]:
-        artist = results["artists"][0]
-
-        artist_info["biography"] = artist.get("strBiographyEN")
-        artist_info["genre"] = artist.get("strGenre")
-        artist_info["mood"] = artist.get("strMood")
-        artist_info["thumb_url"] = artist.get("strArtistThumb")
-
-    return artist_info
-
-
-def lookup_album_from_tadb(name: str, artist: str) -> dict:
-    album_info = {}
-    artist = urllib.parse.quote(artist)
-    name = urllib.parse.quote(name)
-    response = requests.get("".join([ALBUM_SEARCH_URL, artist, "&a=", name]))
-
-    if response.status_code != 200:
-        logger.warn(f"Bad response from TADB: {response.status_code}")
-        return {}
-
-    if not response.content:
-        logger.warn(f"Bad content from TADB: {response.content}")
-        return {}
-
-    results = json.loads(response.content)
-    if results["album"]:
-        album = results["album"][0]
-
-        album_info["theaudiodb_id"] = album.get("idAlbum")
-        album_info["theaudiodb_description"] = album.get("strDescriptionEN")
-        album_info["theaudiodb_genre"] = album.get("strGenre")
-        album_info["theaudiodb_style"] = album.get("strStyle")
-        album_info["theaudiodb_mood"] = album.get("strMood")
-        album_info["theaudiodb_speed"] = album.get("strSpeed")
-        album_info["theaudiodb_theme"] = album.get("strTheme")
-        album_info["allmusic_id"] = album.get("strAllMusicID")
-        album_info["wikipedia_slug"] = album.get("strWikipediaID")
-        album_info["discogs_id"] = album.get("strDiscogsID")
-        album_info["wikidata_id"] = album.get("strWikidataID")
-        album_info["rateyourmusic_id"] = album.get("strRateYourMusicID")
-
-        if album.get("intYearReleased"):
-            album_info["theaudiodb_year_released"] = float(
-                album.get("intYearReleased")
-            )
-        if album.get("intScore"):
-            album_info["theaudiodb_score"] = float(album.get("intScore"))
-        if album.get("intScoreVotes"):
-            album_info["theaudiodb_score_votes"] = int(
-                album.get("intScoreVotes")
-            )
-
-    return album_info

vrobbler/apps/music/urls.py

@@ -1,26 +1,26 @@
 from django.urls import path
 from music import views
 
-app_name = "music"
+app_name = 'music'
 
 
 urlpatterns = [
-    path("albums/", views.AlbumListView.as_view(), name="albums_list"),
+    path('albums/', views.AlbumListView.as_view(), name='albums_list'),
     path(
-        "album/<slug:slug>/",
+        'album/<slug:slug>/',
         views.AlbumDetailView.as_view(),
-        name="album_detail",
+        name='album_detail',
     ),
-    path("tracks/", views.TrackListView.as_view(), name="tracks_list"),
+    path("tracks/", views.TrackListView.as_view(), name='tracks_list'),
     path(
-        "tracks/<slug:slug>/",
+        'tracks/<slug:slug>/',
         views.TrackDetailView.as_view(),
-        name="track_detail",
+        name='track_detail',
     ),
-    path("artists/", views.ArtistListView.as_view(), name="artist_list"),
+    path('artists/', views.ArtistListView.as_view(), name='artist_list'),
     path(
-        "artists/<slug:slug>/",
+        'artists/<slug:slug>/',
         views.ArtistDetailView.as_view(),
-        name="artist_detail",
+        name='artist_detail',
     ),
 ]

vrobbler/apps/music/utils.py

@@ -1,13 +1,13 @@
 import logging
 import re
-from typing import Optional
 
-from music.musicbrainz import (
+from musicbrainzngs.caa import musicbrainz
+
+from scrobbles.musicbrainz import (
     lookup_album_dict_from_mb,
     lookup_artist_from_mb,
     lookup_track_from_mb,
 )
-from music.constants import VARIOUS_ARTIST_DICT
 
 logger = logging.getLogger(__name__)
 
@@ -17,19 +17,19 @@ from music.models import Album, Artist, Track
 
 def get_or_create_artist(name: str, mbid: str = None) -> Artist:
     artist = None
-    logger.debug(f"Got artist {name} and mbid: {mbid}")
+    logger.debug(f'Got artist {name} and mbid: {mbid}')
 
-    if "feat." in name.lower():
+    if 'feat.' in name.lower():
         name = re.split("feat.", name, flags=re.IGNORECASE)[0].strip()
-    if "featuring" in name.lower():
+    if 'featuring' in name.lower():
         name = re.split("featuring", name, flags=re.IGNORECASE)[0].strip()
-    if "&" in name.lower():
+    if '&' in name.lower():
         name = re.split("&", name, flags=re.IGNORECASE)[0].strip()
 
     artist_dict = lookup_artist_from_mb(name)
-    mbid = mbid or artist_dict["id"]
+    mbid = mbid or artist_dict['id']
 
-    logger.debug(f"Looking up artist {name} and mbid: {mbid}")
+    logger.debug(f'Looking up artist {name} and mbid: {mbid}')
     artist = Artist.objects.filter(musicbrainz_id=mbid).first()
     if not artist:
         artist = Artist.objects.create(name=name, musicbrainz_id=mbid)
@@ -41,44 +41,40 @@ def get_or_create_artist(name: str, mbid: str = None) -> Artist:
     return artist
 
 
-def get_or_create_album(
-    name: str, artist: Artist, mbid: str = None
-) -> Optional[Album]:
+def get_or_create_album(name: str, artist: Artist, mbid: str = None) -> Album:
     album = None
-    album_dict = lookup_album_dict_from_mb(name, artist_name=artist.name)
-
-    name = name or album_dict["title"]
-
-    logger.debug(f"Looking up album {name} and mbid: {mbid}")
-
-    album = Album.objects.filter(artists__in=[artist], name=name).first()
-
-    if not album and name:
-        mbid = mbid or album_dict["mb_id"]
-        album, album_created = Album.objects.get_or_create(
-            name=name, musicbrainz_id=mbid
-        )
-        if album_created:
-            album.year = album_dict["year"]
-            album.musicbrainz_releasegroup_id = album_dict["mb_group_id"]
-            album.musicbrainz_albumartist_id = artist.musicbrainz_id
-            album.save(
-                update_fields=[
-                    "musicbrainz_id",
-                    "year",
-                    "musicbrainz_releasegroup_id",
-                    "musicbrainz_albumartist_id",
-                ]
-            )
-            album.artists.add(artist)
-            album.fix_album_artist()
-            album.fetch_artwork()
-            album.scrape_allmusic()
-
+    album_created = False
+    albums = Album.objects.filter(name__iexact=name)
+    if albums.count() == 1:
+        album = albums.first()
+    else:
+        for potential_album in albums:
+            if artist in album.artist_set.all():
+                album = potential_album
     if not album:
-        logger.warn(f"No album found for {name} and {mbid}")
+        album_created = True
+        album = Album.objects.create(name=name, musicbrainz_id=mbid)
+        album.save()
+        album.artists.add(artist)
 
-    album.fix_album_artist()
+    if album_created or not mbid:
+        album_dict = lookup_album_dict_from_mb(
+            album.name, artist_name=artist.name
+        )
+        album.year = album_dict["year"]
+        album.musicbrainz_id = album_dict["mb_id"]
+        album.musicbrainz_releasegroup_id = album_dict["mb_group_id"]
+        album.musicbrainz_albumartist_id = artist.musicbrainz_id
+        album.save(
+            update_fields=[
+                "year",
+                "musicbrainz_id",
+                "musicbrainz_releasegroup_id",
+                "musicbrainz_albumartist_id",
+            ]
+        )
+        album.artists.add(artist)
+        album.fetch_artwork()
     return album
 
 
@@ -87,7 +83,8 @@ def get_or_create_track(
     artist: Artist,
     album: Album,
     mbid: str = None,
-    run_time_seconds=None,
+    run_time=None,
+    run_time_ticks=None,
 ) -> Track:
     track = None
     if not mbid:
@@ -95,7 +92,7 @@ def get_or_create_track(
             title,
             artist.musicbrainz_id,
             album.musicbrainz_id,
-        )["id"]
+        )['id']
 
     track = Track.objects.filter(musicbrainz_id=mbid).first()
 
@@ -105,15 +102,8 @@ def get_or_create_track(
             artist=artist,
             album=album,
             musicbrainz_id=mbid,
-            run_time_seconds=run_time_seconds,
+            run_time=run_time,
+            run_time_ticks=run_time_ticks,
         )
 
     return track
-
-
-def get_or_create_various_artists():
-    artist = Artist.objects.filter(name="Various Artists").first()
-    if not artist:
-        artist = Artist.objects.create(**VARIOUS_ARTIST_DICT)
-        logger.info("Created Various Artists placeholder")
-    return artist

vrobbler/apps/music/views.py

@@ -1,4 +1,5 @@
-from django.db.models import Count
+from datetime import timedelta
+from django.utils import timezone
 from django.views import generic
 from music.models import Album, Artist, Track
 from scrobbles.models import ChartRecord
@@ -17,11 +18,12 @@ class TrackListView(generic.ListView):
 
 class TrackDetailView(generic.DetailView):
     model = Track
-    slug_field = "uuid"
+    slug_field = 'uuid'
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        context_data["charts"] = ChartRecord.objects.filter(
+
+        context_data['charts'] = ChartRecord.objects.filter(
             track=self.object, rank__in=[1, 2, 3]
         )
         return context_data
@@ -32,39 +34,23 @@ class ArtistListView(generic.ListView):
     paginate_by = 100
 
     def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .annotate(scrobble_count=Count("track__scrobble"))
-            .order_by("-scrobble_count")
-        )
+        return super().get_queryset().order_by("name")
 
     def get_context_data(self, *, object_list=None, **kwargs):
         context_data = super().get_context_data(
             object_list=object_list, **kwargs
         )
-        context_data["view"] = self.request.GET.get("view")
+        context_data['view'] = self.request.GET.get('view')
         return context_data
 
 
 class ArtistDetailView(generic.DetailView):
     model = Artist
-    slug_field = "uuid"
+    slug_field = 'uuid'
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        artist = context_data["object"]
-        rank = 1
-        tracks_ranked = []
-        scrobbles = artist.tracks.first().scrobble_count
-        for track in artist.tracks:
-            if scrobbles > track.scrobble_count:
-                rank += 1
-            tracks_ranked.append((rank, track))
-            scrobbles = track.scrobble_count
-
-        context_data["tracks_ranked"] = tracks_ranked
-        context_data["charts"] = ChartRecord.objects.filter(
+        context_data['charts'] = ChartRecord.objects.filter(
             artist=self.object, rank__in=[1, 2, 3]
         )
         return context_data
@@ -72,19 +58,22 @@ class ArtistDetailView(generic.DetailView):
 
 class AlbumListView(generic.ListView):
     model = Album
+    paginate_by = 50
 
     def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .annotate(scrobble_count=Count("track__scrobble"))
-            .order_by("-scrobble_count")
+        return super().get_queryset().order_by("name")
+
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context_data = super().get_context_data(
+            object_list=object_list, **kwargs
         )
+        context_data['view'] = self.request.GET.get('view')
+        return context_data
 
 
 class AlbumDetailView(generic.DetailView):
     model = Album
-    slug_field = "uuid"
+    slug_field = 'uuid'
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)

vrobbler/apps/podcasts/admin.py

@@ -27,6 +27,7 @@ class EpisodeAdmin(admin.ModelAdmin):
     list_display = (
         "title",
         "podcast",
+        "run_time",
     )
     list_filter = ("podcast",)
     ordering = ("-created",)

vrobbler/apps/podcasts/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class PodcastsConfig(AppConfig):
-    name = "podcasts"
+    name = 'podcasts'

vrobbler/apps/podcasts/migrations/0006_alter_episode_run_time.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("podcasts", "0005_alter_episode_options_alter_episode_title"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="episode",
-            name="run_time",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/podcasts/migrations/0007_rename_run_time_episode_run_time_seconds.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:21
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("podcasts", "0006_alter_episode_run_time"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="episode",
-            old_name="run_time",
-            new_name="run_time_seconds",
-        ),
-    ]

vrobbler/apps/podcasts/migrations/0008_episode_genre.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-14 22:27
-
-from django.db import migrations
-import taggit.managers
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0033_genre_objectwithgenres"),
-        ("podcasts", "0007_rename_run_time_episode_run_time_seconds"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="episode",
-            name="genre",
-            field=taggit.managers.TaggableManager(
-                help_text="A comma-separated list of tags.",
-                through="scrobbles.ObjectWithGenres",
-                to="scrobbles.Genre",
-                verbose_name="Tags",
-            ),
-        ),
-    ]

vrobbler/apps/podcasts/migrations/0009_podcast_cover.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-22 22:26
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("podcasts", "0008_episode_genre"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="podcast",
-            name="cover",
-            field=models.ImageField(
-                blank=True, null=True, upload_to="pdocasts/covers/"
-            ),
-        ),
-    ]

vrobbler/apps/podcasts/migrations/0010_remove_podcast_cover_podcast_cover_image_and_more.py

@@ -1,29 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-23 02:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("podcasts", "0009_podcast_cover"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="podcast",
-            name="cover",
-        ),
-        migrations.AddField(
-            model_name="podcast",
-            name="cover_image",
-            field=models.ImageField(
-                blank=True, null=True, upload_to="podcasts/covers/"
-            ),
-        ),
-        migrations.AddField(
-            model_name="podcast",
-            name="description",
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/podcasts/migrations/0011_rename_url_podcast_feed_url_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-23 04:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("podcasts", "0010_remove_podcast_cover_podcast_cover_image_and_more"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="podcast",
-            old_name="url",
-            new_name="feed_url",
-        ),
-        migrations.AddField(
-            model_name="podcast",
-            name="google_podcasts_url",
-            field=models.URLField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/podcasts/models.py

@@ -2,15 +2,11 @@ import logging
 from typing import Dict, Optional
 from uuid import uuid4
 
-import requests
-from django.apps import apps
 from django.conf import settings
-from django.core.files.base import ContentFile
 from django.db import models
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django_extensions.db.models import TimeStampedModel
-from podcasts.scrapers import scrape_data_from_google_podcasts
+
 from scrobbles.mixins import ScrobblableMixin
 
 logger = logging.getLogger(__name__)
@@ -31,53 +27,15 @@ class Podcast(TimeStampedModel):
     producer = models.ForeignKey(
         Producer, on_delete=models.DO_NOTHING, **BNULL
     )
-    description = models.TextField(**BNULL)
     active = models.BooleanField(default=True)
-    feed_url = models.URLField(**BNULL)
-    google_podcasts_url = models.URLField(**BNULL)
-    cover_image = models.ImageField(upload_to="podcasts/covers/", **BNULL)
+    url = models.URLField(**BNULL)
 
     def __str__(self):
         return f"{self.name}"
 
-    def get_absolute_url(self):
-        return reverse("podcasts:podcast_detail", kwargs={"slug": self.uuid})
-
-    def scrobbles(self, user):
-        Scrobble = apps.get_model("scrobbles", "Scrobble")
-        return Scrobble.objects.filter(
-            user=user, podcast_episode__podcast=self
-        ).order_by("-timestamp")
-
-    def scrape_google_podcasts(self, force=False):
-        podcast_dict = {}
-        if not self.cover_image or force:
-            podcast_dict = scrape_data_from_google_podcasts(self.name)
-            if podcast_dict:
-                if not self.producer:
-                    self.producer, created = Producer.objects.get_or_create(
-                        name=podcast_dict["producer"]
-                    )
-                self.description = podcast_dict.get("description")
-                self.google_podcasts_url = podcast_dict.get("google_url")
-                self.save(
-                    update_fields=[
-                        "description",
-                        "producer",
-                        "google_podcasts_url",
-                    ]
-                )
-
-        cover_url = podcast_dict.get("image_url")
-        if (not self.cover_image or force) and cover_url:
-            r = requests.get(cover_url)
-            if r.status_code == 200:
-                fname = f"{self.name}_{self.uuid}.jpg"
-                self.cover_image.save(fname, ContentFile(r.content), save=True)
-
 
 class Episode(ScrobblableMixin):
-    COMPLETION_PERCENT = getattr(settings, "PODCAST_COMPLETION_PERCENT", 90)
+    COMPLETION_PERCENT = getattr(settings, 'PODCAST_COMPLETION_PERCENT', 90)
 
     podcast = models.ForeignKey(Podcast, on_delete=models.DO_NOTHING)
     number = models.IntegerField(**BNULL)
@@ -95,13 +53,6 @@ class Episode(ScrobblableMixin):
     def info_link(self):
         return ""
 
-    @property
-    def primary_image_url(self) -> str:
-        url = ""
-        if self.podcast.cover_image:
-            url = self.podcast.cover_image.url
-        return url
-
     @classmethod
     def find_or_create(
         cls, podcast_dict: Dict, producer_dict: Dict, episode_dict: Dict
@@ -110,12 +61,12 @@ class Episode(ScrobblableMixin):
         producer before saving the epsiode so it can be scrobbled.
 
         """
-        if not podcast_dict.get("name"):
+        if not podcast_dict.get('name'):
             logger.warning(f"No name from source for podcast, not scrobbling")
             return
 
         producer = None
-        if producer_dict.get("name"):
+        if producer_dict.get('name'):
             producer, producer_created = Producer.objects.get_or_create(
                 **producer_dict
             )
@@ -134,7 +85,7 @@ class Episode(ScrobblableMixin):
         else:
             logger.debug(f"Found podcast {podcast}")
 
-        episode_dict["podcast_id"] = podcast.id
+        episode_dict['podcast_id'] = podcast.id
 
         episode, created = cls.objects.get_or_create(**episode_dict)
         if created:

vrobbler/apps/podcasts/scrapers.py

@@ -1,91 +0,0 @@
-import urllib
-from typing import Optional
-from bs4 import BeautifulSoup
-import requests
-import logging
-
-logger = logging.getLogger(__name__)
-
-PODCAST_SEARCH_URL = "https://podcasts.google.com/search/{query}"
-
-
-def _strip_and_clean(text):
-    return text.replace("\n", " ").rstrip().lstrip()
-
-
-def _build_google_url(url):
-    return url.replace("./", "https://podcasts.google.com/")
-
-    return
-
-
-def _get_title_from_soup(soup) -> Optional[int]:
-    title = None
-    try:
-        potential_title = soup.find("div", class_="FyxyKd")
-        if potential_title:
-            title = _strip_and_clean(potential_title.get_text())
-    except ValueError:
-        pass
-    return title
-
-
-def _get_url_from_soup(soup) -> Optional[int]:
-    url = None
-    try:
-        url_tag = soup.find("a", class_="yXo2Qc")
-        if url_tag:
-            url = _build_google_url(url_tag.get("href"))
-    except ValueError:
-        pass
-    return url
-
-
-def _get_producer_from_soup(soup) -> str:
-    pub = ""
-    try:
-        potential_pub = soup.find("div", class_="J3Ov7d")
-        if potential_pub:
-            pub = _strip_and_clean(potential_pub.get_text())
-    except ValueError:
-        pass
-    return pub
-
-
-def _get_description_from_soup(soup) -> str:
-    desc = ""
-    try:
-        potential_desc = soup.find("div", class_="yuTZxb")
-        if potential_desc:
-            desc = _strip_and_clean(potential_desc.get_text())
-    except ValueError:
-        pass
-    return desc
-
-
-def _get_img_url_from_soup(soup) -> str:
-    url = ""
-    try:
-        img_tag = soup.find("img", class_="BhVIWc")
-        try:
-            url = img_tag["src"]
-        except IndexError:
-            pass
-    except ValueError:
-        pass
-    return url
-
-
-def scrape_data_from_google_podcasts(title) -> dict:
-    data_dict = {}
-    headers = {"User-Agent": "Vrobbler 0.11.12"}
-    url = PODCAST_SEARCH_URL.format(query=title)
-    r = requests.get(url, headers=headers)
-    if r.status_code == 200:
-        soup = BeautifulSoup(r.text, "html.parser")
-        data_dict["title"] = _get_title_from_soup(soup)
-        data_dict["description"] = _get_description_from_soup(soup)
-        data_dict["producer"] = _get_producer_from_soup(soup)
-        data_dict["google_url"] = _get_url_from_soup(soup)
-        data_dict["image_url"] = _get_img_url_from_soup(soup)
-    return data_dict

vrobbler/apps/podcasts/urls.py

@@ -1,14 +0,0 @@
-from django.urls import path
-from podcasts import views
-
-app_name = "podcasts"
-
-
-urlpatterns = [
-    path("podcasts/", views.PodcastListView.as_view(), name="podcast_list"),
-    path(
-        "podcasts/<slug:slug>/",
-        views.PodcastDetailView.as_view(),
-        name="podcast_detail",
-    ),
-]

vrobbler/apps/podcasts/views.py

@@ -1,18 +0,0 @@
-from django.views import generic
-from podcasts.models import Podcast
-
-
-class PodcastListView(generic.ListView):
-    model = Podcast
-    paginate_by = 20
-
-
-class PodcastDetailView(generic.DetailView):
-    model = Podcast
-    slug_field = "uuid"
-
-    def get_context_data(self, **kwargs):
-        user = self.request.user
-        context_data = super().get_context_data(**kwargs)
-        context_data["scrobbles"] = self.object.scrobbles(user)
-        return context_data

vrobbler/apps/profiles/admin.py

@@ -7,8 +7,3 @@ from profiles.models import UserProfile
 class UserProfileAdmin(admin.ModelAdmin):
     date_hierarchy = "created"
     ordering = ("-created",)
-    exclude = (
-        "twitch_token",
-        "twitch_client_secret",
-        "lastfm_password",
-    )

vrobbler/apps/profiles/api/serializers.py

@@ -9,10 +9,10 @@ from profiles.models import UserProfile
 class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = User
-        exclude = ("password",)
+        exclude = ('password',)
 
 
 class UserProfileSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = UserProfile
-        exclude = ("lastfm_password",)
+        exclude = ('lastfm_password',)

vrobbler/apps/profiles/api/views.py

@@ -13,7 +13,7 @@ class UserViewSet(viewsets.ModelViewSet):
     API endpoint that allows users to be viewed or edited.
     """
 
-    queryset = User.objects.all().order_by("-date_joined")
+    queryset = User.objects.all().order_by('-date_joined')
     serializer_class = UserSerializer
     permission_classes = [permissions.IsAuthenticated]
 
@@ -23,6 +23,6 @@ class UserProfileViewSet(viewsets.ModelViewSet):
     API endpoint that allows users to be viewed or edited.
     """
 
-    queryset = UserProfile.objects.all().order_by("-created")
+    queryset = UserProfile.objects.all().order_by('-created')
     serializer_class = UserProfileSerializer
     permission_classes = [permissions.IsAuthenticated]

vrobbler/apps/profiles/migrations/0003_userprofile_twitch_client_id_and_more.py

@@ -1,613 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-05 00:05
-
-from django.db import migrations, models
-import encrypted_field.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("profiles", "0002_userprofile_lastfm_password_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="userprofile",
-            name="twitch_client_id",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="userprofile",
-            name="twitch_client_secret",
-            field=encrypted_field.fields.EncryptedField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name="userprofile",
-            name="timezone",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("Pacific/Midway", "(GMT-1100) Pacific/Midway"),
-                    ("Pacific/Niue", "(GMT-1100) Pacific/Niue"),
-                    ("Pacific/Pago_Pago", "(GMT-1100) Pacific/Pago_Pago"),
-                    ("America/Adak", "(GMT-1000) America/Adak"),
-                    ("Pacific/Honolulu", "(GMT-1000) Pacific/Honolulu"),
-                    ("Pacific/Rarotonga", "(GMT-1000) Pacific/Rarotonga"),
-                    ("Pacific/Tahiti", "(GMT-1000) Pacific/Tahiti"),
-                    ("US/Hawaii", "(GMT-1000) US/Hawaii"),
-                    ("Pacific/Marquesas", "(GMT-0930) Pacific/Marquesas"),
-                    ("America/Anchorage", "(GMT-0900) America/Anchorage"),
-                    ("America/Juneau", "(GMT-0900) America/Juneau"),
-                    ("America/Metlakatla", "(GMT-0900) America/Metlakatla"),
-                    ("America/Nome", "(GMT-0900) America/Nome"),
-                    ("America/Sitka", "(GMT-0900) America/Sitka"),
-                    ("America/Yakutat", "(GMT-0900) America/Yakutat"),
-                    ("Pacific/Gambier", "(GMT-0900) Pacific/Gambier"),
-                    ("US/Alaska", "(GMT-0900) US/Alaska"),
-                    ("America/Los_Angeles", "(GMT-0800) America/Los_Angeles"),
-                    ("America/Tijuana", "(GMT-0800) America/Tijuana"),
-                    ("America/Vancouver", "(GMT-0800) America/Vancouver"),
-                    ("Canada/Pacific", "(GMT-0800) Canada/Pacific"),
-                    ("Pacific/Pitcairn", "(GMT-0800) Pacific/Pitcairn"),
-                    ("US/Pacific", "(GMT-0800) US/Pacific"),
-                    ("America/Boise", "(GMT-0700) America/Boise"),
-                    (
-                        "America/Cambridge_Bay",
-                        "(GMT-0700) America/Cambridge_Bay",
-                    ),
-                    (
-                        "America/Ciudad_Juarez",
-                        "(GMT-0700) America/Ciudad_Juarez",
-                    ),
-                    ("America/Creston", "(GMT-0700) America/Creston"),
-                    ("America/Dawson", "(GMT-0700) America/Dawson"),
-                    (
-                        "America/Dawson_Creek",
-                        "(GMT-0700) America/Dawson_Creek",
-                    ),
-                    ("America/Denver", "(GMT-0700) America/Denver"),
-                    ("America/Edmonton", "(GMT-0700) America/Edmonton"),
-                    ("America/Fort_Nelson", "(GMT-0700) America/Fort_Nelson"),
-                    ("America/Hermosillo", "(GMT-0700) America/Hermosillo"),
-                    ("America/Inuvik", "(GMT-0700) America/Inuvik"),
-                    ("America/Mazatlan", "(GMT-0700) America/Mazatlan"),
-                    ("America/Phoenix", "(GMT-0700) America/Phoenix"),
-                    ("America/Whitehorse", "(GMT-0700) America/Whitehorse"),
-                    ("America/Yellowknife", "(GMT-0700) America/Yellowknife"),
-                    ("Canada/Mountain", "(GMT-0700) Canada/Mountain"),
-                    ("US/Arizona", "(GMT-0700) US/Arizona"),
-                    ("US/Mountain", "(GMT-0700) US/Mountain"),
-                    (
-                        "America/Bahia_Banderas",
-                        "(GMT-0600) America/Bahia_Banderas",
-                    ),
-                    ("America/Belize", "(GMT-0600) America/Belize"),
-                    ("America/Chicago", "(GMT-0600) America/Chicago"),
-                    ("America/Chihuahua", "(GMT-0600) America/Chihuahua"),
-                    ("America/Costa_Rica", "(GMT-0600) America/Costa_Rica"),
-                    ("America/El_Salvador", "(GMT-0600) America/El_Salvador"),
-                    ("America/Guatemala", "(GMT-0600) America/Guatemala"),
-                    (
-                        "America/Indiana/Knox",
-                        "(GMT-0600) America/Indiana/Knox",
-                    ),
-                    (
-                        "America/Indiana/Tell_City",
-                        "(GMT-0600) America/Indiana/Tell_City",
-                    ),
-                    ("America/Managua", "(GMT-0600) America/Managua"),
-                    ("America/Matamoros", "(GMT-0600) America/Matamoros"),
-                    ("America/Menominee", "(GMT-0600) America/Menominee"),
-                    ("America/Merida", "(GMT-0600) America/Merida"),
-                    ("America/Mexico_City", "(GMT-0600) America/Mexico_City"),
-                    ("America/Monterrey", "(GMT-0600) America/Monterrey"),
-                    (
-                        "America/North_Dakota/Beulah",
-                        "(GMT-0600) America/North_Dakota/Beulah",
-                    ),
-                    (
-                        "America/North_Dakota/Center",
-                        "(GMT-0600) America/North_Dakota/Center",
-                    ),
-                    (
-                        "America/North_Dakota/New_Salem",
-                        "(GMT-0600) America/North_Dakota/New_Salem",
-                    ),
-                    ("America/Ojinaga", "(GMT-0600) America/Ojinaga"),
-                    (
-                        "America/Rankin_Inlet",
-                        "(GMT-0600) America/Rankin_Inlet",
-                    ),
-                    ("America/Regina", "(GMT-0600) America/Regina"),
-                    ("America/Resolute", "(GMT-0600) America/Resolute"),
-                    (
-                        "America/Swift_Current",
-                        "(GMT-0600) America/Swift_Current",
-                    ),
-                    ("America/Tegucigalpa", "(GMT-0600) America/Tegucigalpa"),
-                    ("America/Winnipeg", "(GMT-0600) America/Winnipeg"),
-                    ("Canada/Central", "(GMT-0600) Canada/Central"),
-                    ("Pacific/Galapagos", "(GMT-0600) Pacific/Galapagos"),
-                    ("US/Central", "(GMT-0600) US/Central"),
-                    ("America/Atikokan", "(GMT-0500) America/Atikokan"),
-                    ("America/Bogota", "(GMT-0500) America/Bogota"),
-                    ("America/Cancun", "(GMT-0500) America/Cancun"),
-                    ("America/Cayman", "(GMT-0500) America/Cayman"),
-                    ("America/Detroit", "(GMT-0500) America/Detroit"),
-                    ("America/Eirunepe", "(GMT-0500) America/Eirunepe"),
-                    ("America/Grand_Turk", "(GMT-0500) America/Grand_Turk"),
-                    ("America/Guayaquil", "(GMT-0500) America/Guayaquil"),
-                    ("America/Havana", "(GMT-0500) America/Havana"),
-                    (
-                        "America/Indiana/Indianapolis",
-                        "(GMT-0500) America/Indiana/Indianapolis",
-                    ),
-                    (
-                        "America/Indiana/Marengo",
-                        "(GMT-0500) America/Indiana/Marengo",
-                    ),
-                    (
-                        "America/Indiana/Petersburg",
-                        "(GMT-0500) America/Indiana/Petersburg",
-                    ),
-                    (
-                        "America/Indiana/Vevay",
-                        "(GMT-0500) America/Indiana/Vevay",
-                    ),
-                    (
-                        "America/Indiana/Vincennes",
-                        "(GMT-0500) America/Indiana/Vincennes",
-                    ),
-                    (
-                        "America/Indiana/Winamac",
-                        "(GMT-0500) America/Indiana/Winamac",
-                    ),
-                    ("America/Iqaluit", "(GMT-0500) America/Iqaluit"),
-                    ("America/Jamaica", "(GMT-0500) America/Jamaica"),
-                    (
-                        "America/Kentucky/Louisville",
-                        "(GMT-0500) America/Kentucky/Louisville",
-                    ),
-                    (
-                        "America/Kentucky/Monticello",
-                        "(GMT-0500) America/Kentucky/Monticello",
-                    ),
-                    ("America/Lima", "(GMT-0500) America/Lima"),
-                    ("America/Nassau", "(GMT-0500) America/Nassau"),
-                    ("America/New_York", "(GMT-0500) America/New_York"),
-                    ("America/Panama", "(GMT-0500) America/Panama"),
-                    (
-                        "America/Port-au-Prince",
-                        "(GMT-0500) America/Port-au-Prince",
-                    ),
-                    ("America/Rio_Branco", "(GMT-0500) America/Rio_Branco"),
-                    ("America/Toronto", "(GMT-0500) America/Toronto"),
-                    ("Canada/Eastern", "(GMT-0500) Canada/Eastern"),
-                    ("Pacific/Easter", "(GMT-0500) Pacific/Easter"),
-                    ("US/Eastern", "(GMT-0500) US/Eastern"),
-                    ("America/Anguilla", "(GMT-0400) America/Anguilla"),
-                    ("America/Antigua", "(GMT-0400) America/Antigua"),
-                    ("America/Aruba", "(GMT-0400) America/Aruba"),
-                    ("America/Barbados", "(GMT-0400) America/Barbados"),
-                    (
-                        "America/Blanc-Sablon",
-                        "(GMT-0400) America/Blanc-Sablon",
-                    ),
-                    ("America/Boa_Vista", "(GMT-0400) America/Boa_Vista"),
-                    (
-                        "America/Campo_Grande",
-                        "(GMT-0400) America/Campo_Grande",
-                    ),
-                    ("America/Caracas", "(GMT-0400) America/Caracas"),
-                    ("America/Cuiaba", "(GMT-0400) America/Cuiaba"),
-                    ("America/Curacao", "(GMT-0400) America/Curacao"),
-                    ("America/Dominica", "(GMT-0400) America/Dominica"),
-                    ("America/Glace_Bay", "(GMT-0400) America/Glace_Bay"),
-                    ("America/Goose_Bay", "(GMT-0400) America/Goose_Bay"),
-                    ("America/Grenada", "(GMT-0400) America/Grenada"),
-                    ("America/Guadeloupe", "(GMT-0400) America/Guadeloupe"),
-                    ("America/Guyana", "(GMT-0400) America/Guyana"),
-                    ("America/Halifax", "(GMT-0400) America/Halifax"),
-                    ("America/Kralendijk", "(GMT-0400) America/Kralendijk"),
-                    ("America/La_Paz", "(GMT-0400) America/La_Paz"),
-                    (
-                        "America/Lower_Princes",
-                        "(GMT-0400) America/Lower_Princes",
-                    ),
-                    ("America/Manaus", "(GMT-0400) America/Manaus"),
-                    ("America/Marigot", "(GMT-0400) America/Marigot"),
-                    ("America/Martinique", "(GMT-0400) America/Martinique"),
-                    ("America/Moncton", "(GMT-0400) America/Moncton"),
-                    ("America/Montserrat", "(GMT-0400) America/Montserrat"),
-                    (
-                        "America/Port_of_Spain",
-                        "(GMT-0400) America/Port_of_Spain",
-                    ),
-                    ("America/Porto_Velho", "(GMT-0400) America/Porto_Velho"),
-                    ("America/Puerto_Rico", "(GMT-0400) America/Puerto_Rico"),
-                    (
-                        "America/Santo_Domingo",
-                        "(GMT-0400) America/Santo_Domingo",
-                    ),
-                    (
-                        "America/St_Barthelemy",
-                        "(GMT-0400) America/St_Barthelemy",
-                    ),
-                    ("America/St_Kitts", "(GMT-0400) America/St_Kitts"),
-                    ("America/St_Lucia", "(GMT-0400) America/St_Lucia"),
-                    ("America/St_Thomas", "(GMT-0400) America/St_Thomas"),
-                    ("America/St_Vincent", "(GMT-0400) America/St_Vincent"),
-                    ("America/Thule", "(GMT-0400) America/Thule"),
-                    ("America/Tortola", "(GMT-0400) America/Tortola"),
-                    ("Atlantic/Bermuda", "(GMT-0400) Atlantic/Bermuda"),
-                    ("Canada/Atlantic", "(GMT-0400) Canada/Atlantic"),
-                    ("America/St_Johns", "(GMT-0330) America/St_Johns"),
-                    ("Canada/Newfoundland", "(GMT-0330) Canada/Newfoundland"),
-                    ("America/Araguaina", "(GMT-0300) America/Araguaina"),
-                    (
-                        "America/Argentina/Buenos_Aires",
-                        "(GMT-0300) America/Argentina/Buenos_Aires",
-                    ),
-                    (
-                        "America/Argentina/Catamarca",
-                        "(GMT-0300) America/Argentina/Catamarca",
-                    ),
-                    (
-                        "America/Argentina/Cordoba",
-                        "(GMT-0300) America/Argentina/Cordoba",
-                    ),
-                    (
-                        "America/Argentina/Jujuy",
-                        "(GMT-0300) America/Argentina/Jujuy",
-                    ),
-                    (
-                        "America/Argentina/La_Rioja",
-                        "(GMT-0300) America/Argentina/La_Rioja",
-                    ),
-                    (
-                        "America/Argentina/Mendoza",
-                        "(GMT-0300) America/Argentina/Mendoza",
-                    ),
-                    (
-                        "America/Argentina/Rio_Gallegos",
-                        "(GMT-0300) America/Argentina/Rio_Gallegos",
-                    ),
-                    (
-                        "America/Argentina/Salta",
-                        "(GMT-0300) America/Argentina/Salta",
-                    ),
-                    (
-                        "America/Argentina/San_Juan",
-                        "(GMT-0300) America/Argentina/San_Juan",
-                    ),
-                    (
-                        "America/Argentina/San_Luis",
-                        "(GMT-0300) America/Argentina/San_Luis",
-                    ),
-                    (
-                        "America/Argentina/Tucuman",
-                        "(GMT-0300) America/Argentina/Tucuman",
-                    ),
-                    (
-                        "America/Argentina/Ushuaia",
-                        "(GMT-0300) America/Argentina/Ushuaia",
-                    ),
-                    ("America/Asuncion", "(GMT-0300) America/Asuncion"),
-                    ("America/Bahia", "(GMT-0300) America/Bahia"),
-                    ("America/Belem", "(GMT-0300) America/Belem"),
-                    ("America/Cayenne", "(GMT-0300) America/Cayenne"),
-                    ("America/Fortaleza", "(GMT-0300) America/Fortaleza"),
-                    ("America/Maceio", "(GMT-0300) America/Maceio"),
-                    ("America/Miquelon", "(GMT-0300) America/Miquelon"),
-                    ("America/Montevideo", "(GMT-0300) America/Montevideo"),
-                    ("America/Nuuk", "(GMT-0300) America/Nuuk"),
-                    ("America/Paramaribo", "(GMT-0300) America/Paramaribo"),
-                    (
-                        "America/Punta_Arenas",
-                        "(GMT-0300) America/Punta_Arenas",
-                    ),
-                    ("America/Recife", "(GMT-0300) America/Recife"),
-                    ("America/Santarem", "(GMT-0300) America/Santarem"),
-                    ("America/Santiago", "(GMT-0300) America/Santiago"),
-                    ("America/Sao_Paulo", "(GMT-0300) America/Sao_Paulo"),
-                    ("Antarctica/Palmer", "(GMT-0300) Antarctica/Palmer"),
-                    ("Antarctica/Rothera", "(GMT-0300) Antarctica/Rothera"),
-                    ("Atlantic/Stanley", "(GMT-0300) Atlantic/Stanley"),
-                    ("America/Noronha", "(GMT-0200) America/Noronha"),
-                    (
-                        "Atlantic/South_Georgia",
-                        "(GMT-0200) Atlantic/South_Georgia",
-                    ),
-                    (
-                        "America/Scoresbysund",
-                        "(GMT-0100) America/Scoresbysund",
-                    ),
-                    ("Atlantic/Azores", "(GMT-0100) Atlantic/Azores"),
-                    ("Atlantic/Cape_Verde", "(GMT-0100) Atlantic/Cape_Verde"),
-                    ("Africa/Abidjan", "(GMT+0000) Africa/Abidjan"),
-                    ("Africa/Accra", "(GMT+0000) Africa/Accra"),
-                    ("Africa/Bamako", "(GMT+0000) Africa/Bamako"),
-                    ("Africa/Banjul", "(GMT+0000) Africa/Banjul"),
-                    ("Africa/Bissau", "(GMT+0000) Africa/Bissau"),
-                    ("Africa/Conakry", "(GMT+0000) Africa/Conakry"),
-                    ("Africa/Dakar", "(GMT+0000) Africa/Dakar"),
-                    ("Africa/Freetown", "(GMT+0000) Africa/Freetown"),
-                    ("Africa/Lome", "(GMT+0000) Africa/Lome"),
-                    ("Africa/Monrovia", "(GMT+0000) Africa/Monrovia"),
-                    ("Africa/Nouakchott", "(GMT+0000) Africa/Nouakchott"),
-                    ("Africa/Ouagadougou", "(GMT+0000) Africa/Ouagadougou"),
-                    ("Africa/Sao_Tome", "(GMT+0000) Africa/Sao_Tome"),
-                    (
-                        "America/Danmarkshavn",
-                        "(GMT+0000) America/Danmarkshavn",
-                    ),
-                    ("Antarctica/Troll", "(GMT+0000) Antarctica/Troll"),
-                    ("Atlantic/Canary", "(GMT+0000) Atlantic/Canary"),
-                    ("Atlantic/Faroe", "(GMT+0000) Atlantic/Faroe"),
-                    ("Atlantic/Madeira", "(GMT+0000) Atlantic/Madeira"),
-                    ("Atlantic/Reykjavik", "(GMT+0000) Atlantic/Reykjavik"),
-                    ("Atlantic/St_Helena", "(GMT+0000) Atlantic/St_Helena"),
-                    ("Europe/Dublin", "(GMT+0000) Europe/Dublin"),
-                    ("Europe/Guernsey", "(GMT+0000) Europe/Guernsey"),
-                    ("Europe/Isle_of_Man", "(GMT+0000) Europe/Isle_of_Man"),
-                    ("Europe/Jersey", "(GMT+0000) Europe/Jersey"),
-                    ("Europe/Lisbon", "(GMT+0000) Europe/Lisbon"),
-                    ("Europe/London", "(GMT+0000) Europe/London"),
-                    ("GMT", "(GMT+0000) GMT"),
-                    ("UTC", "(GMT+0000) UTC"),
-                    ("Africa/Algiers", "(GMT+0100) Africa/Algiers"),
-                    ("Africa/Bangui", "(GMT+0100) Africa/Bangui"),
-                    ("Africa/Brazzaville", "(GMT+0100) Africa/Brazzaville"),
-                    ("Africa/Casablanca", "(GMT+0100) Africa/Casablanca"),
-                    ("Africa/Ceuta", "(GMT+0100) Africa/Ceuta"),
-                    ("Africa/Douala", "(GMT+0100) Africa/Douala"),
-                    ("Africa/El_Aaiun", "(GMT+0100) Africa/El_Aaiun"),
-                    ("Africa/Kinshasa", "(GMT+0100) Africa/Kinshasa"),
-                    ("Africa/Lagos", "(GMT+0100) Africa/Lagos"),
-                    ("Africa/Libreville", "(GMT+0100) Africa/Libreville"),
-                    ("Africa/Luanda", "(GMT+0100) Africa/Luanda"),
-                    ("Africa/Malabo", "(GMT+0100) Africa/Malabo"),
-                    ("Africa/Ndjamena", "(GMT+0100) Africa/Ndjamena"),
-                    ("Africa/Niamey", "(GMT+0100) Africa/Niamey"),
-                    ("Africa/Porto-Novo", "(GMT+0100) Africa/Porto-Novo"),
-                    ("Africa/Tunis", "(GMT+0100) Africa/Tunis"),
-                    ("Arctic/Longyearbyen", "(GMT+0100) Arctic/Longyearbyen"),
-                    ("Europe/Amsterdam", "(GMT+0100) Europe/Amsterdam"),
-                    ("Europe/Andorra", "(GMT+0100) Europe/Andorra"),
-                    ("Europe/Belgrade", "(GMT+0100) Europe/Belgrade"),
-                    ("Europe/Berlin", "(GMT+0100) Europe/Berlin"),
-                    ("Europe/Bratislava", "(GMT+0100) Europe/Bratislava"),
-                    ("Europe/Brussels", "(GMT+0100) Europe/Brussels"),
-                    ("Europe/Budapest", "(GMT+0100) Europe/Budapest"),
-                    ("Europe/Busingen", "(GMT+0100) Europe/Busingen"),
-                    ("Europe/Copenhagen", "(GMT+0100) Europe/Copenhagen"),
-                    ("Europe/Gibraltar", "(GMT+0100) Europe/Gibraltar"),
-                    ("Europe/Ljubljana", "(GMT+0100) Europe/Ljubljana"),
-                    ("Europe/Luxembourg", "(GMT+0100) Europe/Luxembourg"),
-                    ("Europe/Madrid", "(GMT+0100) Europe/Madrid"),
-                    ("Europe/Malta", "(GMT+0100) Europe/Malta"),
-                    ("Europe/Monaco", "(GMT+0100) Europe/Monaco"),
-                    ("Europe/Oslo", "(GMT+0100) Europe/Oslo"),
-                    ("Europe/Paris", "(GMT+0100) Europe/Paris"),
-                    ("Europe/Podgorica", "(GMT+0100) Europe/Podgorica"),
-                    ("Europe/Prague", "(GMT+0100) Europe/Prague"),
-                    ("Europe/Rome", "(GMT+0100) Europe/Rome"),
-                    ("Europe/San_Marino", "(GMT+0100) Europe/San_Marino"),
-                    ("Europe/Sarajevo", "(GMT+0100) Europe/Sarajevo"),
-                    ("Europe/Skopje", "(GMT+0100) Europe/Skopje"),
-                    ("Europe/Stockholm", "(GMT+0100) Europe/Stockholm"),
-                    ("Europe/Tirane", "(GMT+0100) Europe/Tirane"),
-                    ("Europe/Vaduz", "(GMT+0100) Europe/Vaduz"),
-                    ("Europe/Vatican", "(GMT+0100) Europe/Vatican"),
-                    ("Europe/Vienna", "(GMT+0100) Europe/Vienna"),
-                    ("Europe/Warsaw", "(GMT+0100) Europe/Warsaw"),
-                    ("Europe/Zagreb", "(GMT+0100) Europe/Zagreb"),
-                    ("Europe/Zurich", "(GMT+0100) Europe/Zurich"),
-                    ("Africa/Blantyre", "(GMT+0200) Africa/Blantyre"),
-                    ("Africa/Bujumbura", "(GMT+0200) Africa/Bujumbura"),
-                    ("Africa/Cairo", "(GMT+0200) Africa/Cairo"),
-                    ("Africa/Gaborone", "(GMT+0200) Africa/Gaborone"),
-                    ("Africa/Harare", "(GMT+0200) Africa/Harare"),
-                    ("Africa/Johannesburg", "(GMT+0200) Africa/Johannesburg"),
-                    ("Africa/Juba", "(GMT+0200) Africa/Juba"),
-                    ("Africa/Khartoum", "(GMT+0200) Africa/Khartoum"),
-                    ("Africa/Kigali", "(GMT+0200) Africa/Kigali"),
-                    ("Africa/Lubumbashi", "(GMT+0200) Africa/Lubumbashi"),
-                    ("Africa/Lusaka", "(GMT+0200) Africa/Lusaka"),
-                    ("Africa/Maputo", "(GMT+0200) Africa/Maputo"),
-                    ("Africa/Maseru", "(GMT+0200) Africa/Maseru"),
-                    ("Africa/Mbabane", "(GMT+0200) Africa/Mbabane"),
-                    ("Africa/Tripoli", "(GMT+0200) Africa/Tripoli"),
-                    ("Africa/Windhoek", "(GMT+0200) Africa/Windhoek"),
-                    ("Asia/Beirut", "(GMT+0200) Asia/Beirut"),
-                    ("Asia/Famagusta", "(GMT+0200) Asia/Famagusta"),
-                    ("Asia/Gaza", "(GMT+0200) Asia/Gaza"),
-                    ("Asia/Hebron", "(GMT+0200) Asia/Hebron"),
-                    ("Asia/Jerusalem", "(GMT+0200) Asia/Jerusalem"),
-                    ("Asia/Nicosia", "(GMT+0200) Asia/Nicosia"),
-                    ("Europe/Athens", "(GMT+0200) Europe/Athens"),
-                    ("Europe/Bucharest", "(GMT+0200) Europe/Bucharest"),
-                    ("Europe/Chisinau", "(GMT+0200) Europe/Chisinau"),
-                    ("Europe/Helsinki", "(GMT+0200) Europe/Helsinki"),
-                    ("Europe/Kaliningrad", "(GMT+0200) Europe/Kaliningrad"),
-                    ("Europe/Kyiv", "(GMT+0200) Europe/Kyiv"),
-                    ("Europe/Mariehamn", "(GMT+0200) Europe/Mariehamn"),
-                    ("Europe/Riga", "(GMT+0200) Europe/Riga"),
-                    ("Europe/Sofia", "(GMT+0200) Europe/Sofia"),
-                    ("Europe/Tallinn", "(GMT+0200) Europe/Tallinn"),
-                    ("Europe/Vilnius", "(GMT+0200) Europe/Vilnius"),
-                    ("Africa/Addis_Ababa", "(GMT+0300) Africa/Addis_Ababa"),
-                    ("Africa/Asmara", "(GMT+0300) Africa/Asmara"),
-                    (
-                        "Africa/Dar_es_Salaam",
-                        "(GMT+0300) Africa/Dar_es_Salaam",
-                    ),
-                    ("Africa/Djibouti", "(GMT+0300) Africa/Djibouti"),
-                    ("Africa/Kampala", "(GMT+0300) Africa/Kampala"),
-                    ("Africa/Mogadishu", "(GMT+0300) Africa/Mogadishu"),
-                    ("Africa/Nairobi", "(GMT+0300) Africa/Nairobi"),
-                    ("Antarctica/Syowa", "(GMT+0300) Antarctica/Syowa"),
-                    ("Asia/Aden", "(GMT+0300) Asia/Aden"),
-                    ("Asia/Amman", "(GMT+0300) Asia/Amman"),
-                    ("Asia/Baghdad", "(GMT+0300) Asia/Baghdad"),
-                    ("Asia/Bahrain", "(GMT+0300) Asia/Bahrain"),
-                    ("Asia/Damascus", "(GMT+0300) Asia/Damascus"),
-                    ("Asia/Kuwait", "(GMT+0300) Asia/Kuwait"),
-                    ("Asia/Qatar", "(GMT+0300) Asia/Qatar"),
-                    ("Asia/Riyadh", "(GMT+0300) Asia/Riyadh"),
-                    ("Europe/Istanbul", "(GMT+0300) Europe/Istanbul"),
-                    ("Europe/Kirov", "(GMT+0300) Europe/Kirov"),
-                    ("Europe/Minsk", "(GMT+0300) Europe/Minsk"),
-                    ("Europe/Moscow", "(GMT+0300) Europe/Moscow"),
-                    ("Europe/Simferopol", "(GMT+0300) Europe/Simferopol"),
-                    ("Europe/Volgograd", "(GMT+0300) Europe/Volgograd"),
-                    ("Indian/Antananarivo", "(GMT+0300) Indian/Antananarivo"),
-                    ("Indian/Comoro", "(GMT+0300) Indian/Comoro"),
-                    ("Indian/Mayotte", "(GMT+0300) Indian/Mayotte"),
-                    ("Asia/Tehran", "(GMT+0330) Asia/Tehran"),
-                    ("Asia/Baku", "(GMT+0400) Asia/Baku"),
-                    ("Asia/Dubai", "(GMT+0400) Asia/Dubai"),
-                    ("Asia/Muscat", "(GMT+0400) Asia/Muscat"),
-                    ("Asia/Tbilisi", "(GMT+0400) Asia/Tbilisi"),
-                    ("Asia/Yerevan", "(GMT+0400) Asia/Yerevan"),
-                    ("Europe/Astrakhan", "(GMT+0400) Europe/Astrakhan"),
-                    ("Europe/Samara", "(GMT+0400) Europe/Samara"),
-                    ("Europe/Saratov", "(GMT+0400) Europe/Saratov"),
-                    ("Europe/Ulyanovsk", "(GMT+0400) Europe/Ulyanovsk"),
-                    ("Indian/Mahe", "(GMT+0400) Indian/Mahe"),
-                    ("Indian/Mauritius", "(GMT+0400) Indian/Mauritius"),
-                    ("Indian/Reunion", "(GMT+0400) Indian/Reunion"),
-                    ("Asia/Kabul", "(GMT+0430) Asia/Kabul"),
-                    ("Antarctica/Mawson", "(GMT+0500) Antarctica/Mawson"),
-                    ("Asia/Aqtau", "(GMT+0500) Asia/Aqtau"),
-                    ("Asia/Aqtobe", "(GMT+0500) Asia/Aqtobe"),
-                    ("Asia/Ashgabat", "(GMT+0500) Asia/Ashgabat"),
-                    ("Asia/Atyrau", "(GMT+0500) Asia/Atyrau"),
-                    ("Asia/Dushanbe", "(GMT+0500) Asia/Dushanbe"),
-                    ("Asia/Karachi", "(GMT+0500) Asia/Karachi"),
-                    ("Asia/Oral", "(GMT+0500) Asia/Oral"),
-                    ("Asia/Qyzylorda", "(GMT+0500) Asia/Qyzylorda"),
-                    ("Asia/Samarkand", "(GMT+0500) Asia/Samarkand"),
-                    ("Asia/Tashkent", "(GMT+0500) Asia/Tashkent"),
-                    ("Asia/Yekaterinburg", "(GMT+0500) Asia/Yekaterinburg"),
-                    ("Indian/Kerguelen", "(GMT+0500) Indian/Kerguelen"),
-                    ("Indian/Maldives", "(GMT+0500) Indian/Maldives"),
-                    ("Asia/Colombo", "(GMT+0530) Asia/Colombo"),
-                    ("Asia/Kolkata", "(GMT+0530) Asia/Kolkata"),
-                    ("Asia/Kathmandu", "(GMT+0545) Asia/Kathmandu"),
-                    ("Antarctica/Vostok", "(GMT+0600) Antarctica/Vostok"),
-                    ("Asia/Almaty", "(GMT+0600) Asia/Almaty"),
-                    ("Asia/Bishkek", "(GMT+0600) Asia/Bishkek"),
-                    ("Asia/Dhaka", "(GMT+0600) Asia/Dhaka"),
-                    ("Asia/Omsk", "(GMT+0600) Asia/Omsk"),
-                    ("Asia/Qostanay", "(GMT+0600) Asia/Qostanay"),
-                    ("Asia/Thimphu", "(GMT+0600) Asia/Thimphu"),
-                    ("Asia/Urumqi", "(GMT+0600) Asia/Urumqi"),
-                    ("Indian/Chagos", "(GMT+0600) Indian/Chagos"),
-                    ("Asia/Yangon", "(GMT+0630) Asia/Yangon"),
-                    ("Indian/Cocos", "(GMT+0630) Indian/Cocos"),
-                    ("Antarctica/Davis", "(GMT+0700) Antarctica/Davis"),
-                    ("Asia/Bangkok", "(GMT+0700) Asia/Bangkok"),
-                    ("Asia/Barnaul", "(GMT+0700) Asia/Barnaul"),
-                    ("Asia/Ho_Chi_Minh", "(GMT+0700) Asia/Ho_Chi_Minh"),
-                    ("Asia/Hovd", "(GMT+0700) Asia/Hovd"),
-                    ("Asia/Jakarta", "(GMT+0700) Asia/Jakarta"),
-                    ("Asia/Krasnoyarsk", "(GMT+0700) Asia/Krasnoyarsk"),
-                    ("Asia/Novokuznetsk", "(GMT+0700) Asia/Novokuznetsk"),
-                    ("Asia/Novosibirsk", "(GMT+0700) Asia/Novosibirsk"),
-                    ("Asia/Phnom_Penh", "(GMT+0700) Asia/Phnom_Penh"),
-                    ("Asia/Pontianak", "(GMT+0700) Asia/Pontianak"),
-                    ("Asia/Tomsk", "(GMT+0700) Asia/Tomsk"),
-                    ("Asia/Vientiane", "(GMT+0700) Asia/Vientiane"),
-                    ("Indian/Christmas", "(GMT+0700) Indian/Christmas"),
-                    ("Asia/Brunei", "(GMT+0800) Asia/Brunei"),
-                    ("Asia/Choibalsan", "(GMT+0800) Asia/Choibalsan"),
-                    ("Asia/Hong_Kong", "(GMT+0800) Asia/Hong_Kong"),
-                    ("Asia/Irkutsk", "(GMT+0800) Asia/Irkutsk"),
-                    ("Asia/Kuala_Lumpur", "(GMT+0800) Asia/Kuala_Lumpur"),
-                    ("Asia/Kuching", "(GMT+0800) Asia/Kuching"),
-                    ("Asia/Macau", "(GMT+0800) Asia/Macau"),
-                    ("Asia/Makassar", "(GMT+0800) Asia/Makassar"),
-                    ("Asia/Manila", "(GMT+0800) Asia/Manila"),
-                    ("Asia/Shanghai", "(GMT+0800) Asia/Shanghai"),
-                    ("Asia/Singapore", "(GMT+0800) Asia/Singapore"),
-                    ("Asia/Taipei", "(GMT+0800) Asia/Taipei"),
-                    ("Asia/Ulaanbaatar", "(GMT+0800) Asia/Ulaanbaatar"),
-                    ("Australia/Perth", "(GMT+0800) Australia/Perth"),
-                    ("Australia/Eucla", "(GMT+0845) Australia/Eucla"),
-                    ("Asia/Chita", "(GMT+0900) Asia/Chita"),
-                    ("Asia/Dili", "(GMT+0900) Asia/Dili"),
-                    ("Asia/Jayapura", "(GMT+0900) Asia/Jayapura"),
-                    ("Asia/Khandyga", "(GMT+0900) Asia/Khandyga"),
-                    ("Asia/Pyongyang", "(GMT+0900) Asia/Pyongyang"),
-                    ("Asia/Seoul", "(GMT+0900) Asia/Seoul"),
-                    ("Asia/Tokyo", "(GMT+0900) Asia/Tokyo"),
-                    ("Asia/Yakutsk", "(GMT+0900) Asia/Yakutsk"),
-                    ("Pacific/Palau", "(GMT+0900) Pacific/Palau"),
-                    ("Australia/Darwin", "(GMT+0930) Australia/Darwin"),
-                    (
-                        "Antarctica/DumontDUrville",
-                        "(GMT+1000) Antarctica/DumontDUrville",
-                    ),
-                    ("Asia/Ust-Nera", "(GMT+1000) Asia/Ust-Nera"),
-                    ("Asia/Vladivostok", "(GMT+1000) Asia/Vladivostok"),
-                    ("Australia/Brisbane", "(GMT+1000) Australia/Brisbane"),
-                    ("Australia/Lindeman", "(GMT+1000) Australia/Lindeman"),
-                    ("Pacific/Chuuk", "(GMT+1000) Pacific/Chuuk"),
-                    ("Pacific/Guam", "(GMT+1000) Pacific/Guam"),
-                    (
-                        "Pacific/Port_Moresby",
-                        "(GMT+1000) Pacific/Port_Moresby",
-                    ),
-                    ("Pacific/Saipan", "(GMT+1000) Pacific/Saipan"),
-                    ("Australia/Adelaide", "(GMT+1030) Australia/Adelaide"),
-                    (
-                        "Australia/Broken_Hill",
-                        "(GMT+1030) Australia/Broken_Hill",
-                    ),
-                    ("Antarctica/Casey", "(GMT+1100) Antarctica/Casey"),
-                    (
-                        "Antarctica/Macquarie",
-                        "(GMT+1100) Antarctica/Macquarie",
-                    ),
-                    ("Asia/Magadan", "(GMT+1100) Asia/Magadan"),
-                    ("Asia/Sakhalin", "(GMT+1100) Asia/Sakhalin"),
-                    ("Asia/Srednekolymsk", "(GMT+1100) Asia/Srednekolymsk"),
-                    ("Australia/Hobart", "(GMT+1100) Australia/Hobart"),
-                    ("Australia/Lord_Howe", "(GMT+1100) Australia/Lord_Howe"),
-                    ("Australia/Melbourne", "(GMT+1100) Australia/Melbourne"),
-                    ("Australia/Sydney", "(GMT+1100) Australia/Sydney"),
-                    (
-                        "Pacific/Bougainville",
-                        "(GMT+1100) Pacific/Bougainville",
-                    ),
-                    ("Pacific/Efate", "(GMT+1100) Pacific/Efate"),
-                    ("Pacific/Guadalcanal", "(GMT+1100) Pacific/Guadalcanal"),
-                    ("Pacific/Kosrae", "(GMT+1100) Pacific/Kosrae"),
-                    ("Pacific/Noumea", "(GMT+1100) Pacific/Noumea"),
-                    ("Pacific/Pohnpei", "(GMT+1100) Pacific/Pohnpei"),
-                    ("Asia/Anadyr", "(GMT+1200) Asia/Anadyr"),
-                    ("Asia/Kamchatka", "(GMT+1200) Asia/Kamchatka"),
-                    ("Pacific/Fiji", "(GMT+1200) Pacific/Fiji"),
-                    ("Pacific/Funafuti", "(GMT+1200) Pacific/Funafuti"),
-                    ("Pacific/Kwajalein", "(GMT+1200) Pacific/Kwajalein"),
-                    ("Pacific/Majuro", "(GMT+1200) Pacific/Majuro"),
-                    ("Pacific/Nauru", "(GMT+1200) Pacific/Nauru"),
-                    ("Pacific/Norfolk", "(GMT+1200) Pacific/Norfolk"),
-                    ("Pacific/Tarawa", "(GMT+1200) Pacific/Tarawa"),
-                    ("Pacific/Wake", "(GMT+1200) Pacific/Wake"),
-                    ("Pacific/Wallis", "(GMT+1200) Pacific/Wallis"),
-                    ("Antarctica/McMurdo", "(GMT+1300) Antarctica/McMurdo"),
-                    ("Pacific/Apia", "(GMT+1300) Pacific/Apia"),
-                    ("Pacific/Auckland", "(GMT+1300) Pacific/Auckland"),
-                    ("Pacific/Fakaofo", "(GMT+1300) Pacific/Fakaofo"),
-                    ("Pacific/Kanton", "(GMT+1300) Pacific/Kanton"),
-                    ("Pacific/Tongatapu", "(GMT+1300) Pacific/Tongatapu"),
-                    ("Pacific/Chatham", "(GMT+1345) Pacific/Chatham"),
-                    ("Pacific/Kiritimati", "(GMT+1400) Pacific/Kiritimati"),
-                ],
-                max_length=255,
-                null=True,
-            ),
-        ),
-    ]

vrobbler/apps/profiles/migrations/0004_userprofile_twitch_token_and_more.py

@@ -1,24 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-05 01:04
-
-from django.db import migrations, models
-import encrypted_field.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("profiles", "0003_userprofile_twitch_client_id_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="userprofile",
-            name="twitch_token",
-            field=encrypted_field.fields.EncryptedField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="userprofile",
-            name="twitch_token_expires",
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/profiles/migrations/0005_remove_userprofile_twitch_client_id_and_more.py

@@ -1,29 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-05 21:27
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("profiles", "0004_userprofile_twitch_token_and_more"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="userprofile",
-            name="twitch_client_id",
-        ),
-        migrations.RemoveField(
-            model_name="userprofile",
-            name="twitch_client_secret",
-        ),
-        migrations.RemoveField(
-            model_name="userprofile",
-            name="twitch_token",
-        ),
-        migrations.RemoveField(
-            model_name="userprofile",
-            name="twitch_token_expires",
-        ),
-    ]

vrobbler/apps/profiles/migrations/0006_alter_userprofile_timezone.py

@@ -1,602 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-13 04:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("profiles", "0005_remove_userprofile_twitch_client_id_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="userprofile",
-            name="timezone",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("Pacific/Midway", "(GMT-1100) Pacific/Midway"),
-                    ("Pacific/Niue", "(GMT-1100) Pacific/Niue"),
-                    ("Pacific/Pago_Pago", "(GMT-1100) Pacific/Pago_Pago"),
-                    ("Pacific/Honolulu", "(GMT-1000) Pacific/Honolulu"),
-                    ("Pacific/Rarotonga", "(GMT-1000) Pacific/Rarotonga"),
-                    ("Pacific/Tahiti", "(GMT-1000) Pacific/Tahiti"),
-                    ("US/Hawaii", "(GMT-1000) US/Hawaii"),
-                    ("Pacific/Marquesas", "(GMT-0930) Pacific/Marquesas"),
-                    ("America/Adak", "(GMT-0900) America/Adak"),
-                    ("Pacific/Gambier", "(GMT-0900) Pacific/Gambier"),
-                    ("America/Anchorage", "(GMT-0800) America/Anchorage"),
-                    ("America/Juneau", "(GMT-0800) America/Juneau"),
-                    ("America/Metlakatla", "(GMT-0800) America/Metlakatla"),
-                    ("America/Nome", "(GMT-0800) America/Nome"),
-                    ("America/Sitka", "(GMT-0800) America/Sitka"),
-                    ("America/Yakutat", "(GMT-0800) America/Yakutat"),
-                    ("Pacific/Pitcairn", "(GMT-0800) Pacific/Pitcairn"),
-                    ("US/Alaska", "(GMT-0800) US/Alaska"),
-                    ("America/Creston", "(GMT-0700) America/Creston"),
-                    ("America/Dawson", "(GMT-0700) America/Dawson"),
-                    (
-                        "America/Dawson_Creek",
-                        "(GMT-0700) America/Dawson_Creek",
-                    ),
-                    ("America/Fort_Nelson", "(GMT-0700) America/Fort_Nelson"),
-                    ("America/Hermosillo", "(GMT-0700) America/Hermosillo"),
-                    ("America/Los_Angeles", "(GMT-0700) America/Los_Angeles"),
-                    ("America/Mazatlan", "(GMT-0700) America/Mazatlan"),
-                    ("America/Phoenix", "(GMT-0700) America/Phoenix"),
-                    ("America/Tijuana", "(GMT-0700) America/Tijuana"),
-                    ("America/Vancouver", "(GMT-0700) America/Vancouver"),
-                    ("America/Whitehorse", "(GMT-0700) America/Whitehorse"),
-                    ("Canada/Pacific", "(GMT-0700) Canada/Pacific"),
-                    ("US/Arizona", "(GMT-0700) US/Arizona"),
-                    ("US/Pacific", "(GMT-0700) US/Pacific"),
-                    (
-                        "America/Bahia_Banderas",
-                        "(GMT-0600) America/Bahia_Banderas",
-                    ),
-                    ("America/Belize", "(GMT-0600) America/Belize"),
-                    ("America/Boise", "(GMT-0600) America/Boise"),
-                    (
-                        "America/Cambridge_Bay",
-                        "(GMT-0600) America/Cambridge_Bay",
-                    ),
-                    ("America/Chihuahua", "(GMT-0600) America/Chihuahua"),
-                    (
-                        "America/Ciudad_Juarez",
-                        "(GMT-0600) America/Ciudad_Juarez",
-                    ),
-                    ("America/Costa_Rica", "(GMT-0600) America/Costa_Rica"),
-                    ("America/Denver", "(GMT-0600) America/Denver"),
-                    ("America/Edmonton", "(GMT-0600) America/Edmonton"),
-                    ("America/El_Salvador", "(GMT-0600) America/El_Salvador"),
-                    ("America/Guatemala", "(GMT-0600) America/Guatemala"),
-                    ("America/Inuvik", "(GMT-0600) America/Inuvik"),
-                    ("America/Managua", "(GMT-0600) America/Managua"),
-                    ("America/Merida", "(GMT-0600) America/Merida"),
-                    ("America/Mexico_City", "(GMT-0600) America/Mexico_City"),
-                    ("America/Monterrey", "(GMT-0600) America/Monterrey"),
-                    ("America/Regina", "(GMT-0600) America/Regina"),
-                    (
-                        "America/Swift_Current",
-                        "(GMT-0600) America/Swift_Current",
-                    ),
-                    ("America/Tegucigalpa", "(GMT-0600) America/Tegucigalpa"),
-                    ("America/Yellowknife", "(GMT-0600) America/Yellowknife"),
-                    ("Canada/Mountain", "(GMT-0600) Canada/Mountain"),
-                    ("Pacific/Galapagos", "(GMT-0600) Pacific/Galapagos"),
-                    ("US/Mountain", "(GMT-0600) US/Mountain"),
-                    ("America/Atikokan", "(GMT-0500) America/Atikokan"),
-                    ("America/Bogota", "(GMT-0500) America/Bogota"),
-                    ("America/Cancun", "(GMT-0500) America/Cancun"),
-                    ("America/Cayman", "(GMT-0500) America/Cayman"),
-                    ("America/Chicago", "(GMT-0500) America/Chicago"),
-                    ("America/Eirunepe", "(GMT-0500) America/Eirunepe"),
-                    ("America/Guayaquil", "(GMT-0500) America/Guayaquil"),
-                    (
-                        "America/Indiana/Knox",
-                        "(GMT-0500) America/Indiana/Knox",
-                    ),
-                    (
-                        "America/Indiana/Tell_City",
-                        "(GMT-0500) America/Indiana/Tell_City",
-                    ),
-                    ("America/Jamaica", "(GMT-0500) America/Jamaica"),
-                    ("America/Lima", "(GMT-0500) America/Lima"),
-                    ("America/Matamoros", "(GMT-0500) America/Matamoros"),
-                    ("America/Menominee", "(GMT-0500) America/Menominee"),
-                    (
-                        "America/North_Dakota/Beulah",
-                        "(GMT-0500) America/North_Dakota/Beulah",
-                    ),
-                    (
-                        "America/North_Dakota/Center",
-                        "(GMT-0500) America/North_Dakota/Center",
-                    ),
-                    (
-                        "America/North_Dakota/New_Salem",
-                        "(GMT-0500) America/North_Dakota/New_Salem",
-                    ),
-                    ("America/Ojinaga", "(GMT-0500) America/Ojinaga"),
-                    ("America/Panama", "(GMT-0500) America/Panama"),
-                    (
-                        "America/Rankin_Inlet",
-                        "(GMT-0500) America/Rankin_Inlet",
-                    ),
-                    ("America/Resolute", "(GMT-0500) America/Resolute"),
-                    ("America/Rio_Branco", "(GMT-0500) America/Rio_Branco"),
-                    ("America/Winnipeg", "(GMT-0500) America/Winnipeg"),
-                    ("Canada/Central", "(GMT-0500) Canada/Central"),
-                    ("Pacific/Easter", "(GMT-0500) Pacific/Easter"),
-                    ("US/Central", "(GMT-0500) US/Central"),
-                    ("America/Anguilla", "(GMT-0400) America/Anguilla"),
-                    ("America/Antigua", "(GMT-0400) America/Antigua"),
-                    ("America/Aruba", "(GMT-0400) America/Aruba"),
-                    ("America/Barbados", "(GMT-0400) America/Barbados"),
-                    (
-                        "America/Blanc-Sablon",
-                        "(GMT-0400) America/Blanc-Sablon",
-                    ),
-                    ("America/Boa_Vista", "(GMT-0400) America/Boa_Vista"),
-                    (
-                        "America/Campo_Grande",
-                        "(GMT-0400) America/Campo_Grande",
-                    ),
-                    ("America/Caracas", "(GMT-0400) America/Caracas"),
-                    ("America/Cuiaba", "(GMT-0400) America/Cuiaba"),
-                    ("America/Curacao", "(GMT-0400) America/Curacao"),
-                    ("America/Detroit", "(GMT-0400) America/Detroit"),
-                    ("America/Dominica", "(GMT-0400) America/Dominica"),
-                    ("America/Grand_Turk", "(GMT-0400) America/Grand_Turk"),
-                    ("America/Grenada", "(GMT-0400) America/Grenada"),
-                    ("America/Guadeloupe", "(GMT-0400) America/Guadeloupe"),
-                    ("America/Guyana", "(GMT-0400) America/Guyana"),
-                    ("America/Havana", "(GMT-0400) America/Havana"),
-                    (
-                        "America/Indiana/Indianapolis",
-                        "(GMT-0400) America/Indiana/Indianapolis",
-                    ),
-                    (
-                        "America/Indiana/Marengo",
-                        "(GMT-0400) America/Indiana/Marengo",
-                    ),
-                    (
-                        "America/Indiana/Petersburg",
-                        "(GMT-0400) America/Indiana/Petersburg",
-                    ),
-                    (
-                        "America/Indiana/Vevay",
-                        "(GMT-0400) America/Indiana/Vevay",
-                    ),
-                    (
-                        "America/Indiana/Vincennes",
-                        "(GMT-0400) America/Indiana/Vincennes",
-                    ),
-                    (
-                        "America/Indiana/Winamac",
-                        "(GMT-0400) America/Indiana/Winamac",
-                    ),
-                    ("America/Iqaluit", "(GMT-0400) America/Iqaluit"),
-                    (
-                        "America/Kentucky/Louisville",
-                        "(GMT-0400) America/Kentucky/Louisville",
-                    ),
-                    (
-                        "America/Kentucky/Monticello",
-                        "(GMT-0400) America/Kentucky/Monticello",
-                    ),
-                    ("America/Kralendijk", "(GMT-0400) America/Kralendijk"),
-                    ("America/La_Paz", "(GMT-0400) America/La_Paz"),
-                    (
-                        "America/Lower_Princes",
-                        "(GMT-0400) America/Lower_Princes",
-                    ),
-                    ("America/Manaus", "(GMT-0400) America/Manaus"),
-                    ("America/Marigot", "(GMT-0400) America/Marigot"),
-                    ("America/Martinique", "(GMT-0400) America/Martinique"),
-                    ("America/Montserrat", "(GMT-0400) America/Montserrat"),
-                    ("America/Nassau", "(GMT-0400) America/Nassau"),
-                    ("America/New_York", "(GMT-0400) America/New_York"),
-                    (
-                        "America/Port-au-Prince",
-                        "(GMT-0400) America/Port-au-Prince",
-                    ),
-                    (
-                        "America/Port_of_Spain",
-                        "(GMT-0400) America/Port_of_Spain",
-                    ),
-                    ("America/Porto_Velho", "(GMT-0400) America/Porto_Velho"),
-                    ("America/Puerto_Rico", "(GMT-0400) America/Puerto_Rico"),
-                    (
-                        "America/Santo_Domingo",
-                        "(GMT-0400) America/Santo_Domingo",
-                    ),
-                    (
-                        "America/St_Barthelemy",
-                        "(GMT-0400) America/St_Barthelemy",
-                    ),
-                    ("America/St_Kitts", "(GMT-0400) America/St_Kitts"),
-                    ("America/St_Lucia", "(GMT-0400) America/St_Lucia"),
-                    ("America/St_Thomas", "(GMT-0400) America/St_Thomas"),
-                    ("America/St_Vincent", "(GMT-0400) America/St_Vincent"),
-                    ("America/Toronto", "(GMT-0400) America/Toronto"),
-                    ("America/Tortola", "(GMT-0400) America/Tortola"),
-                    ("Canada/Eastern", "(GMT-0400) Canada/Eastern"),
-                    ("US/Eastern", "(GMT-0400) US/Eastern"),
-                    ("America/Araguaina", "(GMT-0300) America/Araguaina"),
-                    (
-                        "America/Argentina/Buenos_Aires",
-                        "(GMT-0300) America/Argentina/Buenos_Aires",
-                    ),
-                    (
-                        "America/Argentina/Catamarca",
-                        "(GMT-0300) America/Argentina/Catamarca",
-                    ),
-                    (
-                        "America/Argentina/Cordoba",
-                        "(GMT-0300) America/Argentina/Cordoba",
-                    ),
-                    (
-                        "America/Argentina/Jujuy",
-                        "(GMT-0300) America/Argentina/Jujuy",
-                    ),
-                    (
-                        "America/Argentina/La_Rioja",
-                        "(GMT-0300) America/Argentina/La_Rioja",
-                    ),
-                    (
-                        "America/Argentina/Mendoza",
-                        "(GMT-0300) America/Argentina/Mendoza",
-                    ),
-                    (
-                        "America/Argentina/Rio_Gallegos",
-                        "(GMT-0300) America/Argentina/Rio_Gallegos",
-                    ),
-                    (
-                        "America/Argentina/Salta",
-                        "(GMT-0300) America/Argentina/Salta",
-                    ),
-                    (
-                        "America/Argentina/San_Juan",
-                        "(GMT-0300) America/Argentina/San_Juan",
-                    ),
-                    (
-                        "America/Argentina/San_Luis",
-                        "(GMT-0300) America/Argentina/San_Luis",
-                    ),
-                    (
-                        "America/Argentina/Tucuman",
-                        "(GMT-0300) America/Argentina/Tucuman",
-                    ),
-                    (
-                        "America/Argentina/Ushuaia",
-                        "(GMT-0300) America/Argentina/Ushuaia",
-                    ),
-                    ("America/Asuncion", "(GMT-0300) America/Asuncion"),
-                    ("America/Bahia", "(GMT-0300) America/Bahia"),
-                    ("America/Belem", "(GMT-0300) America/Belem"),
-                    ("America/Cayenne", "(GMT-0300) America/Cayenne"),
-                    ("America/Fortaleza", "(GMT-0300) America/Fortaleza"),
-                    ("America/Glace_Bay", "(GMT-0300) America/Glace_Bay"),
-                    ("America/Goose_Bay", "(GMT-0300) America/Goose_Bay"),
-                    ("America/Halifax", "(GMT-0300) America/Halifax"),
-                    ("America/Maceio", "(GMT-0300) America/Maceio"),
-                    ("America/Moncton", "(GMT-0300) America/Moncton"),
-                    ("America/Montevideo", "(GMT-0300) America/Montevideo"),
-                    ("America/Nuuk", "(GMT-0300) America/Nuuk"),
-                    ("America/Paramaribo", "(GMT-0300) America/Paramaribo"),
-                    (
-                        "America/Punta_Arenas",
-                        "(GMT-0300) America/Punta_Arenas",
-                    ),
-                    ("America/Recife", "(GMT-0300) America/Recife"),
-                    ("America/Santarem", "(GMT-0300) America/Santarem"),
-                    ("America/Santiago", "(GMT-0300) America/Santiago"),
-                    ("America/Sao_Paulo", "(GMT-0300) America/Sao_Paulo"),
-                    ("America/Thule", "(GMT-0300) America/Thule"),
-                    ("Antarctica/Palmer", "(GMT-0300) Antarctica/Palmer"),
-                    ("Antarctica/Rothera", "(GMT-0300) Antarctica/Rothera"),
-                    ("Atlantic/Bermuda", "(GMT-0300) Atlantic/Bermuda"),
-                    ("Atlantic/Stanley", "(GMT-0300) Atlantic/Stanley"),
-                    ("Canada/Atlantic", "(GMT-0300) Canada/Atlantic"),
-                    ("America/St_Johns", "(GMT-0230) America/St_Johns"),
-                    ("Canada/Newfoundland", "(GMT-0230) Canada/Newfoundland"),
-                    ("America/Miquelon", "(GMT-0200) America/Miquelon"),
-                    ("America/Noronha", "(GMT-0200) America/Noronha"),
-                    (
-                        "Atlantic/South_Georgia",
-                        "(GMT-0200) Atlantic/South_Georgia",
-                    ),
-                    (
-                        "America/Scoresbysund",
-                        "(GMT-0100) America/Scoresbysund",
-                    ),
-                    ("Atlantic/Azores", "(GMT-0100) Atlantic/Azores"),
-                    ("Atlantic/Cape_Verde", "(GMT-0100) Atlantic/Cape_Verde"),
-                    ("Africa/Abidjan", "(GMT+0000) Africa/Abidjan"),
-                    ("Africa/Accra", "(GMT+0000) Africa/Accra"),
-                    ("Africa/Bamako", "(GMT+0000) Africa/Bamako"),
-                    ("Africa/Banjul", "(GMT+0000) Africa/Banjul"),
-                    ("Africa/Bissau", "(GMT+0000) Africa/Bissau"),
-                    ("Africa/Conakry", "(GMT+0000) Africa/Conakry"),
-                    ("Africa/Dakar", "(GMT+0000) Africa/Dakar"),
-                    ("Africa/Freetown", "(GMT+0000) Africa/Freetown"),
-                    ("Africa/Lome", "(GMT+0000) Africa/Lome"),
-                    ("Africa/Monrovia", "(GMT+0000) Africa/Monrovia"),
-                    ("Africa/Nouakchott", "(GMT+0000) Africa/Nouakchott"),
-                    ("Africa/Ouagadougou", "(GMT+0000) Africa/Ouagadougou"),
-                    ("Africa/Sao_Tome", "(GMT+0000) Africa/Sao_Tome"),
-                    (
-                        "America/Danmarkshavn",
-                        "(GMT+0000) America/Danmarkshavn",
-                    ),
-                    ("Antarctica/Troll", "(GMT+0000) Antarctica/Troll"),
-                    ("Atlantic/Canary", "(GMT+0000) Atlantic/Canary"),
-                    ("Atlantic/Faroe", "(GMT+0000) Atlantic/Faroe"),
-                    ("Atlantic/Madeira", "(GMT+0000) Atlantic/Madeira"),
-                    ("Atlantic/Reykjavik", "(GMT+0000) Atlantic/Reykjavik"),
-                    ("Atlantic/St_Helena", "(GMT+0000) Atlantic/St_Helena"),
-                    ("Europe/Dublin", "(GMT+0000) Europe/Dublin"),
-                    ("Europe/Guernsey", "(GMT+0000) Europe/Guernsey"),
-                    ("Europe/Isle_of_Man", "(GMT+0000) Europe/Isle_of_Man"),
-                    ("Europe/Jersey", "(GMT+0000) Europe/Jersey"),
-                    ("Europe/Lisbon", "(GMT+0000) Europe/Lisbon"),
-                    ("Europe/London", "(GMT+0000) Europe/London"),
-                    ("GMT", "(GMT+0000) GMT"),
-                    ("UTC", "(GMT+0000) UTC"),
-                    ("Africa/Algiers", "(GMT+0100) Africa/Algiers"),
-                    ("Africa/Bangui", "(GMT+0100) Africa/Bangui"),
-                    ("Africa/Brazzaville", "(GMT+0100) Africa/Brazzaville"),
-                    ("Africa/Casablanca", "(GMT+0100) Africa/Casablanca"),
-                    ("Africa/Ceuta", "(GMT+0100) Africa/Ceuta"),
-                    ("Africa/Douala", "(GMT+0100) Africa/Douala"),
-                    ("Africa/El_Aaiun", "(GMT+0100) Africa/El_Aaiun"),
-                    ("Africa/Kinshasa", "(GMT+0100) Africa/Kinshasa"),
-                    ("Africa/Lagos", "(GMT+0100) Africa/Lagos"),
-                    ("Africa/Libreville", "(GMT+0100) Africa/Libreville"),
-                    ("Africa/Luanda", "(GMT+0100) Africa/Luanda"),
-                    ("Africa/Malabo", "(GMT+0100) Africa/Malabo"),
-                    ("Africa/Ndjamena", "(GMT+0100) Africa/Ndjamena"),
-                    ("Africa/Niamey", "(GMT+0100) Africa/Niamey"),
-                    ("Africa/Porto-Novo", "(GMT+0100) Africa/Porto-Novo"),
-                    ("Africa/Tunis", "(GMT+0100) Africa/Tunis"),
-                    ("Arctic/Longyearbyen", "(GMT+0100) Arctic/Longyearbyen"),
-                    ("Europe/Amsterdam", "(GMT+0100) Europe/Amsterdam"),
-                    ("Europe/Andorra", "(GMT+0100) Europe/Andorra"),
-                    ("Europe/Belgrade", "(GMT+0100) Europe/Belgrade"),
-                    ("Europe/Berlin", "(GMT+0100) Europe/Berlin"),
-                    ("Europe/Bratislava", "(GMT+0100) Europe/Bratislava"),
-                    ("Europe/Brussels", "(GMT+0100) Europe/Brussels"),
-                    ("Europe/Budapest", "(GMT+0100) Europe/Budapest"),
-                    ("Europe/Busingen", "(GMT+0100) Europe/Busingen"),
-                    ("Europe/Copenhagen", "(GMT+0100) Europe/Copenhagen"),
-                    ("Europe/Gibraltar", "(GMT+0100) Europe/Gibraltar"),
-                    ("Europe/Ljubljana", "(GMT+0100) Europe/Ljubljana"),
-                    ("Europe/Luxembourg", "(GMT+0100) Europe/Luxembourg"),
-                    ("Europe/Madrid", "(GMT+0100) Europe/Madrid"),
-                    ("Europe/Malta", "(GMT+0100) Europe/Malta"),
-                    ("Europe/Monaco", "(GMT+0100) Europe/Monaco"),
-                    ("Europe/Oslo", "(GMT+0100) Europe/Oslo"),
-                    ("Europe/Paris", "(GMT+0100) Europe/Paris"),
-                    ("Europe/Podgorica", "(GMT+0100) Europe/Podgorica"),
-                    ("Europe/Prague", "(GMT+0100) Europe/Prague"),
-                    ("Europe/Rome", "(GMT+0100) Europe/Rome"),
-                    ("Europe/San_Marino", "(GMT+0100) Europe/San_Marino"),
-                    ("Europe/Sarajevo", "(GMT+0100) Europe/Sarajevo"),
-                    ("Europe/Skopje", "(GMT+0100) Europe/Skopje"),
-                    ("Europe/Stockholm", "(GMT+0100) Europe/Stockholm"),
-                    ("Europe/Tirane", "(GMT+0100) Europe/Tirane"),
-                    ("Europe/Vaduz", "(GMT+0100) Europe/Vaduz"),
-                    ("Europe/Vatican", "(GMT+0100) Europe/Vatican"),
-                    ("Europe/Vienna", "(GMT+0100) Europe/Vienna"),
-                    ("Europe/Warsaw", "(GMT+0100) Europe/Warsaw"),
-                    ("Europe/Zagreb", "(GMT+0100) Europe/Zagreb"),
-                    ("Europe/Zurich", "(GMT+0100) Europe/Zurich"),
-                    ("Africa/Blantyre", "(GMT+0200) Africa/Blantyre"),
-                    ("Africa/Bujumbura", "(GMT+0200) Africa/Bujumbura"),
-                    ("Africa/Cairo", "(GMT+0200) Africa/Cairo"),
-                    ("Africa/Gaborone", "(GMT+0200) Africa/Gaborone"),
-                    ("Africa/Harare", "(GMT+0200) Africa/Harare"),
-                    ("Africa/Johannesburg", "(GMT+0200) Africa/Johannesburg"),
-                    ("Africa/Juba", "(GMT+0200) Africa/Juba"),
-                    ("Africa/Khartoum", "(GMT+0200) Africa/Khartoum"),
-                    ("Africa/Kigali", "(GMT+0200) Africa/Kigali"),
-                    ("Africa/Lubumbashi", "(GMT+0200) Africa/Lubumbashi"),
-                    ("Africa/Lusaka", "(GMT+0200) Africa/Lusaka"),
-                    ("Africa/Maputo", "(GMT+0200) Africa/Maputo"),
-                    ("Africa/Maseru", "(GMT+0200) Africa/Maseru"),
-                    ("Africa/Mbabane", "(GMT+0200) Africa/Mbabane"),
-                    ("Africa/Tripoli", "(GMT+0200) Africa/Tripoli"),
-                    ("Africa/Windhoek", "(GMT+0200) Africa/Windhoek"),
-                    ("Asia/Beirut", "(GMT+0200) Asia/Beirut"),
-                    ("Asia/Famagusta", "(GMT+0200) Asia/Famagusta"),
-                    ("Asia/Gaza", "(GMT+0200) Asia/Gaza"),
-                    ("Asia/Hebron", "(GMT+0200) Asia/Hebron"),
-                    ("Asia/Jerusalem", "(GMT+0200) Asia/Jerusalem"),
-                    ("Asia/Nicosia", "(GMT+0200) Asia/Nicosia"),
-                    ("Europe/Athens", "(GMT+0200) Europe/Athens"),
-                    ("Europe/Bucharest", "(GMT+0200) Europe/Bucharest"),
-                    ("Europe/Chisinau", "(GMT+0200) Europe/Chisinau"),
-                    ("Europe/Helsinki", "(GMT+0200) Europe/Helsinki"),
-                    ("Europe/Kaliningrad", "(GMT+0200) Europe/Kaliningrad"),
-                    ("Europe/Kyiv", "(GMT+0200) Europe/Kyiv"),
-                    ("Europe/Mariehamn", "(GMT+0200) Europe/Mariehamn"),
-                    ("Europe/Riga", "(GMT+0200) Europe/Riga"),
-                    ("Europe/Sofia", "(GMT+0200) Europe/Sofia"),
-                    ("Europe/Tallinn", "(GMT+0200) Europe/Tallinn"),
-                    ("Europe/Vilnius", "(GMT+0200) Europe/Vilnius"),
-                    ("Africa/Addis_Ababa", "(GMT+0300) Africa/Addis_Ababa"),
-                    ("Africa/Asmara", "(GMT+0300) Africa/Asmara"),
-                    (
-                        "Africa/Dar_es_Salaam",
-                        "(GMT+0300) Africa/Dar_es_Salaam",
-                    ),
-                    ("Africa/Djibouti", "(GMT+0300) Africa/Djibouti"),
-                    ("Africa/Kampala", "(GMT+0300) Africa/Kampala"),
-                    ("Africa/Mogadishu", "(GMT+0300) Africa/Mogadishu"),
-                    ("Africa/Nairobi", "(GMT+0300) Africa/Nairobi"),
-                    ("Antarctica/Syowa", "(GMT+0300) Antarctica/Syowa"),
-                    ("Asia/Aden", "(GMT+0300) Asia/Aden"),
-                    ("Asia/Amman", "(GMT+0300) Asia/Amman"),
-                    ("Asia/Baghdad", "(GMT+0300) Asia/Baghdad"),
-                    ("Asia/Bahrain", "(GMT+0300) Asia/Bahrain"),
-                    ("Asia/Damascus", "(GMT+0300) Asia/Damascus"),
-                    ("Asia/Kuwait", "(GMT+0300) Asia/Kuwait"),
-                    ("Asia/Qatar", "(GMT+0300) Asia/Qatar"),
-                    ("Asia/Riyadh", "(GMT+0300) Asia/Riyadh"),
-                    ("Europe/Istanbul", "(GMT+0300) Europe/Istanbul"),
-                    ("Europe/Kirov", "(GMT+0300) Europe/Kirov"),
-                    ("Europe/Minsk", "(GMT+0300) Europe/Minsk"),
-                    ("Europe/Moscow", "(GMT+0300) Europe/Moscow"),
-                    ("Europe/Simferopol", "(GMT+0300) Europe/Simferopol"),
-                    ("Europe/Volgograd", "(GMT+0300) Europe/Volgograd"),
-                    ("Indian/Antananarivo", "(GMT+0300) Indian/Antananarivo"),
-                    ("Indian/Comoro", "(GMT+0300) Indian/Comoro"),
-                    ("Indian/Mayotte", "(GMT+0300) Indian/Mayotte"),
-                    ("Asia/Tehran", "(GMT+0330) Asia/Tehran"),
-                    ("Asia/Baku", "(GMT+0400) Asia/Baku"),
-                    ("Asia/Dubai", "(GMT+0400) Asia/Dubai"),
-                    ("Asia/Muscat", "(GMT+0400) Asia/Muscat"),
-                    ("Asia/Tbilisi", "(GMT+0400) Asia/Tbilisi"),
-                    ("Asia/Yerevan", "(GMT+0400) Asia/Yerevan"),
-                    ("Europe/Astrakhan", "(GMT+0400) Europe/Astrakhan"),
-                    ("Europe/Samara", "(GMT+0400) Europe/Samara"),
-                    ("Europe/Saratov", "(GMT+0400) Europe/Saratov"),
-                    ("Europe/Ulyanovsk", "(GMT+0400) Europe/Ulyanovsk"),
-                    ("Indian/Mahe", "(GMT+0400) Indian/Mahe"),
-                    ("Indian/Mauritius", "(GMT+0400) Indian/Mauritius"),
-                    ("Indian/Reunion", "(GMT+0400) Indian/Reunion"),
-                    ("Asia/Kabul", "(GMT+0430) Asia/Kabul"),
-                    ("Antarctica/Mawson", "(GMT+0500) Antarctica/Mawson"),
-                    ("Asia/Aqtau", "(GMT+0500) Asia/Aqtau"),
-                    ("Asia/Aqtobe", "(GMT+0500) Asia/Aqtobe"),
-                    ("Asia/Ashgabat", "(GMT+0500) Asia/Ashgabat"),
-                    ("Asia/Atyrau", "(GMT+0500) Asia/Atyrau"),
-                    ("Asia/Dushanbe", "(GMT+0500) Asia/Dushanbe"),
-                    ("Asia/Karachi", "(GMT+0500) Asia/Karachi"),
-                    ("Asia/Oral", "(GMT+0500) Asia/Oral"),
-                    ("Asia/Qyzylorda", "(GMT+0500) Asia/Qyzylorda"),
-                    ("Asia/Samarkand", "(GMT+0500) Asia/Samarkand"),
-                    ("Asia/Tashkent", "(GMT+0500) Asia/Tashkent"),
-                    ("Asia/Yekaterinburg", "(GMT+0500) Asia/Yekaterinburg"),
-                    ("Indian/Kerguelen", "(GMT+0500) Indian/Kerguelen"),
-                    ("Indian/Maldives", "(GMT+0500) Indian/Maldives"),
-                    ("Asia/Colombo", "(GMT+0530) Asia/Colombo"),
-                    ("Asia/Kolkata", "(GMT+0530) Asia/Kolkata"),
-                    ("Asia/Kathmandu", "(GMT+0545) Asia/Kathmandu"),
-                    ("Antarctica/Vostok", "(GMT+0600) Antarctica/Vostok"),
-                    ("Asia/Almaty", "(GMT+0600) Asia/Almaty"),
-                    ("Asia/Bishkek", "(GMT+0600) Asia/Bishkek"),
-                    ("Asia/Dhaka", "(GMT+0600) Asia/Dhaka"),
-                    ("Asia/Omsk", "(GMT+0600) Asia/Omsk"),
-                    ("Asia/Qostanay", "(GMT+0600) Asia/Qostanay"),
-                    ("Asia/Thimphu", "(GMT+0600) Asia/Thimphu"),
-                    ("Asia/Urumqi", "(GMT+0600) Asia/Urumqi"),
-                    ("Indian/Chagos", "(GMT+0600) Indian/Chagos"),
-                    ("Asia/Yangon", "(GMT+0630) Asia/Yangon"),
-                    ("Indian/Cocos", "(GMT+0630) Indian/Cocos"),
-                    ("Antarctica/Davis", "(GMT+0700) Antarctica/Davis"),
-                    ("Asia/Bangkok", "(GMT+0700) Asia/Bangkok"),
-                    ("Asia/Barnaul", "(GMT+0700) Asia/Barnaul"),
-                    ("Asia/Ho_Chi_Minh", "(GMT+0700) Asia/Ho_Chi_Minh"),
-                    ("Asia/Hovd", "(GMT+0700) Asia/Hovd"),
-                    ("Asia/Jakarta", "(GMT+0700) Asia/Jakarta"),
-                    ("Asia/Krasnoyarsk", "(GMT+0700) Asia/Krasnoyarsk"),
-                    ("Asia/Novokuznetsk", "(GMT+0700) Asia/Novokuznetsk"),
-                    ("Asia/Novosibirsk", "(GMT+0700) Asia/Novosibirsk"),
-                    ("Asia/Phnom_Penh", "(GMT+0700) Asia/Phnom_Penh"),
-                    ("Asia/Pontianak", "(GMT+0700) Asia/Pontianak"),
-                    ("Asia/Tomsk", "(GMT+0700) Asia/Tomsk"),
-                    ("Asia/Vientiane", "(GMT+0700) Asia/Vientiane"),
-                    ("Indian/Christmas", "(GMT+0700) Indian/Christmas"),
-                    ("Asia/Brunei", "(GMT+0800) Asia/Brunei"),
-                    ("Asia/Choibalsan", "(GMT+0800) Asia/Choibalsan"),
-                    ("Asia/Hong_Kong", "(GMT+0800) Asia/Hong_Kong"),
-                    ("Asia/Irkutsk", "(GMT+0800) Asia/Irkutsk"),
-                    ("Asia/Kuala_Lumpur", "(GMT+0800) Asia/Kuala_Lumpur"),
-                    ("Asia/Kuching", "(GMT+0800) Asia/Kuching"),
-                    ("Asia/Macau", "(GMT+0800) Asia/Macau"),
-                    ("Asia/Makassar", "(GMT+0800) Asia/Makassar"),
-                    ("Asia/Manila", "(GMT+0800) Asia/Manila"),
-                    ("Asia/Shanghai", "(GMT+0800) Asia/Shanghai"),
-                    ("Asia/Singapore", "(GMT+0800) Asia/Singapore"),
-                    ("Asia/Taipei", "(GMT+0800) Asia/Taipei"),
-                    ("Asia/Ulaanbaatar", "(GMT+0800) Asia/Ulaanbaatar"),
-                    ("Australia/Perth", "(GMT+0800) Australia/Perth"),
-                    ("Australia/Eucla", "(GMT+0845) Australia/Eucla"),
-                    ("Asia/Chita", "(GMT+0900) Asia/Chita"),
-                    ("Asia/Dili", "(GMT+0900) Asia/Dili"),
-                    ("Asia/Jayapura", "(GMT+0900) Asia/Jayapura"),
-                    ("Asia/Khandyga", "(GMT+0900) Asia/Khandyga"),
-                    ("Asia/Pyongyang", "(GMT+0900) Asia/Pyongyang"),
-                    ("Asia/Seoul", "(GMT+0900) Asia/Seoul"),
-                    ("Asia/Tokyo", "(GMT+0900) Asia/Tokyo"),
-                    ("Asia/Yakutsk", "(GMT+0900) Asia/Yakutsk"),
-                    ("Pacific/Palau", "(GMT+0900) Pacific/Palau"),
-                    ("Australia/Darwin", "(GMT+0930) Australia/Darwin"),
-                    (
-                        "Antarctica/DumontDUrville",
-                        "(GMT+1000) Antarctica/DumontDUrville",
-                    ),
-                    ("Asia/Ust-Nera", "(GMT+1000) Asia/Ust-Nera"),
-                    ("Asia/Vladivostok", "(GMT+1000) Asia/Vladivostok"),
-                    ("Australia/Brisbane", "(GMT+1000) Australia/Brisbane"),
-                    ("Australia/Lindeman", "(GMT+1000) Australia/Lindeman"),
-                    ("Pacific/Chuuk", "(GMT+1000) Pacific/Chuuk"),
-                    ("Pacific/Guam", "(GMT+1000) Pacific/Guam"),
-                    (
-                        "Pacific/Port_Moresby",
-                        "(GMT+1000) Pacific/Port_Moresby",
-                    ),
-                    ("Pacific/Saipan", "(GMT+1000) Pacific/Saipan"),
-                    ("Australia/Adelaide", "(GMT+1030) Australia/Adelaide"),
-                    (
-                        "Australia/Broken_Hill",
-                        "(GMT+1030) Australia/Broken_Hill",
-                    ),
-                    ("Antarctica/Casey", "(GMT+1100) Antarctica/Casey"),
-                    (
-                        "Antarctica/Macquarie",
-                        "(GMT+1100) Antarctica/Macquarie",
-                    ),
-                    ("Asia/Magadan", "(GMT+1100) Asia/Magadan"),
-                    ("Asia/Sakhalin", "(GMT+1100) Asia/Sakhalin"),
-                    ("Asia/Srednekolymsk", "(GMT+1100) Asia/Srednekolymsk"),
-                    ("Australia/Hobart", "(GMT+1100) Australia/Hobart"),
-                    ("Australia/Lord_Howe", "(GMT+1100) Australia/Lord_Howe"),
-                    ("Australia/Melbourne", "(GMT+1100) Australia/Melbourne"),
-                    ("Australia/Sydney", "(GMT+1100) Australia/Sydney"),
-                    (
-                        "Pacific/Bougainville",
-                        "(GMT+1100) Pacific/Bougainville",
-                    ),
-                    ("Pacific/Efate", "(GMT+1100) Pacific/Efate"),
-                    ("Pacific/Guadalcanal", "(GMT+1100) Pacific/Guadalcanal"),
-                    ("Pacific/Kosrae", "(GMT+1100) Pacific/Kosrae"),
-                    ("Pacific/Noumea", "(GMT+1100) Pacific/Noumea"),
-                    ("Pacific/Pohnpei", "(GMT+1100) Pacific/Pohnpei"),
-                    ("Asia/Anadyr", "(GMT+1200) Asia/Anadyr"),
-                    ("Asia/Kamchatka", "(GMT+1200) Asia/Kamchatka"),
-                    ("Pacific/Fiji", "(GMT+1200) Pacific/Fiji"),
-                    ("Pacific/Funafuti", "(GMT+1200) Pacific/Funafuti"),
-                    ("Pacific/Kwajalein", "(GMT+1200) Pacific/Kwajalein"),
-                    ("Pacific/Majuro", "(GMT+1200) Pacific/Majuro"),
-                    ("Pacific/Nauru", "(GMT+1200) Pacific/Nauru"),
-                    ("Pacific/Norfolk", "(GMT+1200) Pacific/Norfolk"),
-                    ("Pacific/Tarawa", "(GMT+1200) Pacific/Tarawa"),
-                    ("Pacific/Wake", "(GMT+1200) Pacific/Wake"),
-                    ("Pacific/Wallis", "(GMT+1200) Pacific/Wallis"),
-                    ("Antarctica/McMurdo", "(GMT+1300) Antarctica/McMurdo"),
-                    ("Pacific/Apia", "(GMT+1300) Pacific/Apia"),
-                    ("Pacific/Auckland", "(GMT+1300) Pacific/Auckland"),
-                    ("Pacific/Fakaofo", "(GMT+1300) Pacific/Fakaofo"),
-                    ("Pacific/Kanton", "(GMT+1300) Pacific/Kanton"),
-                    ("Pacific/Tongatapu", "(GMT+1300) Pacific/Tongatapu"),
-                    ("Pacific/Chatham", "(GMT+1345) Pacific/Chatham"),
-                    ("Pacific/Kiritimati", "(GMT+1400) Pacific/Kiritimati"),
-                ],
-                max_length=255,
-                null=True,
-            ),
-        ),
-    ]

vrobbler/apps/profiles/migrations/0007_alter_userprofile_timezone.py

@@ -1,602 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-22 22:26
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("profiles", "0006_alter_userprofile_timezone"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="userprofile",
-            name="timezone",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("Pacific/Midway", "(GMT-1100) Pacific/Midway"),
-                    ("Pacific/Niue", "(GMT-1100) Pacific/Niue"),
-                    ("Pacific/Pago_Pago", "(GMT-1100) Pacific/Pago_Pago"),
-                    ("Pacific/Honolulu", "(GMT-1000) Pacific/Honolulu"),
-                    ("Pacific/Rarotonga", "(GMT-1000) Pacific/Rarotonga"),
-                    ("Pacific/Tahiti", "(GMT-1000) Pacific/Tahiti"),
-                    ("US/Hawaii", "(GMT-1000) US/Hawaii"),
-                    ("Pacific/Marquesas", "(GMT-0930) Pacific/Marquesas"),
-                    ("America/Adak", "(GMT-0900) America/Adak"),
-                    ("Pacific/Gambier", "(GMT-0900) Pacific/Gambier"),
-                    ("America/Anchorage", "(GMT-0800) America/Anchorage"),
-                    ("America/Juneau", "(GMT-0800) America/Juneau"),
-                    ("America/Metlakatla", "(GMT-0800) America/Metlakatla"),
-                    ("America/Nome", "(GMT-0800) America/Nome"),
-                    ("America/Sitka", "(GMT-0800) America/Sitka"),
-                    ("America/Yakutat", "(GMT-0800) America/Yakutat"),
-                    ("Pacific/Pitcairn", "(GMT-0800) Pacific/Pitcairn"),
-                    ("US/Alaska", "(GMT-0800) US/Alaska"),
-                    ("America/Creston", "(GMT-0700) America/Creston"),
-                    ("America/Dawson", "(GMT-0700) America/Dawson"),
-                    (
-                        "America/Dawson_Creek",
-                        "(GMT-0700) America/Dawson_Creek",
-                    ),
-                    ("America/Fort_Nelson", "(GMT-0700) America/Fort_Nelson"),
-                    ("America/Hermosillo", "(GMT-0700) America/Hermosillo"),
-                    ("America/Los_Angeles", "(GMT-0700) America/Los_Angeles"),
-                    ("America/Mazatlan", "(GMT-0700) America/Mazatlan"),
-                    ("America/Phoenix", "(GMT-0700) America/Phoenix"),
-                    ("America/Tijuana", "(GMT-0700) America/Tijuana"),
-                    ("America/Vancouver", "(GMT-0700) America/Vancouver"),
-                    ("America/Whitehorse", "(GMT-0700) America/Whitehorse"),
-                    ("Canada/Pacific", "(GMT-0700) Canada/Pacific"),
-                    ("US/Arizona", "(GMT-0700) US/Arizona"),
-                    ("US/Pacific", "(GMT-0700) US/Pacific"),
-                    (
-                        "America/Bahia_Banderas",
-                        "(GMT-0600) America/Bahia_Banderas",
-                    ),
-                    ("America/Belize", "(GMT-0600) America/Belize"),
-                    ("America/Boise", "(GMT-0600) America/Boise"),
-                    (
-                        "America/Cambridge_Bay",
-                        "(GMT-0600) America/Cambridge_Bay",
-                    ),
-                    ("America/Chihuahua", "(GMT-0600) America/Chihuahua"),
-                    (
-                        "America/Ciudad_Juarez",
-                        "(GMT-0600) America/Ciudad_Juarez",
-                    ),
-                    ("America/Costa_Rica", "(GMT-0600) America/Costa_Rica"),
-                    ("America/Denver", "(GMT-0600) America/Denver"),
-                    ("America/Edmonton", "(GMT-0600) America/Edmonton"),
-                    ("America/El_Salvador", "(GMT-0600) America/El_Salvador"),
-                    ("America/Guatemala", "(GMT-0600) America/Guatemala"),
-                    ("America/Inuvik", "(GMT-0600) America/Inuvik"),
-                    ("America/Managua", "(GMT-0600) America/Managua"),
-                    ("America/Merida", "(GMT-0600) America/Merida"),
-                    ("America/Mexico_City", "(GMT-0600) America/Mexico_City"),
-                    ("America/Monterrey", "(GMT-0600) America/Monterrey"),
-                    ("America/Regina", "(GMT-0600) America/Regina"),
-                    (
-                        "America/Swift_Current",
-                        "(GMT-0600) America/Swift_Current",
-                    ),
-                    ("America/Tegucigalpa", "(GMT-0600) America/Tegucigalpa"),
-                    ("America/Yellowknife", "(GMT-0600) America/Yellowknife"),
-                    ("Canada/Mountain", "(GMT-0600) Canada/Mountain"),
-                    ("Pacific/Galapagos", "(GMT-0600) Pacific/Galapagos"),
-                    ("US/Mountain", "(GMT-0600) US/Mountain"),
-                    ("America/Atikokan", "(GMT-0500) America/Atikokan"),
-                    ("America/Bogota", "(GMT-0500) America/Bogota"),
-                    ("America/Cancun", "(GMT-0500) America/Cancun"),
-                    ("America/Cayman", "(GMT-0500) America/Cayman"),
-                    ("America/Chicago", "(GMT-0500) America/Chicago"),
-                    ("America/Eirunepe", "(GMT-0500) America/Eirunepe"),
-                    ("America/Guayaquil", "(GMT-0500) America/Guayaquil"),
-                    (
-                        "America/Indiana/Knox",
-                        "(GMT-0500) America/Indiana/Knox",
-                    ),
-                    (
-                        "America/Indiana/Tell_City",
-                        "(GMT-0500) America/Indiana/Tell_City",
-                    ),
-                    ("America/Jamaica", "(GMT-0500) America/Jamaica"),
-                    ("America/Lima", "(GMT-0500) America/Lima"),
-                    ("America/Matamoros", "(GMT-0500) America/Matamoros"),
-                    ("America/Menominee", "(GMT-0500) America/Menominee"),
-                    (
-                        "America/North_Dakota/Beulah",
-                        "(GMT-0500) America/North_Dakota/Beulah",
-                    ),
-                    (
-                        "America/North_Dakota/Center",
-                        "(GMT-0500) America/North_Dakota/Center",
-                    ),
-                    (
-                        "America/North_Dakota/New_Salem",
-                        "(GMT-0500) America/North_Dakota/New_Salem",
-                    ),
-                    ("America/Ojinaga", "(GMT-0500) America/Ojinaga"),
-                    ("America/Panama", "(GMT-0500) America/Panama"),
-                    (
-                        "America/Rankin_Inlet",
-                        "(GMT-0500) America/Rankin_Inlet",
-                    ),
-                    ("America/Resolute", "(GMT-0500) America/Resolute"),
-                    ("America/Rio_Branco", "(GMT-0500) America/Rio_Branco"),
-                    ("America/Winnipeg", "(GMT-0500) America/Winnipeg"),
-                    ("Canada/Central", "(GMT-0500) Canada/Central"),
-                    ("Pacific/Easter", "(GMT-0500) Pacific/Easter"),
-                    ("US/Central", "(GMT-0500) US/Central"),
-                    ("America/Anguilla", "(GMT-0400) America/Anguilla"),
-                    ("America/Antigua", "(GMT-0400) America/Antigua"),
-                    ("America/Aruba", "(GMT-0400) America/Aruba"),
-                    ("America/Barbados", "(GMT-0400) America/Barbados"),
-                    (
-                        "America/Blanc-Sablon",
-                        "(GMT-0400) America/Blanc-Sablon",
-                    ),
-                    ("America/Boa_Vista", "(GMT-0400) America/Boa_Vista"),
-                    (
-                        "America/Campo_Grande",
-                        "(GMT-0400) America/Campo_Grande",
-                    ),
-                    ("America/Caracas", "(GMT-0400) America/Caracas"),
-                    ("America/Cuiaba", "(GMT-0400) America/Cuiaba"),
-                    ("America/Curacao", "(GMT-0400) America/Curacao"),
-                    ("America/Detroit", "(GMT-0400) America/Detroit"),
-                    ("America/Dominica", "(GMT-0400) America/Dominica"),
-                    ("America/Grand_Turk", "(GMT-0400) America/Grand_Turk"),
-                    ("America/Grenada", "(GMT-0400) America/Grenada"),
-                    ("America/Guadeloupe", "(GMT-0400) America/Guadeloupe"),
-                    ("America/Guyana", "(GMT-0400) America/Guyana"),
-                    ("America/Havana", "(GMT-0400) America/Havana"),
-                    (
-                        "America/Indiana/Indianapolis",
-                        "(GMT-0400) America/Indiana/Indianapolis",
-                    ),
-                    (
-                        "America/Indiana/Marengo",
-                        "(GMT-0400) America/Indiana/Marengo",
-                    ),
-                    (
-                        "America/Indiana/Petersburg",
-                        "(GMT-0400) America/Indiana/Petersburg",
-                    ),
-                    (
-                        "America/Indiana/Vevay",
-                        "(GMT-0400) America/Indiana/Vevay",
-                    ),
-                    (
-                        "America/Indiana/Vincennes",
-                        "(GMT-0400) America/Indiana/Vincennes",
-                    ),
-                    (
-                        "America/Indiana/Winamac",
-                        "(GMT-0400) America/Indiana/Winamac",
-                    ),
-                    ("America/Iqaluit", "(GMT-0400) America/Iqaluit"),
-                    (
-                        "America/Kentucky/Louisville",
-                        "(GMT-0400) America/Kentucky/Louisville",
-                    ),
-                    (
-                        "America/Kentucky/Monticello",
-                        "(GMT-0400) America/Kentucky/Monticello",
-                    ),
-                    ("America/Kralendijk", "(GMT-0400) America/Kralendijk"),
-                    ("America/La_Paz", "(GMT-0400) America/La_Paz"),
-                    (
-                        "America/Lower_Princes",
-                        "(GMT-0400) America/Lower_Princes",
-                    ),
-                    ("America/Manaus", "(GMT-0400) America/Manaus"),
-                    ("America/Marigot", "(GMT-0400) America/Marigot"),
-                    ("America/Martinique", "(GMT-0400) America/Martinique"),
-                    ("America/Montserrat", "(GMT-0400) America/Montserrat"),
-                    ("America/Nassau", "(GMT-0400) America/Nassau"),
-                    ("America/New_York", "(GMT-0400) America/New_York"),
-                    (
-                        "America/Port-au-Prince",
-                        "(GMT-0400) America/Port-au-Prince",
-                    ),
-                    (
-                        "America/Port_of_Spain",
-                        "(GMT-0400) America/Port_of_Spain",
-                    ),
-                    ("America/Porto_Velho", "(GMT-0400) America/Porto_Velho"),
-                    ("America/Puerto_Rico", "(GMT-0400) America/Puerto_Rico"),
-                    (
-                        "America/Santo_Domingo",
-                        "(GMT-0400) America/Santo_Domingo",
-                    ),
-                    (
-                        "America/St_Barthelemy",
-                        "(GMT-0400) America/St_Barthelemy",
-                    ),
-                    ("America/St_Kitts", "(GMT-0400) America/St_Kitts"),
-                    ("America/St_Lucia", "(GMT-0400) America/St_Lucia"),
-                    ("America/St_Thomas", "(GMT-0400) America/St_Thomas"),
-                    ("America/St_Vincent", "(GMT-0400) America/St_Vincent"),
-                    ("America/Toronto", "(GMT-0400) America/Toronto"),
-                    ("America/Tortola", "(GMT-0400) America/Tortola"),
-                    ("Canada/Eastern", "(GMT-0400) Canada/Eastern"),
-                    ("US/Eastern", "(GMT-0400) US/Eastern"),
-                    ("America/Araguaina", "(GMT-0300) America/Araguaina"),
-                    (
-                        "America/Argentina/Buenos_Aires",
-                        "(GMT-0300) America/Argentina/Buenos_Aires",
-                    ),
-                    (
-                        "America/Argentina/Catamarca",
-                        "(GMT-0300) America/Argentina/Catamarca",
-                    ),
-                    (
-                        "America/Argentina/Cordoba",
-                        "(GMT-0300) America/Argentina/Cordoba",
-                    ),
-                    (
-                        "America/Argentina/Jujuy",
-                        "(GMT-0300) America/Argentina/Jujuy",
-                    ),
-                    (
-                        "America/Argentina/La_Rioja",
-                        "(GMT-0300) America/Argentina/La_Rioja",
-                    ),
-                    (
-                        "America/Argentina/Mendoza",
-                        "(GMT-0300) America/Argentina/Mendoza",
-                    ),
-                    (
-                        "America/Argentina/Rio_Gallegos",
-                        "(GMT-0300) America/Argentina/Rio_Gallegos",
-                    ),
-                    (
-                        "America/Argentina/Salta",
-                        "(GMT-0300) America/Argentina/Salta",
-                    ),
-                    (
-                        "America/Argentina/San_Juan",
-                        "(GMT-0300) America/Argentina/San_Juan",
-                    ),
-                    (
-                        "America/Argentina/San_Luis",
-                        "(GMT-0300) America/Argentina/San_Luis",
-                    ),
-                    (
-                        "America/Argentina/Tucuman",
-                        "(GMT-0300) America/Argentina/Tucuman",
-                    ),
-                    (
-                        "America/Argentina/Ushuaia",
-                        "(GMT-0300) America/Argentina/Ushuaia",
-                    ),
-                    ("America/Asuncion", "(GMT-0300) America/Asuncion"),
-                    ("America/Bahia", "(GMT-0300) America/Bahia"),
-                    ("America/Belem", "(GMT-0300) America/Belem"),
-                    ("America/Cayenne", "(GMT-0300) America/Cayenne"),
-                    ("America/Fortaleza", "(GMT-0300) America/Fortaleza"),
-                    ("America/Glace_Bay", "(GMT-0300) America/Glace_Bay"),
-                    ("America/Goose_Bay", "(GMT-0300) America/Goose_Bay"),
-                    ("America/Halifax", "(GMT-0300) America/Halifax"),
-                    ("America/Maceio", "(GMT-0300) America/Maceio"),
-                    ("America/Moncton", "(GMT-0300) America/Moncton"),
-                    ("America/Montevideo", "(GMT-0300) America/Montevideo"),
-                    ("America/Nuuk", "(GMT-0300) America/Nuuk"),
-                    ("America/Paramaribo", "(GMT-0300) America/Paramaribo"),
-                    (
-                        "America/Punta_Arenas",
-                        "(GMT-0300) America/Punta_Arenas",
-                    ),
-                    ("America/Recife", "(GMT-0300) America/Recife"),
-                    ("America/Santarem", "(GMT-0300) America/Santarem"),
-                    ("America/Santiago", "(GMT-0300) America/Santiago"),
-                    ("America/Sao_Paulo", "(GMT-0300) America/Sao_Paulo"),
-                    ("America/Thule", "(GMT-0300) America/Thule"),
-                    ("Antarctica/Palmer", "(GMT-0300) Antarctica/Palmer"),
-                    ("Antarctica/Rothera", "(GMT-0300) Antarctica/Rothera"),
-                    ("Atlantic/Bermuda", "(GMT-0300) Atlantic/Bermuda"),
-                    ("Atlantic/Stanley", "(GMT-0300) Atlantic/Stanley"),
-                    ("Canada/Atlantic", "(GMT-0300) Canada/Atlantic"),
-                    ("America/St_Johns", "(GMT-0230) America/St_Johns"),
-                    ("Canada/Newfoundland", "(GMT-0230) Canada/Newfoundland"),
-                    ("America/Miquelon", "(GMT-0200) America/Miquelon"),
-                    ("America/Noronha", "(GMT-0200) America/Noronha"),
-                    (
-                        "Atlantic/South_Georgia",
-                        "(GMT-0200) Atlantic/South_Georgia",
-                    ),
-                    (
-                        "America/Scoresbysund",
-                        "(GMT-0100) America/Scoresbysund",
-                    ),
-                    ("Atlantic/Azores", "(GMT-0100) Atlantic/Azores"),
-                    ("Atlantic/Cape_Verde", "(GMT-0100) Atlantic/Cape_Verde"),
-                    ("Africa/Abidjan", "(GMT+0000) Africa/Abidjan"),
-                    ("Africa/Accra", "(GMT+0000) Africa/Accra"),
-                    ("Africa/Bamako", "(GMT+0000) Africa/Bamako"),
-                    ("Africa/Banjul", "(GMT+0000) Africa/Banjul"),
-                    ("Africa/Bissau", "(GMT+0000) Africa/Bissau"),
-                    ("Africa/Casablanca", "(GMT+0000) Africa/Casablanca"),
-                    ("Africa/Conakry", "(GMT+0000) Africa/Conakry"),
-                    ("Africa/Dakar", "(GMT+0000) Africa/Dakar"),
-                    ("Africa/El_Aaiun", "(GMT+0000) Africa/El_Aaiun"),
-                    ("Africa/Freetown", "(GMT+0000) Africa/Freetown"),
-                    ("Africa/Lome", "(GMT+0000) Africa/Lome"),
-                    ("Africa/Monrovia", "(GMT+0000) Africa/Monrovia"),
-                    ("Africa/Nouakchott", "(GMT+0000) Africa/Nouakchott"),
-                    ("Africa/Ouagadougou", "(GMT+0000) Africa/Ouagadougou"),
-                    ("Africa/Sao_Tome", "(GMT+0000) Africa/Sao_Tome"),
-                    (
-                        "America/Danmarkshavn",
-                        "(GMT+0000) America/Danmarkshavn",
-                    ),
-                    ("Antarctica/Troll", "(GMT+0000) Antarctica/Troll"),
-                    ("Atlantic/Canary", "(GMT+0000) Atlantic/Canary"),
-                    ("Atlantic/Faroe", "(GMT+0000) Atlantic/Faroe"),
-                    ("Atlantic/Madeira", "(GMT+0000) Atlantic/Madeira"),
-                    ("Atlantic/Reykjavik", "(GMT+0000) Atlantic/Reykjavik"),
-                    ("Atlantic/St_Helena", "(GMT+0000) Atlantic/St_Helena"),
-                    ("Europe/Dublin", "(GMT+0000) Europe/Dublin"),
-                    ("Europe/Guernsey", "(GMT+0000) Europe/Guernsey"),
-                    ("Europe/Isle_of_Man", "(GMT+0000) Europe/Isle_of_Man"),
-                    ("Europe/Jersey", "(GMT+0000) Europe/Jersey"),
-                    ("Europe/Lisbon", "(GMT+0000) Europe/Lisbon"),
-                    ("Europe/London", "(GMT+0000) Europe/London"),
-                    ("GMT", "(GMT+0000) GMT"),
-                    ("UTC", "(GMT+0000) UTC"),
-                    ("Africa/Algiers", "(GMT+0100) Africa/Algiers"),
-                    ("Africa/Bangui", "(GMT+0100) Africa/Bangui"),
-                    ("Africa/Brazzaville", "(GMT+0100) Africa/Brazzaville"),
-                    ("Africa/Ceuta", "(GMT+0100) Africa/Ceuta"),
-                    ("Africa/Douala", "(GMT+0100) Africa/Douala"),
-                    ("Africa/Kinshasa", "(GMT+0100) Africa/Kinshasa"),
-                    ("Africa/Lagos", "(GMT+0100) Africa/Lagos"),
-                    ("Africa/Libreville", "(GMT+0100) Africa/Libreville"),
-                    ("Africa/Luanda", "(GMT+0100) Africa/Luanda"),
-                    ("Africa/Malabo", "(GMT+0100) Africa/Malabo"),
-                    ("Africa/Ndjamena", "(GMT+0100) Africa/Ndjamena"),
-                    ("Africa/Niamey", "(GMT+0100) Africa/Niamey"),
-                    ("Africa/Porto-Novo", "(GMT+0100) Africa/Porto-Novo"),
-                    ("Africa/Tunis", "(GMT+0100) Africa/Tunis"),
-                    ("Arctic/Longyearbyen", "(GMT+0100) Arctic/Longyearbyen"),
-                    ("Europe/Amsterdam", "(GMT+0100) Europe/Amsterdam"),
-                    ("Europe/Andorra", "(GMT+0100) Europe/Andorra"),
-                    ("Europe/Belgrade", "(GMT+0100) Europe/Belgrade"),
-                    ("Europe/Berlin", "(GMT+0100) Europe/Berlin"),
-                    ("Europe/Bratislava", "(GMT+0100) Europe/Bratislava"),
-                    ("Europe/Brussels", "(GMT+0100) Europe/Brussels"),
-                    ("Europe/Budapest", "(GMT+0100) Europe/Budapest"),
-                    ("Europe/Busingen", "(GMT+0100) Europe/Busingen"),
-                    ("Europe/Copenhagen", "(GMT+0100) Europe/Copenhagen"),
-                    ("Europe/Gibraltar", "(GMT+0100) Europe/Gibraltar"),
-                    ("Europe/Ljubljana", "(GMT+0100) Europe/Ljubljana"),
-                    ("Europe/Luxembourg", "(GMT+0100) Europe/Luxembourg"),
-                    ("Europe/Madrid", "(GMT+0100) Europe/Madrid"),
-                    ("Europe/Malta", "(GMT+0100) Europe/Malta"),
-                    ("Europe/Monaco", "(GMT+0100) Europe/Monaco"),
-                    ("Europe/Oslo", "(GMT+0100) Europe/Oslo"),
-                    ("Europe/Paris", "(GMT+0100) Europe/Paris"),
-                    ("Europe/Podgorica", "(GMT+0100) Europe/Podgorica"),
-                    ("Europe/Prague", "(GMT+0100) Europe/Prague"),
-                    ("Europe/Rome", "(GMT+0100) Europe/Rome"),
-                    ("Europe/San_Marino", "(GMT+0100) Europe/San_Marino"),
-                    ("Europe/Sarajevo", "(GMT+0100) Europe/Sarajevo"),
-                    ("Europe/Skopje", "(GMT+0100) Europe/Skopje"),
-                    ("Europe/Stockholm", "(GMT+0100) Europe/Stockholm"),
-                    ("Europe/Tirane", "(GMT+0100) Europe/Tirane"),
-                    ("Europe/Vaduz", "(GMT+0100) Europe/Vaduz"),
-                    ("Europe/Vatican", "(GMT+0100) Europe/Vatican"),
-                    ("Europe/Vienna", "(GMT+0100) Europe/Vienna"),
-                    ("Europe/Warsaw", "(GMT+0100) Europe/Warsaw"),
-                    ("Europe/Zagreb", "(GMT+0100) Europe/Zagreb"),
-                    ("Europe/Zurich", "(GMT+0100) Europe/Zurich"),
-                    ("Africa/Blantyre", "(GMT+0200) Africa/Blantyre"),
-                    ("Africa/Bujumbura", "(GMT+0200) Africa/Bujumbura"),
-                    ("Africa/Cairo", "(GMT+0200) Africa/Cairo"),
-                    ("Africa/Gaborone", "(GMT+0200) Africa/Gaborone"),
-                    ("Africa/Harare", "(GMT+0200) Africa/Harare"),
-                    ("Africa/Johannesburg", "(GMT+0200) Africa/Johannesburg"),
-                    ("Africa/Juba", "(GMT+0200) Africa/Juba"),
-                    ("Africa/Khartoum", "(GMT+0200) Africa/Khartoum"),
-                    ("Africa/Kigali", "(GMT+0200) Africa/Kigali"),
-                    ("Africa/Lubumbashi", "(GMT+0200) Africa/Lubumbashi"),
-                    ("Africa/Lusaka", "(GMT+0200) Africa/Lusaka"),
-                    ("Africa/Maputo", "(GMT+0200) Africa/Maputo"),
-                    ("Africa/Maseru", "(GMT+0200) Africa/Maseru"),
-                    ("Africa/Mbabane", "(GMT+0200) Africa/Mbabane"),
-                    ("Africa/Tripoli", "(GMT+0200) Africa/Tripoli"),
-                    ("Africa/Windhoek", "(GMT+0200) Africa/Windhoek"),
-                    ("Asia/Beirut", "(GMT+0200) Asia/Beirut"),
-                    ("Asia/Famagusta", "(GMT+0200) Asia/Famagusta"),
-                    ("Asia/Gaza", "(GMT+0200) Asia/Gaza"),
-                    ("Asia/Hebron", "(GMT+0200) Asia/Hebron"),
-                    ("Asia/Jerusalem", "(GMT+0200) Asia/Jerusalem"),
-                    ("Asia/Nicosia", "(GMT+0200) Asia/Nicosia"),
-                    ("Europe/Athens", "(GMT+0200) Europe/Athens"),
-                    ("Europe/Bucharest", "(GMT+0200) Europe/Bucharest"),
-                    ("Europe/Chisinau", "(GMT+0200) Europe/Chisinau"),
-                    ("Europe/Helsinki", "(GMT+0200) Europe/Helsinki"),
-                    ("Europe/Kaliningrad", "(GMT+0200) Europe/Kaliningrad"),
-                    ("Europe/Kyiv", "(GMT+0200) Europe/Kyiv"),
-                    ("Europe/Mariehamn", "(GMT+0200) Europe/Mariehamn"),
-                    ("Europe/Riga", "(GMT+0200) Europe/Riga"),
-                    ("Europe/Sofia", "(GMT+0200) Europe/Sofia"),
-                    ("Europe/Tallinn", "(GMT+0200) Europe/Tallinn"),
-                    ("Europe/Vilnius", "(GMT+0200) Europe/Vilnius"),
-                    ("Africa/Addis_Ababa", "(GMT+0300) Africa/Addis_Ababa"),
-                    ("Africa/Asmara", "(GMT+0300) Africa/Asmara"),
-                    (
-                        "Africa/Dar_es_Salaam",
-                        "(GMT+0300) Africa/Dar_es_Salaam",
-                    ),
-                    ("Africa/Djibouti", "(GMT+0300) Africa/Djibouti"),
-                    ("Africa/Kampala", "(GMT+0300) Africa/Kampala"),
-                    ("Africa/Mogadishu", "(GMT+0300) Africa/Mogadishu"),
-                    ("Africa/Nairobi", "(GMT+0300) Africa/Nairobi"),
-                    ("Antarctica/Syowa", "(GMT+0300) Antarctica/Syowa"),
-                    ("Asia/Aden", "(GMT+0300) Asia/Aden"),
-                    ("Asia/Amman", "(GMT+0300) Asia/Amman"),
-                    ("Asia/Baghdad", "(GMT+0300) Asia/Baghdad"),
-                    ("Asia/Bahrain", "(GMT+0300) Asia/Bahrain"),
-                    ("Asia/Damascus", "(GMT+0300) Asia/Damascus"),
-                    ("Asia/Kuwait", "(GMT+0300) Asia/Kuwait"),
-                    ("Asia/Qatar", "(GMT+0300) Asia/Qatar"),
-                    ("Asia/Riyadh", "(GMT+0300) Asia/Riyadh"),
-                    ("Europe/Istanbul", "(GMT+0300) Europe/Istanbul"),
-                    ("Europe/Kirov", "(GMT+0300) Europe/Kirov"),
-                    ("Europe/Minsk", "(GMT+0300) Europe/Minsk"),
-                    ("Europe/Moscow", "(GMT+0300) Europe/Moscow"),
-                    ("Europe/Simferopol", "(GMT+0300) Europe/Simferopol"),
-                    ("Europe/Volgograd", "(GMT+0300) Europe/Volgograd"),
-                    ("Indian/Antananarivo", "(GMT+0300) Indian/Antananarivo"),
-                    ("Indian/Comoro", "(GMT+0300) Indian/Comoro"),
-                    ("Indian/Mayotte", "(GMT+0300) Indian/Mayotte"),
-                    ("Asia/Tehran", "(GMT+0330) Asia/Tehran"),
-                    ("Asia/Baku", "(GMT+0400) Asia/Baku"),
-                    ("Asia/Dubai", "(GMT+0400) Asia/Dubai"),
-                    ("Asia/Muscat", "(GMT+0400) Asia/Muscat"),
-                    ("Asia/Tbilisi", "(GMT+0400) Asia/Tbilisi"),
-                    ("Asia/Yerevan", "(GMT+0400) Asia/Yerevan"),
-                    ("Europe/Astrakhan", "(GMT+0400) Europe/Astrakhan"),
-                    ("Europe/Samara", "(GMT+0400) Europe/Samara"),
-                    ("Europe/Saratov", "(GMT+0400) Europe/Saratov"),
-                    ("Europe/Ulyanovsk", "(GMT+0400) Europe/Ulyanovsk"),
-                    ("Indian/Mahe", "(GMT+0400) Indian/Mahe"),
-                    ("Indian/Mauritius", "(GMT+0400) Indian/Mauritius"),
-                    ("Indian/Reunion", "(GMT+0400) Indian/Reunion"),
-                    ("Asia/Kabul", "(GMT+0430) Asia/Kabul"),
-                    ("Antarctica/Mawson", "(GMT+0500) Antarctica/Mawson"),
-                    ("Asia/Aqtau", "(GMT+0500) Asia/Aqtau"),
-                    ("Asia/Aqtobe", "(GMT+0500) Asia/Aqtobe"),
-                    ("Asia/Ashgabat", "(GMT+0500) Asia/Ashgabat"),
-                    ("Asia/Atyrau", "(GMT+0500) Asia/Atyrau"),
-                    ("Asia/Dushanbe", "(GMT+0500) Asia/Dushanbe"),
-                    ("Asia/Karachi", "(GMT+0500) Asia/Karachi"),
-                    ("Asia/Oral", "(GMT+0500) Asia/Oral"),
-                    ("Asia/Qyzylorda", "(GMT+0500) Asia/Qyzylorda"),
-                    ("Asia/Samarkand", "(GMT+0500) Asia/Samarkand"),
-                    ("Asia/Tashkent", "(GMT+0500) Asia/Tashkent"),
-                    ("Asia/Yekaterinburg", "(GMT+0500) Asia/Yekaterinburg"),
-                    ("Indian/Kerguelen", "(GMT+0500) Indian/Kerguelen"),
-                    ("Indian/Maldives", "(GMT+0500) Indian/Maldives"),
-                    ("Asia/Colombo", "(GMT+0530) Asia/Colombo"),
-                    ("Asia/Kolkata", "(GMT+0530) Asia/Kolkata"),
-                    ("Asia/Kathmandu", "(GMT+0545) Asia/Kathmandu"),
-                    ("Antarctica/Vostok", "(GMT+0600) Antarctica/Vostok"),
-                    ("Asia/Almaty", "(GMT+0600) Asia/Almaty"),
-                    ("Asia/Bishkek", "(GMT+0600) Asia/Bishkek"),
-                    ("Asia/Dhaka", "(GMT+0600) Asia/Dhaka"),
-                    ("Asia/Omsk", "(GMT+0600) Asia/Omsk"),
-                    ("Asia/Qostanay", "(GMT+0600) Asia/Qostanay"),
-                    ("Asia/Thimphu", "(GMT+0600) Asia/Thimphu"),
-                    ("Asia/Urumqi", "(GMT+0600) Asia/Urumqi"),
-                    ("Indian/Chagos", "(GMT+0600) Indian/Chagos"),
-                    ("Asia/Yangon", "(GMT+0630) Asia/Yangon"),
-                    ("Indian/Cocos", "(GMT+0630) Indian/Cocos"),
-                    ("Antarctica/Davis", "(GMT+0700) Antarctica/Davis"),
-                    ("Asia/Bangkok", "(GMT+0700) Asia/Bangkok"),
-                    ("Asia/Barnaul", "(GMT+0700) Asia/Barnaul"),
-                    ("Asia/Ho_Chi_Minh", "(GMT+0700) Asia/Ho_Chi_Minh"),
-                    ("Asia/Hovd", "(GMT+0700) Asia/Hovd"),
-                    ("Asia/Jakarta", "(GMT+0700) Asia/Jakarta"),
-                    ("Asia/Krasnoyarsk", "(GMT+0700) Asia/Krasnoyarsk"),
-                    ("Asia/Novokuznetsk", "(GMT+0700) Asia/Novokuznetsk"),
-                    ("Asia/Novosibirsk", "(GMT+0700) Asia/Novosibirsk"),
-                    ("Asia/Phnom_Penh", "(GMT+0700) Asia/Phnom_Penh"),
-                    ("Asia/Pontianak", "(GMT+0700) Asia/Pontianak"),
-                    ("Asia/Tomsk", "(GMT+0700) Asia/Tomsk"),
-                    ("Asia/Vientiane", "(GMT+0700) Asia/Vientiane"),
-                    ("Indian/Christmas", "(GMT+0700) Indian/Christmas"),
-                    ("Asia/Brunei", "(GMT+0800) Asia/Brunei"),
-                    ("Asia/Choibalsan", "(GMT+0800) Asia/Choibalsan"),
-                    ("Asia/Hong_Kong", "(GMT+0800) Asia/Hong_Kong"),
-                    ("Asia/Irkutsk", "(GMT+0800) Asia/Irkutsk"),
-                    ("Asia/Kuala_Lumpur", "(GMT+0800) Asia/Kuala_Lumpur"),
-                    ("Asia/Kuching", "(GMT+0800) Asia/Kuching"),
-                    ("Asia/Macau", "(GMT+0800) Asia/Macau"),
-                    ("Asia/Makassar", "(GMT+0800) Asia/Makassar"),
-                    ("Asia/Manila", "(GMT+0800) Asia/Manila"),
-                    ("Asia/Shanghai", "(GMT+0800) Asia/Shanghai"),
-                    ("Asia/Singapore", "(GMT+0800) Asia/Singapore"),
-                    ("Asia/Taipei", "(GMT+0800) Asia/Taipei"),
-                    ("Asia/Ulaanbaatar", "(GMT+0800) Asia/Ulaanbaatar"),
-                    ("Australia/Perth", "(GMT+0800) Australia/Perth"),
-                    ("Australia/Eucla", "(GMT+0845) Australia/Eucla"),
-                    ("Asia/Chita", "(GMT+0900) Asia/Chita"),
-                    ("Asia/Dili", "(GMT+0900) Asia/Dili"),
-                    ("Asia/Jayapura", "(GMT+0900) Asia/Jayapura"),
-                    ("Asia/Khandyga", "(GMT+0900) Asia/Khandyga"),
-                    ("Asia/Pyongyang", "(GMT+0900) Asia/Pyongyang"),
-                    ("Asia/Seoul", "(GMT+0900) Asia/Seoul"),
-                    ("Asia/Tokyo", "(GMT+0900) Asia/Tokyo"),
-                    ("Asia/Yakutsk", "(GMT+0900) Asia/Yakutsk"),
-                    ("Pacific/Palau", "(GMT+0900) Pacific/Palau"),
-                    ("Australia/Darwin", "(GMT+0930) Australia/Darwin"),
-                    (
-                        "Antarctica/DumontDUrville",
-                        "(GMT+1000) Antarctica/DumontDUrville",
-                    ),
-                    ("Asia/Ust-Nera", "(GMT+1000) Asia/Ust-Nera"),
-                    ("Asia/Vladivostok", "(GMT+1000) Asia/Vladivostok"),
-                    ("Australia/Brisbane", "(GMT+1000) Australia/Brisbane"),
-                    ("Australia/Lindeman", "(GMT+1000) Australia/Lindeman"),
-                    ("Pacific/Chuuk", "(GMT+1000) Pacific/Chuuk"),
-                    ("Pacific/Guam", "(GMT+1000) Pacific/Guam"),
-                    (
-                        "Pacific/Port_Moresby",
-                        "(GMT+1000) Pacific/Port_Moresby",
-                    ),
-                    ("Pacific/Saipan", "(GMT+1000) Pacific/Saipan"),
-                    ("Australia/Adelaide", "(GMT+1030) Australia/Adelaide"),
-                    (
-                        "Australia/Broken_Hill",
-                        "(GMT+1030) Australia/Broken_Hill",
-                    ),
-                    ("Antarctica/Casey", "(GMT+1100) Antarctica/Casey"),
-                    (
-                        "Antarctica/Macquarie",
-                        "(GMT+1100) Antarctica/Macquarie",
-                    ),
-                    ("Asia/Magadan", "(GMT+1100) Asia/Magadan"),
-                    ("Asia/Sakhalin", "(GMT+1100) Asia/Sakhalin"),
-                    ("Asia/Srednekolymsk", "(GMT+1100) Asia/Srednekolymsk"),
-                    ("Australia/Hobart", "(GMT+1100) Australia/Hobart"),
-                    ("Australia/Lord_Howe", "(GMT+1100) Australia/Lord_Howe"),
-                    ("Australia/Melbourne", "(GMT+1100) Australia/Melbourne"),
-                    ("Australia/Sydney", "(GMT+1100) Australia/Sydney"),
-                    (
-                        "Pacific/Bougainville",
-                        "(GMT+1100) Pacific/Bougainville",
-                    ),
-                    ("Pacific/Efate", "(GMT+1100) Pacific/Efate"),
-                    ("Pacific/Guadalcanal", "(GMT+1100) Pacific/Guadalcanal"),
-                    ("Pacific/Kosrae", "(GMT+1100) Pacific/Kosrae"),
-                    ("Pacific/Noumea", "(GMT+1100) Pacific/Noumea"),
-                    ("Pacific/Pohnpei", "(GMT+1100) Pacific/Pohnpei"),
-                    ("Asia/Anadyr", "(GMT+1200) Asia/Anadyr"),
-                    ("Asia/Kamchatka", "(GMT+1200) Asia/Kamchatka"),
-                    ("Pacific/Fiji", "(GMT+1200) Pacific/Fiji"),
-                    ("Pacific/Funafuti", "(GMT+1200) Pacific/Funafuti"),
-                    ("Pacific/Kwajalein", "(GMT+1200) Pacific/Kwajalein"),
-                    ("Pacific/Majuro", "(GMT+1200) Pacific/Majuro"),
-                    ("Pacific/Nauru", "(GMT+1200) Pacific/Nauru"),
-                    ("Pacific/Norfolk", "(GMT+1200) Pacific/Norfolk"),
-                    ("Pacific/Tarawa", "(GMT+1200) Pacific/Tarawa"),
-                    ("Pacific/Wake", "(GMT+1200) Pacific/Wake"),
-                    ("Pacific/Wallis", "(GMT+1200) Pacific/Wallis"),
-                    ("Antarctica/McMurdo", "(GMT+1300) Antarctica/McMurdo"),
-                    ("Pacific/Apia", "(GMT+1300) Pacific/Apia"),
-                    ("Pacific/Auckland", "(GMT+1300) Pacific/Auckland"),
-                    ("Pacific/Fakaofo", "(GMT+1300) Pacific/Fakaofo"),
-                    ("Pacific/Kanton", "(GMT+1300) Pacific/Kanton"),
-                    ("Pacific/Tongatapu", "(GMT+1300) Pacific/Tongatapu"),
-                    ("Pacific/Chatham", "(GMT+1345) Pacific/Chatham"),
-                    ("Pacific/Kiritimati", "(GMT+1400) Pacific/Kiritimati"),
-                ],
-                max_length=255,
-                null=True,
-            ),
-        ),
-    ]

vrobbler/apps/profiles/models.py

@@ -1,13 +1,12 @@
-from datetime import timedelta
-
 import pytz
-from django.utils import timezone
+
 from django.contrib.auth import get_user_model
 from django.db import models
 from django_extensions.db.models import TimeStampedModel
-from encrypted_field import EncryptedField
 from profiles.constants import PRETTY_TIMEZONE_CHOICES
 
+from encrypted_field import EncryptedField
+
 User = get_user_model()
 BNULL = {"blank": True, "null": True}
 
@@ -17,9 +16,7 @@ class UserProfile(TimeStampedModel):
         User, on_delete=models.CASCADE, related_name="profile"
     )
     timezone = models.CharField(
-        max_length=255,
-        choices=PRETTY_TIMEZONE_CHOICES,
-        **BNULL,
+        max_length=255, choices=PRETTY_TIMEZONE_CHOICES, default=pytz.UTC
     )
     lastfm_username = models.CharField(max_length=255, **BNULL)
     lastfm_password = EncryptedField(**BNULL)

vrobbler/apps/profiles/utils.py

@@ -1,18 +1,23 @@
+import datetime
+
 import pytz
 from django.conf import settings
 from django.utils import timezone
-import calendar
 
-from datetime import datetime, timedelta
 
 # need to translate to a non-naive timezone, even if timezone == settings.TIME_ZONE, so we can compare two dates
 def to_user_timezone(date, profile):
     timezone = profile.timezone if profile.timezone else settings.TIME_ZONE
-    return date.astimezone(pytz.timezone(timezone))
+    return date.replace(tzinfo=pytz.timezone(settings.TIME_ZONE)).astimezone(
+        pytz.timezone(timezone)
+    )
 
 
-def to_system_timezone(date):
-    return date.astimezone(pytz.timezone(settings.TIME_ZONE))
+def to_system_timezone(date, profile):
+    timezone = profile.timezone if profile.timezone else settings.TIME_ZONE
+    return date.replace(tzinfo=pytz.timezone(timezone)).astimezone(
+        pytz.timezone(settings.TIME_ZONE)
+    )
 
 
 def now_user_timezone(profile):
@@ -20,39 +25,9 @@ def now_user_timezone(profile):
     return timezone.localtime(timezone.now())
 
 
-def start_of_day(dt, profile) -> datetime:
-    """Get the start of the day in the profile's timezone"""
-    timezone = profile.timezone if profile.timezone else settings.TIME_ZONE
-    tzinfo = pytz.timezone(timezone)
-    return datetime.combine(dt, datetime.min.time(), tzinfo)
-
-
-def end_of_day(dt, profile) -> datetime:
-    """Get the start of the day in the profile's timezone"""
-    timezone = profile.timezone if profile.timezone else settings.TIME_ZONE
-    tzinfo = pytz.timezone(timezone)
-    return datetime.combine(dt, datetime.max.time(), tzinfo)
-
-
-def start_of_week(dt, profile) -> datetime:
-    # TODO allow profile to set start of week
-    return start_of_day(dt, profile) - timedelta(dt.weekday())
-
-
-def end_of_week(dt, profile) -> datetime:
-    # TODO allow profile to set start of week
-    return start_of_week(dt, profile) + timedelta(days=6)
-
-
-def start_of_month(dt, profile) -> datetime:
-    return start_of_day(dt, profile).replace(day=1)
-
-
-def end_of_month(dt, profile) -> datetime:
-    next_month = end_of_day(dt, profile).replace(day=28) + timedelta(days=4)
-    # subtracting the number of the current day brings us back one month
-    return next_month - timedelta(days=next_month.day)
-
-
-def start_of_year(dt, profile) -> datetime:
-    return start_of_day(dt, profile).replace(month=1, day=1)
+def now_system_timezone():
+    return (
+        datetime.datetime.now()
+        .replace(tzinfo=pytz.timezone(settings.TIME_ZONE))
+        .astimezone(pytz.timezone(settings.TIME_ZONE))
+    )

vrobbler/apps/scrobbles/admin.py

@@ -6,22 +6,13 @@ from scrobbles.models import (
     LastFmImport,
     Scrobble,
 )
-from scrobbles.mixins import Genre
 
 
 class ScrobbleInline(admin.TabularInline):
     model = Scrobble
     extra = 0
-    raw_id_fields = (
-        "video",
-        "podcast_episode",
-        "track",
-        "video_game",
-        "book",
-        "sport_event",
-        "user",
-    )
-    exclude = ("source_id", "scrobble_log")
+    raw_id_fields = ('video', 'podcast_episode', 'track')
+    exclude = ('source_id', 'scrobble_log')
 
 
 class ImportBaseAdmin(admin.ModelAdmin):
@@ -50,14 +41,6 @@ class KoReaderImportAdmin(ImportBaseAdmin):
     """"""
 
 
-@admin.register(Genre)
-class GenreAdmin(admin.ModelAdmin):
-    list_display = (
-        "name",
-        "source",
-    )
-
-
 @admin.register(ChartRecord)
 class ChartRecordAdmin(admin.ModelAdmin):
     date_hierarchy = "created"
@@ -74,7 +57,14 @@ class ChartRecordAdmin(admin.ModelAdmin):
     ordering = ("-created",)
 
     def media_name(self, obj):
-        return obj.media_obj
+        if obj.video:
+            return obj.video
+        if obj.track:
+            return obj.track
+        if obj.podcast_episode:
+            return obj.podcast_episode
+        if obj.sport_event:
+            return obj.sport_event
 
 
 @admin.register(Scrobble)
@@ -91,19 +81,13 @@ class ScrobbleAdmin(admin.ModelAdmin):
         "played_to_completion",
     )
     raw_id_fields = (
-        "video",
-        "podcast_episode",
-        "track",
-        "sport_event",
-        "book",
-        "video_game",
-    )
-    list_filter = (
-        "is_paused",
-        "in_progress",
-        "long_play_complete",
-        "source",
+        'video',
+        'podcast_episode',
+        'track',
+        'sport_event',
+        'book',
     )
+    list_filter = ("is_paused", "in_progress", "source", "track__artist")
     ordering = ("-timestamp",)
 
     def media_name(self, obj):
@@ -111,6 +95,14 @@ class ScrobbleAdmin(admin.ModelAdmin):
 
     def media_type(self, obj):
         return obj.media_obj.__class__.__name__
+        if obj.video:
+            return "Video"
+        if obj.track:
+            return "Track"
+        if obj.podcast_episode:
+            return "Podcast"
+        if obj.sport_event:
+            return "Sport Event"
 
     def playback_percent(self, obj):
         return obj.percent_played

vrobbler/apps/scrobbles/api/views.py

@@ -14,7 +14,7 @@ from scrobbles.models import (
 
 
 class ScrobbleViewSet(viewsets.ModelViewSet):
-    queryset = Scrobble.objects.all().order_by("-timestamp")
+    queryset = Scrobble.objects.all().order_by('-timestamp')
     serializer_class = ScrobbleSerializer
     permission_classes = [permissions.IsAuthenticated]
 
@@ -23,7 +23,7 @@ class ScrobbleViewSet(viewsets.ModelViewSet):
 
 
 class KoReaderImportViewSet(viewsets.ModelViewSet):
-    queryset = KoReaderImport.objects.all().order_by("-created")
+    queryset = KoReaderImport.objects.all().order_by('-created')
     serializer_class = KoReaderImportSerializer
     permission_classes = [permissions.IsAuthenticated]
 
@@ -32,7 +32,7 @@ class KoReaderImportViewSet(viewsets.ModelViewSet):
 
 
 class AudioScrobblerTSVImportViewSet(viewsets.ModelViewSet):
-    queryset = AudioScrobblerTSVImport.objects.all().order_by("-created")
+    queryset = AudioScrobblerTSVImport.objects.all().order_by('-created')
     serializer_class = AudioScrobblerTSVImportSerializer
     permission_classes = [permissions.IsAuthenticated]
 
@@ -41,7 +41,7 @@ class AudioScrobblerTSVImportViewSet(viewsets.ModelViewSet):
 
 
 class LastFmImportViewSet(viewsets.ModelViewSet):
-    queryset = LastFmImport.objects.all().order_by("-created")
+    queryset = LastFmImport.objects.all().order_by('-created')
     serializer_class = LastFmImportSerializer
     permission_classes = [permissions.IsAuthenticated]
 

vrobbler/apps/scrobbles/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class ScrobblesConfig(AppConfig):
-    name = "scrobbles"
+    name = 'scrobbles'

vrobbler/apps/scrobbles/constants.py

@@ -1,20 +1,2 @@
-from enum import Enum
-
 JELLYFIN_VIDEO_ITEM_TYPES = ["Episode", "Movie"]
 JELLYFIN_AUDIO_ITEM_TYPES = ["Audio"]
-
-LONG_PLAY_MEDIA = {
-    "videogames": "VideoGame",
-    "books": "Book",
-}
-
-
-class AsTsvColumn(Enum):
-    ARTIST_NAME = 0
-    ALBUM_NAME = 1
-    TRACK_NAME = 2
-    TRACK_NUMBER = 3
-    RUN_TIME_SECONDS = 4
-    COMPLETE = 5
-    TIMESTAMP = 6
-    MB_ID = 7

vrobbler/apps/scrobbles/context_processors.py

@@ -9,7 +9,7 @@ def now_playing(request):
     if not user.is_authenticated:
         return {}
     return {
-        "now_playing_list": Scrobble.objects.filter(
+        'now_playing_list': Scrobble.objects.filter(
             in_progress=True,
             is_paused=False,
             user=user,

vrobbler/apps/scrobbles/export.py

@@ -17,19 +17,19 @@ def export_scrobbles(start_date=None, end_date=None, format="AS"):
         start_query, end_query, track__isnull=False
     )
     headers = []
-    extension = "tsv"
-    delimiter = "\t"
+    extension = 'tsv'
+    delimiter = '\t'
 
     if format == "as":
         headers = [
-            ["#AUDIOSCROBBLER/1.1"],
-            ["#TZ/UTC"],
-            ["#CLIENT/Vrobbler 1.0.0"],
+            ['#AUDIOSCROBBLER/1.1'],
+            ['#TZ/UTC'],
+            ['#CLIENT/Vrobbler 1.0.0'],
         ]
 
     if format == "csv":
-        delimiter = ","
-        extension = "csv"
+        delimiter = ','
+        extension = 'csv'
         headers = [
             [
                 "artists",
@@ -43,7 +43,7 @@ def export_scrobbles(start_date=None, end_date=None, format="AS"):
             ]
         ]
 
-    with tempfile.NamedTemporaryFile(mode="w", delete=False) as outfile:
+    with tempfile.NamedTemporaryFile(mode='w', delete=False) as outfile:
         writer = csv.writer(outfile, delimiter=delimiter)
         for row in headers:
             writer.writerow(row)
@@ -52,7 +52,7 @@ def export_scrobbles(start_date=None, end_date=None, format="AS"):
             track = scrobble.track
             track_number = 0  # TODO Add track number
             track_rating = "S"  # TODO implement ratings?
-            track_artist = track.artist or track.album.album_artist
+            track_artist = track.artist or track.album.primary_artist
             row = [
                 track_artist,
                 track.album.name,
@@ -60,7 +60,7 @@ def export_scrobbles(start_date=None, end_date=None, format="AS"):
                 track_number,
                 track.run_time,
                 track_rating,
-                scrobble.timestamp.strftime("%s"),
+                scrobble.timestamp.strftime('%s'),
                 track.musicbrainz_id,
             ]
             writer.writerow(row)

vrobbler/apps/scrobbles/forms.py

@@ -5,9 +5,9 @@ class ExportScrobbleForm(forms.Form):
     """Provide options for downloading scrobbles"""
 
     EXPORT_TYPES = (
-        ("as", "Audioscrobbler"),
-        ("csv", "CSV"),
-        ("html", "HTML"),
+        ('as', 'Audioscrobbler'),
+        ('csv', 'CSV'),
+        ('html', 'HTML'),
     )
     export_type = forms.ChoiceField(choices=EXPORT_TYPES)
 
@@ -17,9 +17,9 @@ class ScrobbleForm(forms.Form):
         label="",
         widget=forms.TextInput(
             attrs={
-                "class": "form-control form-control-dark w-100",
-                "placeholder": "Scrobble something (ttIMDB, -v Video Game title, -b Book title, -s TheSportsDB ID)",
-                "aria-label": "Scrobble something",
+                'class': "form-control form-control-dark w-100",
+                'placeholder': "Scrobble something (IMDB ID, String, TVDB ID ...)",
+                'aria-label': "Scrobble something",
             }
         ),
     )

vrobbler/apps/scrobbles/imdb.py

@@ -0,0 +1,61 @@
+import logging
+from django.utils import timezone
+
+from imdb import Cinemagoer
+
+imdb_client = Cinemagoer()
+
+logger = logging.getLogger(__name__)
+
+
+def lookup_video_from_imdb(imdb_id: str) -> dict:
+
+    if 'tt' not in imdb_id:
+        logger.warning(f"IMDB ID should begin with 'tt' {imdb_id}")
+        return
+
+    lookup_id = imdb_id.strip('tt')
+    media = imdb_client.get_movie(lookup_id)
+
+    run_time_seconds = 60 * 60
+    runtimes = media.get("runtimes")
+    if runtimes:
+        run_time_seconds = int(runtimes[0]) * 60
+
+    # Ticks otherwise known as miliseconds
+    run_time_ticks = run_time_seconds * 1000 * 1000
+
+    item_type = "Movie"
+    if media.get('series title'):
+        item_type = "Episode"
+
+    try:
+        plot = media.get('plot')[0]
+    except TypeError:
+        plot = ""
+    except IndexError:
+        plot = ""
+
+    logger.debug(f"Received data from IMDB: {media.__dict__}")
+    # Build a rough approximation of a Jellyfin data response
+    data_dict = {
+        "ItemType": item_type,
+        "Name": media.get('title'),
+        "Overview": plot,
+        "Tagline": media.get('tagline'),
+        "Year": media.get('year'),
+        "Provider_imdb": imdb_id,
+        "RunTime": run_time_seconds,
+        "RunTimeTicks": run_time_ticks,
+        "SeriesName": media.get('series title'),
+        "EpisodeNumber": media.get('episode'),
+        "SeasonNumber": media.get('season'),
+        "PlaybackPositionTicks": 1,
+        "PlaybackPosition": 1,
+        "UtcTimestamp": timezone.now().strftime('%Y-%m-%d %H:%M:%S.%f%z'),
+        "IsPaused": False,
+        "PlayedToCompletion": False,
+    }
+    logger.debug(f"Parsed data from IMDB data: {data_dict}")
+
+    return data_dict

vrobbler/apps/scrobbles/koreader.py

@@ -0,0 +1,124 @@
+import logging
+from datetime import datetime
+import sqlite3
+from enum import Enum
+
+import pytz
+
+from books.models import Author, Book
+from scrobbles.models import Scrobble
+from django.utils import timezone
+
+logger = logging.getLogger(__name__)
+
+
+class KoReaderBookColumn(Enum):
+    ID = 0
+    TITLE = 1
+    AUTHORS = 2
+    NOTES = 3
+    LAST_OPEN = 4
+    HIGHLIGHTS = 5
+    PAGES = 6
+    SERIES = 7
+    LANGUAGE = 8
+    MD5 = 9
+    TOTAL_READ_TIME = 10
+    TOTAL_READ_PAGES = 11
+
+
+class KoReaderPageStatColumn(Enum):
+    ID_BOOK = 0
+    PAGE = 1
+    START_TIME = 2
+    DURATION = 3
+    TOTAL_PAGES = 4
+
+
+def process_koreader_sqlite_file(sqlite_file_path, user_id):
+    """Given a sqlite file from KoReader, open the book table, iterate
+    over rows creating scrobbles from each book found"""
+    # Create a SQL connection to our SQLite database
+    con = sqlite3.connect(sqlite_file_path)
+    cur = con.cursor()
+
+    # Return all results of query
+    book_table = cur.execute("SELECT * FROM book")
+    new_scrobbles = []
+    for book_row in book_table:
+        authors = book_row[KoReaderBookColumn.AUTHORS.value].split('\n')
+        author_list = []
+        for author_str in authors:
+            logger.debug(f"Looking up author {author_str}")
+
+            if author_str == "N/A":
+                continue
+
+            author, created = Author.objects.get_or_create(name=author_str)
+            if created:
+                author.fix_metadata()
+            author_list.append(author)
+            logger.debug(f"Found author {author}, created: {created}")
+
+        book, created = Book.objects.get_or_create(
+            koreader_md5=book_row[KoReaderBookColumn.MD5.value]
+        )
+
+        if created:
+            book.title = book_row[KoReaderBookColumn.TITLE.value]
+            book.pages = book_row[KoReaderBookColumn.PAGES.value]
+            book.koreader_id = int(book_row[KoReaderBookColumn.ID.value])
+            book.koreader_authors = book_row[KoReaderBookColumn.AUTHORS.value]
+            book.run_time_ticks = int(book_row[KoReaderBookColumn.PAGES.value])
+            book.save(
+                update_fields=[
+                    "title",
+                    "pages",
+                    "koreader_id",
+                    "koreader_authors",
+                ]
+            )
+            book.fix_metadata()
+            if author_list:
+                book.authors.add(*[a.id for a in author_list])
+
+        playback_position = int(
+            book_row[KoReaderBookColumn.TOTAL_READ_TIME.value]
+        )
+        playback_position_ticks = playback_position * 1000
+        pages_read = int(book_row[KoReaderBookColumn.TOTAL_READ_PAGES.value])
+        timestamp = datetime.utcfromtimestamp(
+            book_row[KoReaderBookColumn.LAST_OPEN.value]
+        ).replace(tzinfo=pytz.utc)
+
+        new_scrobble = Scrobble(
+            book_id=book.id,
+            user_id=user_id,
+            source="KOReader",
+            timestamp=timestamp,
+            playback_position_ticks=playback_position_ticks,
+            playback_position=playback_position,
+            played_to_completion=True,
+            in_progress=False,
+            book_pages_read=pages_read,
+        )
+
+        existing = Scrobble.objects.filter(
+            timestamp=timestamp, book=book
+        ).first()
+        if existing:
+            logger.debug(f"Skipping existing scrobble {new_scrobble}")
+            continue
+
+        logger.debug(f"Queued scrobble {new_scrobble} for creation")
+        new_scrobbles.append(new_scrobble)
+
+    # Be sure to close the connection
+    con.close()
+
+    created = Scrobble.objects.bulk_create(new_scrobbles)
+    logger.info(
+        f"Created {len(created)} scrobbles",
+        extra={'created_scrobbles': created},
+    )
+    return created

vrobbler/apps/scrobbles/lastfm.py

@@ -50,14 +50,13 @@ class LastFM:
         lastfm_scrobbles = self.get_last_scrobbles(time_from=last_processed)
 
         for lfm_scrobble in lastfm_scrobbles:
-            timestamp = lfm_scrobble.pop("timestamp")
+            timestamp = lfm_scrobble.pop('timestamp')
 
-            artist = get_or_create_artist(lfm_scrobble.pop("artist"))
-            album = get_or_create_album(lfm_scrobble.pop("album"), artist)
+            artist = get_or_create_artist(lfm_scrobble.pop('artist'))
+            album = get_or_create_album(lfm_scrobble.pop('album'), artist)
 
-            lfm_scrobble["artist"] = artist
-            if album:
-                lfm_scrobble["album"] = album
+            lfm_scrobble['artist'] = artist
+            lfm_scrobble['album'] = album
             track = get_or_create_track(**lfm_scrobble)
 
             new_scrobble = Scrobble(
@@ -86,7 +85,7 @@ class LastFM:
         created = Scrobble.objects.bulk_create(new_scrobbles)
         logger.info(
             f"Created {len(created)} scrobbles",
-            extra={"created_scrobbles": created},
+            extra={'created_scrobbles': created},
         )
         return created
 
@@ -101,18 +100,20 @@ class LastFM:
             lfm_params["time_to"] = int(time_to.timestamp())
 
         # if not time_from and not time_to:
-        lfm_params["limit"] = None
+        lfm_params['limit'] = None
 
         found_scrobbles = self.user.get_recent_tracks(**lfm_params)
         # TOOD spin this out into a celery task over certain threshold of found scrobbles?
 
         for scrobble in found_scrobbles:
             run_time = None
+            run_time_ticks = None
             mbid = None
             artist = None
 
             try:
-                run_time = int(scrobble.track.get_duration() / 1000)
+                run_time_ticks = scrobble.track.get_duration()
+                run_time = int(run_time_ticks / 1000)
                 mbid = scrobble.track.get_mbid()
                 artist = scrobble.track.get_artist().name
             except pylast.MalformedResponseError as e:
@@ -137,7 +138,8 @@ class LastFM:
                     "album": scrobble.album,
                     "title": scrobble.track.title,
                     "mbid": mbid,
-                    "run_time_seconds": run_time,
+                    "run_time": run_time,
+                    "run_time_ticks": run_time_ticks,
                     "timestamp": timestamp,
                 }
             )

vrobbler/apps/scrobbles/migrations/0024_chartrecord_period_end_chartrecord_period_start.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-03 00:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('scrobbles', '0023_alter_audioscrobblertsvimport_options_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='chartrecord',
-            name='period_end',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='chartrecord',
-            name='period_start',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0025_scrobble_long_play_complete_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-04 23:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0024_chartrecord_period_end_chartrecord_period_start"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="scrobble",
-            name="long_play_complete",
-            field=models.BooleanField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name="scrobble",
-            name="videogame_minutes_played",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0026_scrobble_video_game.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-05 07:16
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("videogames", "0001_initial"),
-        ("scrobbles", "0025_scrobble_long_play_complete_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="scrobble",
-            name="video_game",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                to="videogames.videogame",
-            ),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0027_remove_scrobble_videogame_minutes_played_and_more.py

@@ -1,22 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 02:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0026_scrobble_video_game"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="scrobble",
-            name="videogame_minutes_played",
-        ),
-        migrations.AlterField(
-            model_name="scrobble",
-            name="playback_position",
-            field=models.CharField(blank=True, max_length=10, null=True),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0028_scrobble_video_game_minutes_played.py

@@ -1,21 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 05:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "scrobbles",
-            "0027_remove_scrobble_videogame_minutes_played_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="scrobble",
-            name="video_game_minutes_played",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0029_remove_scrobble_video_game_minutes_played_and_more.py

@@ -1,22 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-06 15:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0028_scrobble_video_game_minutes_played"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="scrobble",
-            name="video_game_minutes_played",
-        ),
-        migrations.AddField(
-            model_name="scrobble",
-            name="long_play_seconds",
-            field=models.BigIntegerField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0030_scrobble_notes.py

@@ -1,21 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-11 22:33
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "scrobbles",
-            "0029_remove_scrobble_video_game_minutes_played_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="scrobble",
-            name="notes",
-            field=models.TextField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0031_alter_scrobble_playback_position.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0030_scrobble_notes"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="scrobble",
-            name="playback_position",
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0032_rename_playback_position_scrobble_playback_position_seconds.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-12 01:21
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0031_alter_scrobble_playback_position"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="scrobble",
-            old_name="playback_position",
-            new_name="playback_position_seconds",
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0033_genre_objectwithgenres.py

@@ -1,92 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-14 22:27
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("contenttypes", "0002_remove_content_type_name"),
-        (
-            "scrobbles",
-            "0032_rename_playback_position_scrobble_playback_position_seconds",
-        ),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Genre",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "name",
-                    models.CharField(
-                        max_length=100, unique=True, verbose_name="name"
-                    ),
-                ),
-                (
-                    "slug",
-                    models.SlugField(
-                        max_length=100, unique=True, verbose_name="slug"
-                    ),
-                ),
-                (
-                    "source",
-                    models.CharField(blank=True, max_length=255, null=True),
-                ),
-            ],
-            options={
-                "verbose_name": "Genre",
-                "verbose_name_plural": "Genres",
-            },
-        ),
-        migrations.CreateModel(
-            name="ObjectWithGenres",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "object_id",
-                    models.IntegerField(
-                        db_index=True, verbose_name="object ID"
-                    ),
-                ),
-                (
-                    "content_type",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="%(app_label)s_%(class)s_tagged_items",
-                        to="contenttypes.contenttype",
-                        verbose_name="content type",
-                    ),
-                ),
-                (
-                    "tag",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="%(app_label)s_%(class)s_items",
-                        to="scrobbles.genre",
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-    ]

vrobbler/apps/scrobbles/migrations/0034_alter_chartrecord_rank.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.1.5 on 2023-03-15 21:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("scrobbles", "0033_genre_objectwithgenres"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="chartrecord",
-            name="rank",
-            field=models.IntegerField(db_index=True),
-        ),
-    ]

vrobbler/apps/scrobbles/mixins.py

@@ -1,72 +1,19 @@
-import logging
-from typing import Optional
 from uuid import uuid4
 
 from django.db import models
-from django.urls import reverse
 from django_extensions.db.models import TimeStampedModel
-from taggit.managers import TaggableManager
-from scrobbles.utils import get_scrobbles_for_media
-from taggit.models import TagBase, GenericTaggedItemBase
 
 BNULL = {"blank": True, "null": True}
 
-logger = logging.getLogger(__name__)
-
-
-class Genre(TagBase):
-    source = models.CharField(max_length=255, **BNULL)
-
-    class Meta:
-        verbose_name = "Genre"
-        verbose_name_plural = "Genres"
-
-
-class ObjectWithGenres(GenericTaggedItemBase):
-    tag = models.ForeignKey(
-        Genre,
-        on_delete=models.CASCADE,
-        related_name="%(app_label)s_%(class)s_items",
-    )
-
 
 class ScrobblableMixin(TimeStampedModel):
     SECONDS_TO_STALE = 1600
 
     uuid = models.UUIDField(default=uuid4, editable=False, **BNULL)
     title = models.CharField(max_length=255, **BNULL)
-    run_time_seconds = models.IntegerField(**BNULL)
+    run_time = models.CharField(max_length=8, **BNULL)
     run_time_ticks = models.PositiveBigIntegerField(**BNULL)
-
-    genre = TaggableManager(through=ObjectWithGenres)
+    # thumbs = models.IntegerField(default=Opinion.NEUTRAL, choices=Opinion.choices)
 
     class Meta:
         abstract = True
-
-    @property
-    def primary_image_url(self) -> str:
-        logger.warn(f"Not implemented yet")
-        return ""
-
-    def fix_metadata(self):
-        logger.warn("fix_metadata() not implemented yet")
-
-    @classmethod
-    def find_or_create(cls):
-        logger.warn("find_or_create() not implemented yet")
-
-
-class LongPlayScrobblableMixin(ScrobblableMixin):
-    class Meta:
-        abstract = True
-
-    def get_longplay_finish_url(self):
-        return reverse("scrobbles:longplay-finish", kwargs={"uuid": self.uuid})
-
-    def last_long_play_scrobble_for_user(self, user) -> Optional["Scrobble"]:
-        return (
-            get_scrobbles_for_media(self, user)
-            .filter(long_play_complete=False)
-            .order_by("-timestamp")
-            .first()
-        )

vrobbler/apps/scrobbles/models.py

@@ -1,34 +1,22 @@
 import calendar
-import datetime
 import logging
-from typing import Optional
 from uuid import uuid4
 
 from books.models import Book
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.urls import reverse
 from django.utils import timezone
 from django_extensions.db.models import TimeStampedModel
-from music.lastfm import LastFM
 from music.models import Artist, Track
 from podcasts.models import Episode
-from profiles.utils import (
-    end_of_day,
-    end_of_month,
-    end_of_week,
-    start_of_day,
-    start_of_month,
-    start_of_week,
-)
-from scrobbles.constants import LONG_PLAY_MEDIA
-from scrobbles.stats import build_charts
+from scrobbles.lastfm import LastFM
 from scrobbles.utils import check_scrobble_for_finish
 from sports.models import SportEvent
-from videogames.models import VideoGame
 from videos.models import Series, Video
 
+from vrobbler.apps.scrobbles.stats import build_charts
+
 logger = logging.getLogger(__name__)
 User = get_user_model()
 BNULL = {"blank": True, "null": True}
@@ -52,17 +40,17 @@ class BaseFileImportMixin(TimeStampedModel):
     def human_start(self):
         start = "Unknown"
         if self.processing_started:
-            start = self.processing_started.strftime("%B %d, %Y at %H:%M")
+            start = self.processing_started.strftime('%B %d, %Y at %H:%M')
         return start
 
     @property
     def import_type(self) -> str:
         class_name = self.__class__.__name__
-        if class_name == "AudioscrobblerTSVImport":
+        if class_name == 'AudioscrobblerTSVImport':
             return "Audioscrobbler"
-        if class_name == "KoReaderImport":
+        if class_name == 'KoReaderImport':
             return "KoReader"
-        if self.__class__.__name__ == "LastFMImport":
+        if self.__class__.__name__ == 'LastFMImport':
             return "LastFM"
         return "Generic"
 
@@ -74,11 +62,10 @@ class BaseFileImportMixin(TimeStampedModel):
         from scrobbles.models import Scrobble
 
         if not self.process_log:
-
             logger.warning("No lines in process log found to undo")
             return
 
-        for line in self.process_log.split("\n"):
+        for line in self.process_log.split('\n'):
             scrobble_id = line.split("\t")[0]
             scrobble = Scrobble.objects.filter(id=scrobble_id).first()
             if not scrobble:
@@ -108,7 +95,7 @@ class BaseFileImportMixin(TimeStampedModel):
 
     def mark_finished(self):
         self.processed_finished = timezone.now()
-        self.save(update_fields=["processed_finished"])
+        self.save(update_fields=['processed_finished'])
 
     def record_log(self, scrobbles):
         self.process_log = ""
@@ -126,10 +113,6 @@ class BaseFileImportMixin(TimeStampedModel):
         self.process_count = len(scrobbles)
         self.save(update_fields=["process_log", "process_count"])
 
-    @property
-    def upload_file_path(self):
-        raise NotImplementedError
-
 
 class KoReaderImport(BaseFileImportMixin):
     class Meta:
@@ -140,26 +123,18 @@ class KoReaderImport(BaseFileImportMixin):
 
     def get_absolute_url(self):
         return reverse(
-            "scrobbles:koreader-import-detail", kwargs={"slug": self.uuid}
+            'scrobbles:koreader-import-detail', kwargs={'slug': self.uuid}
         )
 
     def get_path(instance, filename):
-        extension = filename.split(".")[-1]
+        extension = filename.split('.')[-1]
         uuid = instance.uuid
-        return f"koreader-uploads/{uuid}.{extension}"
-
-    @property
-    def upload_file_path(self) -> str:
-        if getattr(settings, "USE_S3_STORAGE"):
-            path = self.sqlite_file.url
-        else:
-            path = self.sqlite_file.path
-        return path
+        return f'koreader-uploads/{uuid}.{extension}'
 
     sqlite_file = models.FileField(upload_to=get_path, **BNULL)
 
     def process(self, force=False):
-        from books.koreader import process_koreader_sqlite
+        from scrobbles.koreader import process_koreader_sqlite_file
 
         if self.processed_finished and not force:
             logger.info(
@@ -168,8 +143,8 @@ class KoReaderImport(BaseFileImportMixin):
             return
 
         self.mark_started()
-        scrobbles = process_koreader_sqlite(
-            self.upload_file_path, self.user.id
+        scrobbles = process_koreader_sqlite_file(
+            self.sqlite_file.path, self.user.id
         )
         self.record_log(scrobbles)
         self.mark_finished()
@@ -184,21 +159,13 @@ class AudioScrobblerTSVImport(BaseFileImportMixin):
 
     def get_absolute_url(self):
         return reverse(
-            "scrobbles:tsv-import-detail", kwargs={"slug": self.uuid}
+            'scrobbles:tsv-import-detail', kwargs={'slug': self.uuid}
         )
 
     def get_path(instance, filename):
-        extension = filename.split(".")[-1]
+        extension = filename.split('.')[-1]
         uuid = instance.uuid
-        return f"audioscrobbler-uploads/{uuid}.{extension}"
-
-    @property
-    def upload_file_path(self):
-        if getattr(settings, "USE_S3_STORAGE"):
-            path = self.tsv_file.url
-        else:
-            path = self.tsv_file.path
-        return path
+        return f'audioscrobbler-uploads/{uuid}.{extension}'
 
     tsv_file = models.FileField(upload_to=get_path, **BNULL)
 
@@ -214,12 +181,10 @@ class AudioScrobblerTSVImport(BaseFileImportMixin):
         self.mark_started()
 
         tz = None
-        user_id = None
         if self.user:
-            user_id = self.user.id
             tz = self.user.profile.tzinfo
         scrobbles = process_audioscrobbler_tsv_file(
-            self.upload_file_path, user_id, user_tz=tz
+            self.tsv_file.path, self.user.id, user_tz=tz
         )
         self.record_log(scrobbles)
         self.mark_finished()
@@ -234,7 +199,7 @@ class LastFmImport(BaseFileImportMixin):
 
     def get_absolute_url(self):
         return reverse(
-            "scrobbles:lastfm-import-detail", kwargs={"slug": self.uuid}
+            'scrobbles:lastfm-import-detail', kwargs={'slug': self.uuid}
         )
 
     def process(self, import_all=False):
@@ -281,7 +246,7 @@ class ChartRecord(TimeStampedModel):
     """
 
     user = models.ForeignKey(User, on_delete=models.DO_NOTHING, **BNULL)
-    rank = models.IntegerField(db_index=True)
+    rank = models.IntegerField()
     count = models.IntegerField(default=0)
     year = models.IntegerField(default=timezone.now().year)
     month = models.IntegerField(**BNULL)
@@ -291,26 +256,6 @@ class ChartRecord(TimeStampedModel):
     series = models.ForeignKey(Series, on_delete=models.DO_NOTHING, **BNULL)
     artist = models.ForeignKey(Artist, on_delete=models.DO_NOTHING, **BNULL)
     track = models.ForeignKey(Track, on_delete=models.DO_NOTHING, **BNULL)
-    period_start = models.DateTimeField(**BNULL)
-    period_end = models.DateTimeField(**BNULL)
-
-    def save(self, *args, **kwargs):
-        profile = self.user.profile
-
-        if self.week:
-            # set start and end to start and end of week
-            period = datetime.date.fromisocalendar(self.year, self.week, 1)
-            self.period_start = start_of_week(period, profile)
-            self.period_start = end_of_week(period, profile)
-        if self.day:
-            period = datetime.datetime(self.year, self.month, self.day)
-            self.period_start = start_of_day(period, profile)
-            self.period_end = end_of_day(period, profile)
-        if self.month and not self.day:
-            period = datetime.datetime(self.year, self.month, 1)
-            self.period_start = start_of_month(period, profile)
-            self.period_end = end_of_month(period, profile)
-        super(ChartRecord, self).save(*args, **kwargs)
 
     @property
     def media_obj(self):
@@ -357,13 +302,13 @@ class ChartRecord(TimeStampedModel):
 
     @property
     def period_type(self) -> str:
-        period = "year"
+        period = 'year'
         if self.month:
-            period = "month"
+            period = 'month'
         if self.week:
-            period = "week"
+            period = 'week'
         if self.day:
-            period = "day"
+            period = 'day'
         return period
 
     def __str__(self):
@@ -382,7 +327,7 @@ class ChartRecord(TimeStampedModel):
             get_params = get_params = get_params + f"-{self.day}"
         if self.artist:
             get_params = get_params + "&media=Artist"
-        return reverse("scrobbles:charts-home") + get_params
+        return reverse('scrobbles:charts-home') + get_params
 
     @classmethod
     def build(cls, user, **kwargs):
@@ -418,9 +363,6 @@ class Scrobble(TimeStampedModel):
         SportEvent, on_delete=models.DO_NOTHING, **BNULL
     )
     book = models.ForeignKey(Book, on_delete=models.DO_NOTHING, **BNULL)
-    video_game = models.ForeignKey(
-        VideoGame, on_delete=models.DO_NOTHING, **BNULL
-    )
     user = models.ForeignKey(
         User, blank=True, null=True, on_delete=models.DO_NOTHING
     )
@@ -428,7 +370,7 @@ class Scrobble(TimeStampedModel):
     # Time keeping
     timestamp = models.DateTimeField(**BNULL)
     playback_position_ticks = models.PositiveBigIntegerField(**BNULL)
-    playback_position_seconds = models.IntegerField(**BNULL)
+    playback_position = models.CharField(max_length=8, **BNULL)
 
     # Status indicators
     is_paused = models.BooleanField(default=False)
@@ -439,12 +381,9 @@ class Scrobble(TimeStampedModel):
     source = models.CharField(max_length=255, **BNULL)
     source_id = models.TextField(**BNULL)
     scrobble_log = models.TextField(**BNULL)
-    notes = models.TextField(**BNULL)
 
-    # Fields for keeping track long content like books and games
+    # Fields for keeping track of reads between scrobbles
     book_pages_read = models.IntegerField(**BNULL)
-    long_play_seconds = models.BigIntegerField(**BNULL)
-    long_play_complete = models.BooleanField(**BNULL)
 
     def save(self, *args, **kwargs):
         if not self.uuid:
@@ -455,12 +394,12 @@ class Scrobble(TimeStampedModel):
     @property
     def status(self) -> str:
         if self.is_paused:
-            return "paused"
+            return 'paused'
         if self.played_to_completion:
-            return "finished"
+            return 'finished'
         if self.in_progress:
-            return "in-progress"
-        return "zombie"
+            return 'in-progress'
+        return 'zombie'
 
     @property
     def is_stale(self) -> bool:
@@ -472,72 +411,29 @@ class Scrobble(TimeStampedModel):
             is_stale = True
         return is_stale
 
-    @property
-    def previous(self) -> "Scrobble":
-        return (
-            self.media_obj.scrobble_set.order_by("-timestamp")
-            .filter(timestamp__lt=self.timestamp)
-            .first()
-        )
-
-    @property
-    def next(self) -> "Scrobble":
-        return (
-            self.media_obj.scrobble_set.order_by("timestamp")
-            .filter(timestamp__gt=self.timestamp)
-            .first()
-        )
-
-    @property
-    def session_pages_read(self) -> Optional[int]:
-        """Look one scrobble back, if it isn't complete,"""
-        if not self.book_pages_read:
-            return
-        if self.previous:
-            return self.book_pages_read - self.previous.book_pages_read
-        return self.book_pages_read
-
-    @property
-    def is_long_play(self) -> bool:
-        return self.media_obj.__class__.__name__ in LONG_PLAY_MEDIA.values()
-
     @property
     def percent_played(self) -> int:
         if not self.media_obj:
             return 0
 
-        if self.media_obj and not self.media_obj.run_time_seconds:
+        if self.media_obj and not self.media_obj.run_time_ticks:
             return 100
 
-        if not self.playback_position_seconds and self.played_to_completion:
+        if not self.playback_position_ticks and self.played_to_completion:
             return 100
 
-        playback_seconds = self.playback_position_seconds
-        if not playback_seconds:
-            playback_seconds = (timezone.now() - self.timestamp).seconds
-
-        run_time_secs = self.media_obj.run_time_seconds
-        percent = int((playback_seconds / run_time_secs) * 100)
-
-        if self.is_long_play:
-            long_play_secs = 0
-            if self.previous and not self.previous.long_play_complete:
-                long_play_secs = self.previous.long_play_seconds or 0
-            percent = int(
-                ((playback_seconds + long_play_secs) / run_time_secs) * 100
-            )
-
-        # if percent > 100:
-        #    percent = 100
+        playback_ticks = self.playback_position_ticks
+        if not playback_ticks:
+            playback_ticks = (timezone.now() - self.timestamp).seconds * 1000
 
+        percent = int((playback_ticks / self.media_obj.run_time_ticks) * 100)
+        if percent > 100:
+            percent = 100
         return percent
 
     @property
     def can_be_updated(self) -> bool:
         updatable = True
-        if self.media_obj.__class__.__name__ in LONG_PLAY_MEDIA.values():
-            logger.info(f"No - Long play media")
-            updatable = False
         if self.percent_played > 100:
             logger.info(f"No - 100% played - {self.id} - {self.source}")
             updatable = False
@@ -559,12 +455,10 @@ class Scrobble(TimeStampedModel):
             media_obj = self.sport_event
         if self.book:
             media_obj = self.book
-        if self.video_game:
-            media_obj = self.video_game
         return media_obj
 
     def __str__(self):
-        timestamp = self.timestamp.strftime("%Y-%m-%d")
+        timestamp = self.timestamp.strftime('%Y-%m-%d')
         return f"Scrobble of {self.media_obj} ({timestamp})"
 
     @classmethod
@@ -572,33 +466,28 @@ class Scrobble(TimeStampedModel):
         cls, media, user_id: int, scrobble_data: dict
     ) -> "Scrobble":
 
-        media_class = media.__class__.__name__
-
-        if media_class == "Track":
+        if media.__class__.__name__ == 'Track':
             media_query = models.Q(track=media)
-            scrobble_data["track_id"] = media.id
-        if media_class == "Video":
+            scrobble_data['track_id'] = media.id
+        if media.__class__.__name__ == 'Video':
             media_query = models.Q(video=media)
-            scrobble_data["video_id"] = media.id
-        if media_class == "Episode":
+            scrobble_data['video_id'] = media.id
+        if media.__class__.__name__ == 'Episode':
             media_query = models.Q(podcast_episode=media)
-            scrobble_data["podcast_episode_id"] = media.id
-        if media_class == "SportEvent":
+            scrobble_data['podcast_episode_id'] = media.id
+        if media.__class__.__name__ == 'SportEvent':
             media_query = models.Q(sport_event=media)
-            scrobble_data["sport_event_id"] = media.id
-        if media_class == "Book":
+            scrobble_data['sport_event_id'] = media.id
+        if media.__class__.__name__ == 'Book':
             media_query = models.Q(book=media)
-            scrobble_data["book_id"] = media.id
-        if media_class == "VideoGame":
-            media_query = models.Q(video_game=media)
-            scrobble_data["video_game_id"] = media.id
+            scrobble_data['book_id'] = media.id
 
         scrobble = (
             cls.objects.filter(
                 media_query,
                 user_id=user_id,
             )
-            .order_by("-modified")
+            .order_by('-modified')
             .first()
         )
         if scrobble and scrobble.can_be_updated:
@@ -608,21 +497,21 @@ class Scrobble(TimeStampedModel):
             )
             return scrobble.update(scrobble_data)
 
-        source = scrobble_data["source"]
+        source = scrobble_data['source']
         logger.info(
             f"Creating for {media.id} - {source}",
             {"scrobble_data": scrobble_data, "media": media},
         )
         # If creating a new scrobble, we don't need status
-        scrobble_data.pop("mopidy_status", None)
-        scrobble_data.pop("jellyfin_status", None)
+        scrobble_data.pop('mopidy_status', None)
+        scrobble_data.pop('jellyfin_status', None)
         return cls.create(scrobble_data)
 
     def update(self, scrobble_data: dict) -> "Scrobble":
         # Status is a field we get from Mopidy, which refuses to poll us
-        scrobble_status = scrobble_data.pop("mopidy_status", None)
+        scrobble_status = scrobble_data.pop('mopidy_status', None)
         if not scrobble_status:
-            scrobble_status = scrobble_data.pop("jellyfin_status", None)
+            scrobble_status = scrobble_data.pop('jellyfin_status', None)
 
         if self.percent_played < 100:
             # Only worry about ticks if we haven't gotten to the end
@@ -647,7 +536,7 @@ class Scrobble(TimeStampedModel):
         cls,
         scrobble_data: dict,
     ) -> "Scrobble":
-        scrobble_data["scrobble_log"] = ""
+        scrobble_data['scrobble_log'] = ""
         scrobble = cls.objects.create(
             **scrobble_data,
         )
@@ -657,42 +546,9 @@ class Scrobble(TimeStampedModel):
         if not self.in_progress:
             return
         self.in_progress = False
-        self.save(update_fields=["in_progress"])
+        self.save(update_fields=['in_progress'])
         logger.info(f"{self.id} - {self.source}")
-
-        class_name = self.media_obj.__class__.__name__
-        if class_name in LONG_PLAY_MEDIA.values():
-            now = timezone.now()
-            self.played_to_completion = True
-            self.playback_position_seconds = (now - self.timestamp).seconds
-
-            media_filter = models.Q(video_game=self.video_game)
-            if class_name == "Book":
-                media_filter = models.Q(book=self.book)
-
-            # Check for last scrobble, and if present, update long play time
-            last_scrobble = Scrobble.objects.filter(
-                media_filter,
-                user_id=self.user,
-                played_to_completion=True,
-                long_play_complete=False,
-            ).last()
-            self.long_play_seconds = self.playback_position_seconds
-            if last_scrobble:
-                self.long_play_seconds = (
-                    last_scrobble.long_play_seconds
-                    + self.playback_position_seconds
-                )
-
-            self.save(
-                update_fields=[
-                    "playback_position_seconds",
-                    "played_to_completion",
-                    "long_play_seconds",
-                ]
-            )
-            return
-        check_scrobble_for_finish(self, force_finish=force_finish)
+        check_scrobble_for_finish(self, force_finish)
 
     def pause(self) -> None:
         if self.is_paused:
@@ -715,8 +571,11 @@ class Scrobble(TimeStampedModel):
         self.delete()
 
     def update_ticks(self, data) -> None:
-        self.playback_position_seconds = data.get("playback_position_seconds")
+        self.playback_position_ticks = data.get("playback_position_ticks")
+        self.playback_position = data.get("playback_position")
         logger.info(
-            f"{self.id} - {self.playback_position_seconds} - {self.source}"
+            f"{self.id} - {self.playback_position_ticks} - {self.source}"
+        )
+        self.save(
+            update_fields=['playback_position_ticks', 'playback_position']
         )
-        self.save(update_fields=["playback_position_seconds"])

vrobbler/apps/scrobbles/musicbrainz.py

@@ -9,40 +9,40 @@ logger = logging.getLogger(__name__)
 def lookup_album_from_mb(musicbrainz_id: str) -> dict:
     release_dict = {}
 
-    musicbrainzngs.set_useragent("vrobbler", "0.3.0")
+    musicbrainzngs.set_useragent('vrobbler', '0.3.0')
     release_data = musicbrainzngs.get_release_by_id(
         musicbrainz_id,
-        includes=["artists", "release-groups", "recordings"],
-    ).get("release")
+        includes=['artists', 'release-groups', 'recordings'],
+    ).get('release')
 
     if not release_data:
         return release_dict
 
-    primary_artist = release_data.get("artist-credit")[0]
+    primary_artist = release_data.get('artist-credit')[0]
     release_dict = {
-        "artist": {
-            "name": primary_artist.get("name"),
-            "musicbrainz_id": primary_artist.get("id"),
+        'artist': {
+            'name': primary_artist.get('name'),
+            'musicbrainz_id': primary_artist.get('id'),
         },
-        "album": {
-            "name": release_data.get("title"),
-            "musicbrainz_id": musicbrainz_id,
-            "musicbrainz_releasegroup_id": release_data.get(
-                "release-group"
-            ).get("id"),
-            "musicbrainz_albumaritist_id": primary_artist.get("id"),
-            "year": release_data.get("year")[0:4],
+        'album': {
+            'name': release_data.get('title'),
+            'musicbrainz_id': musicbrainz_id,
+            'musicbrainz_releasegroup_id': release_data.get(
+                'release-group'
+            ).get('id'),
+            'musicbrainz_albumaritist_id': primary_artist.get('id'),
+            'year': release_data.get('year')[0:4],
         },
     }
 
-    release_dict["tracks"] = []
-    for track in release_data.get("medium-list")[0]["track-list"]:
-        recording = track["recording"]
-        release_dict["tracks"].append(
+    release_dict['tracks'] = []
+    for track in release_data.get('medium-list')[0]['track-list']:
+        recording = track['recording']
+        release_dict['tracks'].append(
             {
-                "title": recording["title"],
-                "musicbrainz_id": recording["id"],
-                "run_time": track["length"] / 1000,
+                'title': recording['title'],
+                'musicbrainz_id': recording['id'],
+                'run_time_ticks': track['length'],
             }
         )
 
@@ -50,12 +50,12 @@ def lookup_album_from_mb(musicbrainz_id: str) -> dict:
 
 
 def lookup_album_dict_from_mb(release_name: str, artist_name: str) -> dict:
-    musicbrainzngs.set_useragent("vrobbler", "0.3.0")
+    musicbrainzngs.set_useragent('vrobbler', '0.3.0')
 
     top_result = musicbrainzngs.search_releases(
         release_name, artist=artist_name
-    )["release-list"][0]
-    score = int(top_result.get("ext:score"))
+    )['release-list'][0]
+    score = int(top_result.get('ext:score'))
     if score < 85:
         logger.debug(
             "Album lookup score below 85 threshold",
@@ -68,19 +68,18 @@ def lookup_album_dict_from_mb(release_name: str, artist_name: str) -> dict:
 
     return {
         "year": year,
-        "title": top_result["title"],
         "mb_id": top_result["id"],
         "mb_group_id": top_result["release-group"]["id"],
     }
 
 
 def lookup_artist_from_mb(artist_name: str) -> str:
-    musicbrainzngs.set_useragent("vrobbler", "0.3.0")
+    musicbrainzngs.set_useragent('vrobbler', '0.3.0')
 
     top_result = musicbrainzngs.search_artists(artist=artist_name)[
-        "artist-list"
+        'artist-list'
     ][0]
-    score = int(top_result.get("ext:score"))
+    score = int(top_result.get('ext:score'))
     if score < 85:
         logger.debug(
             "Artist lookup score below 85 threshold",
@@ -94,12 +93,12 @@ def lookup_artist_from_mb(artist_name: str) -> str:
 def lookup_track_from_mb(
     track_name: str, artist_mbid: str, album_mbid: str
 ) -> str:
-    musicbrainzngs.set_useragent("vrobbler", "0.3.0")
+    musicbrainzngs.set_useragent('vrobbler', '0.3.0')
 
     top_result = musicbrainzngs.search_recordings(
         query=track_name, artist=artist_mbid, release=album_mbid
-    )["recording-list"][0]
-    score = int(top_result.get("ext:score"))
+    )['recording-list'][0]
+    score = int(top_result.get('ext:score'))
     if score < 85:
         logger.debug(
             "Track lookup score below 85 threshold",

vrobbler/apps/scrobbles/scrobblers.py

@@ -5,18 +5,16 @@ from dateutil.parser import parse
 from django.utils import timezone
 from music.constants import JELLYFIN_POST_KEYS
 from music.models import Track
-from music.utils import (
+from podcasts.models import Episode
+from scrobbles.models import Scrobble
+from scrobbles.utils import convert_to_seconds, parse_mopidy_uri
+from videos.models import Video
+from sports.models import SportEvent
+from vrobbler.apps.music.utils import (
     get_or_create_album,
     get_or_create_artist,
     get_or_create_track,
 )
-from podcasts.models import Episode
-from scrobbles.models import Scrobble
-from scrobbles.utils import convert_to_seconds, parse_mopidy_uri
-from sports.models import SportEvent
-from videos.models import Video
-from videogames.models import VideoGame
-from books.models import Book
 
 logger = logging.getLogger(__name__)
 
@@ -37,7 +35,8 @@ def mopidy_scrobble_podcast(
     episode_name = parsed_data.get("episode_filename")
     episode_dict = {
         "title": episode_name,
-        "run_time_seconds": data_dict.get("run_time"),
+        "run_time_ticks": data_dict.get("run_time_ticks"),
+        "run_time": data_dict.get("run_time"),
         "number": parsed_data.get("episode_num"),
         "pub_date": parsed_data.get("pub_date"),
         "mopidy_uri": mopidy_uri,
@@ -49,7 +48,7 @@ def mopidy_scrobble_podcast(
     mopidy_data = {
         "user_id": user_id,
         "timestamp": timezone.now(),
-        "playback_position_seconds": data_dict.get("playback_time_ticks"),
+        "playback_position_ticks": data_dict.get("playback_time_ticks"),
         "source": "Mopidy",
         "mopidy_status": data_dict.get("status"),
     }
@@ -77,15 +76,15 @@ def mopidy_scrobble_track(
         mbid=data_dict.get("musicbrainz_track_id"),
         artist=artist,
         album=album,
-        run_time_seconds=data_dict.get("run_time"),
+        run_time_ticks=data_dict.get("run_time_ticks"),
+        run_time=data_dict.get("run_time"),
     )
 
     # Now we run off a scrobble
-    playback_seconds = data_dict.get("playback_time_ticks") / 1000
     mopidy_data = {
         "user_id": user_id,
         "timestamp": timezone.now(),
-        "playback_position_seconds": playback_seconds,
+        "playback_position_ticks": data_dict.get("playback_time_ticks"),
         "source": "Mopidy",
         "mopidy_status": data_dict.get("status"),
     }
@@ -99,18 +98,20 @@ def build_scrobble_dict(data_dict: dict, user_id: int) -> dict:
     jellyfin_status = "resumed"
     if data_dict.get("IsPaused"):
         jellyfin_status = "paused"
-    elif data_dict.get("NotificationType") == "PlaybackStop":
+    elif data_dict.get("NotificationType") == 'PlaybackStop':
         jellyfin_status = "stopped"
 
-    playback_seconds = convert_to_seconds(
-        data_dict.get("PlaybackPosition", "")
-    )
+    playback_ticks = data_dict.get("PlaybackPositionTicks", "")
+    if playback_ticks:
+        playback_ticks = playback_ticks // 10000
+
     return {
         "user_id": user_id,
         "timestamp": parse(data_dict.get("UtcTimestamp")),
-        "playback_position_seconds": playback_seconds,
+        "playback_position_ticks": playback_ticks,
+        "playback_position": data_dict.get("PlaybackPosition", ""),
         "source": data_dict.get("ClientName", "Vrobbler"),
-        "source_id": data_dict.get("MediaSourceId"),
+        "source_id": data_dict.get('MediaSourceId'),
         "jellyfin_status": jellyfin_status,
     }
 
@@ -136,9 +137,12 @@ def jellyfin_scrobble_track(
     album = get_or_create_album(
         data_dict.get(JELLYFIN_POST_KEYS["ALBUM_NAME"]),
         artist=artist,
-        mbid=data_dict.get(JELLYFIN_POST_KEYS["ALBUM_MB_ID"]),
+        mbid=data_dict.get(JELLYFIN_POST_KEYS['ALBUM_MB_ID']),
     )
 
+    run_time_ticks = (
+        data_dict.get(JELLYFIN_POST_KEYS["RUN_TIME_TICKS"]) // 10000
+    )
     run_time = convert_to_seconds(
         data_dict.get(JELLYFIN_POST_KEYS["RUN_TIME"])
     )
@@ -146,18 +150,25 @@ def jellyfin_scrobble_track(
         title=data_dict.get("Name"),
         artist=artist,
         album=album,
-        run_time_seconds=run_time,
+        run_time_ticks=run_time_ticks,
+        run_time=run_time,
     )
 
     scrobble_dict = build_scrobble_dict(data_dict, user_id)
 
     # A hack to make Jellyfin work more like Mopidy for music tracks
-    scrobble_dict["playback_position_seconds"] = 0
+    scrobble_dict["playback_position_ticks"] = 0
+    scrobble_dict["playback_position"] = ""
 
     return Scrobble.create_or_update(track, user_id, scrobble_dict)
 
 
 def jellyfin_scrobble_video(data_dict: dict, user_id: Optional[int]):
+    if not data_dict.get("Provider_imdb", None):
+        logger.error(
+            "No IMDB ID received. This is likely because all metadata is bad, not scrobbling"
+        )
+        return
     video = Video.find_or_create(data_dict)
 
     scrobble_dict = build_scrobble_dict(data_dict, user_id)
@@ -165,55 +176,27 @@ def jellyfin_scrobble_video(data_dict: dict, user_id: Optional[int]):
     return Scrobble.create_or_update(video, user_id, scrobble_dict)
 
 
-def manual_scrobble_video(imdb_id: str, user_id: int):
-    video = Video.find_or_create({"imdb_id": imdb_id})
+def manual_scrobble_video(data_dict: dict, user_id: Optional[int]):
+    if not data_dict.get("Provider_imdb", None):
+        logger.error(
+            "No IMDB ID received. This is likely because all metadata is bad, not scrobbling"
+        )
+        return
+    video = Video.find_or_create(data_dict)
 
-    # When manually scrobbling, try finding a source from the series
-    if video.tv_series:
-        source = video.tv_series.preferred_source or "Vrobbler"
-    scrobble_dict = {
-        "user_id": user_id,
-        "timestamp": timezone.now(),
-        "playback_position_seconds": 0,
-        "source": source,
-        "source_id": "Manually scrobbled from Vrobbler and looked up via IMDB",
-    }
+    scrobble_dict = build_scrobble_dict(data_dict, user_id)
 
     return Scrobble.create_or_update(video, user_id, scrobble_dict)
 
 
 def manual_scrobble_event(data_dict: dict, user_id: Optional[int]):
+    if not data_dict.get("Provider_thesportsdb", None):
+        logger.error(
+            "No TheSportsDB ID received. This is likely because all metadata is bad, not scrobbling"
+        )
+        return
     event = SportEvent.find_or_create(data_dict)
 
     scrobble_dict = build_scrobble_dict(data_dict, user_id)
 
     return Scrobble.create_or_update(event, user_id, scrobble_dict)
-
-
-def manual_scrobble_video_game(data_dict: dict, user_id: Optional[int]):
-    game = VideoGame.find_or_create(data_dict)
-
-    scrobble_dict = {
-        "user_id": user_id,
-        "timestamp": timezone.now(),
-        "playback_position_seconds": 0,
-        "source": "Vrobbler",
-        "source_id": "Manually scrobbled from Vrobbler and looked up via HLTB.com",
-        "long_play_complete": False,
-    }
-
-    return Scrobble.create_or_update(game, user_id, scrobble_dict)
-
-
-def manual_scrobble_book(data_dict: dict, user_id: Optional[int]):
-    book = Book.find_or_create(data_dict)
-
-    scrobble_dict = {
-        "user_id": user_id,
-        "timestamp": timezone.now(),
-        "playback_position_seconds": 0,
-        "source": "Vrobbler",
-        "long_play_complete": False,
-    }
-
-    return Scrobble.create_or_update(book, user_id, scrobble_dict)