[videos] Fix TMDB lookup for movies

.drone.yml

@@ -39,8 +39,8 @@ steps:
         - vrobbler collectstatic --noinput
         - immortalctl restart celery && immortalctl restart vrobbler
     when:
-      branch:
-      - main
+      ref:
+        - refs/tags/*
   - name: build success notification
     image: parrazam/drone-ntfy:0.3-linux-amd64
     when:

vrobbler/apps/scrobbles/views.py

@@ -201,7 +201,7 @@ class RecentScrobbleList(ListView):
                 processed_finished__isnull=True,
                 user=self.request.user,
             )
-            data["counts"] = scrobble_counts(user)
+            data["counts"] = [] #scrobble_counts(user)
         else:
             data["weekly_data"] = week_of_scrobbles()
             data["counts"] = scrobble_counts()

vrobbler/apps/videos/sources/tmdb.py

@@ -1,19 +1,19 @@
 import logging
 
+import pendulum
 from django.conf import settings
 from themoviedb import TMDb
-from tmdbv3api import TV, TMDb as TMDb_direct
+from tmdbv3api import TV, Movie, TMDb as TMDb_direct
 from videos.metadata import VideoMetadata, VideoType
 
-key = getattr(settings, "TMDB_API_KEY", "33de8d24785931068ae356510dcfbac8")
-key = "33de8d24785931068ae356510dcfbac8"
+TMDB_KEY = getattr(settings, "TMDB_API_KEY", "")
 
 tmdb_direct = TMDb_direct()
-tmdb_direct.api_key = "33de8d24785931068ae356510dcfbac8"
+tmdb_direct.api_key = TMDB_KEY
 
-tmdb = TMDb(key=key, language="en-US", region="US")
+tmdb = TMDb(key=TMDB_KEY, language="en-US", region="US")
 
-TMDB_STILL_URL = "https://image.tmdb.org/t/p/original"
+TMDB_IMAGE_URL = "https://image.tmdb.org/t/p/original"
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +28,6 @@ def lookup_video_from_tmdb(
         imdb_id = name_or_id[2:]
 
     video_metadata = VideoMetadata(imdb_id=imdb_id)
-    imdb_result: dict = {}
 
     tmdb_result = tmdb.find().by_imdb("tt" + imdb_id)
 
@@ -44,13 +43,23 @@ def lookup_video_from_tmdb(
     media = None
     show = None
     if len(tmdb_result.movie_results) > 0:
-        media = tmdb_result.movie_results[0]
+        media = Movie().details(tmdb_result.movie_results[0].id)
         video_metadata.video_type = VideoType.MOVIE.value
+        video_metadata.title = media.title
+        video_metadata.cover_url = TMDB_IMAGE_URL + media.poster_path # TODO: enrich this with TMDB url
+        video_metadata.year = pendulum.parse(media.release_date).year
+        video_metadata.genres = [g.get("name", "") for g in media.genres]
+
     if len(tmdb_result.tv_episode_results) > 0:
         video_metadata.video_type = VideoType.TV_EPISODE.value
         media = tmdb_result.tv_episode_results[0]
-        series_imdb_id = TV().external_ids(media.show_id).imdb_id[2:]
+        video_metadata.title = media.name
+        video_metadata.cover_url = TMDB_IMAGE_URL + media.still_path # TODO: enrich this with TMDB url
+        video_metadata.episode_number = media.episode_number
+        video_metadata.season_number = media.season_number
+        video_metadata.year = media.air_date.year
 
+        series_imdb_id = TV().external_ids(media.show_id).imdb_id[2:]
         series, created = Series.objects.get_or_create(imdb_id=series_imdb_id)
         if created:
             show_data = TV().details(tv_id=media.show_id)
@@ -63,15 +72,10 @@ def lookup_video_from_tmdb(
         return video_metadata
 
     video_metadata.tmdb_id = media.id
-    video_metadata.cover_url = TMDB_STILL_URL + media.still_path # TODO: enrich this with TMDB url
     video_metadata.run_time_seconds = media.runtime * 60
-    video_metadata.title = media.name
-    video_metadata.episode_number = media.episode_number
-    video_metadata.season_number = media.season_number
-    #video_metadata.next_imdb_id = imdb_result.get("next episode", None)
-    video_metadata.year = media.air_date.year
     video_metadata.plot = media.overview
-    video_metadata.imdb_rating = media.vote_average
-    #video_metadata.genres = imdb_result.get("genres", [])
+    video_metadata.overview = media.overview
+    video_metadata.tmdb_rating = media.vote_average
+    #video_metadata.next_imdb_id = imdb_result.get("next episode", None)
 
     return video_metadata

vrobbler/templates/videos/video_detail.html

@@ -57,6 +57,7 @@ dd {
 <div class="row header">
     <div class="cover image-wrapper">
         {% if object.imdb_rating %}<div class="caption">{{object.imdb_rating}}</div>{% endif %}
+        {% if object.tmdb_rating %}<div class="caption">{{object.tmdb_rating}}</div>{% endif %}
         <img src="{% if object.cover_image %}{{object.cover_image.url}}{% else %}{% static 'images/no-video-cover.jpg' %}{% endif %}" width="400px" />
         <div class="caption-footer">{{object.year}}{% if object.tv_series %} | <b>S</b>{{object.season_number}} <b>E</b>{{object.episode_number}}{% endif %}</div>
     </div>