瀏覽代碼

Merge branch 'main' into develop

Colin Powell 2 月之前
父節點
當前提交
650ecf12c6
共有 3 個文件被更改,包括 6 次插入4 次删除
  1. 2 2
      .drone.yml
  2. 3 2
      vrobbler/apps/videos/sources/tmdb.py
  3. 1 0
      vrobbler/templates/videos/video_detail.html

+ 2 - 2
.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:

+ 3 - 2
vrobbler/apps/videos/sources/tmdb.py

@@ -12,7 +12,7 @@ tmdb_direct.api_key = TMDB_KEY
 
 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__)
 
@@ -44,6 +44,7 @@ def lookup_video_from_tmdb(
     if len(tmdb_result.movie_results) > 0:
         media = tmdb_result.movie_results[0]
         video_metadata.video_type = VideoType.MOVIE.value
+        video_metadata.cover_url = TMDB_IMAGE_URL + media.poster_path # TODO: enrich this with TMDB url
     if len(tmdb_result.tv_episode_results) > 0:
         video_metadata.video_type = VideoType.TV_EPISODE.value
         media = tmdb_result.tv_episode_results[0]
@@ -55,13 +56,13 @@ def lookup_video_from_tmdb(
             series.name = show_data.name
             series.save()
         video_metadata.tv_series_id = series.id
+        video_metadata.cover_url = TMDB_IMAGE_URL + media.still_path # TODO: enrich this with TMDB url
 
     if not media:
         logger.warning("Video not found on TMDB", extra={"imdb_id":imdb_id})
         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

+ 1 - 0
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>