Bump version to 0.4.3

Actually fix bug in loading extra video meta
Add podcasts to template list
2023-01-12 23:51:58 -05:00 · 2023-01-12 23:51:10 -05:00 · 2023-01-12 23:50:57 -05:00 · 2023-01-12 23:39:11 -05:00 · 2023-01-12 23:38:34 -05:00 · 2023-01-12 22:59:29 -05:00
8 changed files with 79 additions and 34 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vrobbler"
-version = "0.4.1"
+version = "0.4.3"
 description = ""
 authors = ["Colin Powell <colin@unbl.ink>"]

--- a/templates/base.html
+++ b/templates/base.html
@ -1,25 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="">
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-        <title>Untitled</title>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <link rel="apple-touch-icon" href="/apple-touch-icon.png">
-        <!-- Place favicon.ico in the root directory -->
-
-    </head>
-    <body>
-        <!--[if lt IE 8]>
-            <p class="browserupgrade">
-            You are using an <strong>outdated</strong> browser. Please
-            <a href="http://browsehappy.com/">upgrade your browser</a> to improve
-            your experience.
-            </p>
-        <![endif]-->
-
-
-    </body>
-</html>
--- a/vrobbler/apps/scrobbles/views.py
+++ b/vrobbler/apps/scrobbles/views.py
@ -61,10 +61,14 @@ class RecentScrobbleList(ListView):
        data['now_playing_list'] = Scrobble.objects.filter(
            in_progress=True,
            is_paused=False,
+            modified__gte=last_eight_minutes,
            timestamp__lte=now,
        )
        data['video_scrobble_list'] = Scrobble.objects.filter(
-            video__isnull=False, in_progress=False
+            video__isnull=False, played_to_completion=True
+        ).order_by('-timestamp')[:10]
+        data['podcast_scrobble_list'] = Scrobble.objects.filter(
+            podcast_episode__isnull=False, played_to_completion=True
        ).order_by('-timestamp')[:10]
        data['top_daily_tracks'] = top_tracks()
        data['top_weekly_tracks'] = top_tracks(filter='week')
--- a/vrobbler/apps/videos/models.py
+++ b/vrobbler/apps/videos/models.py
@ -82,6 +82,7 @@ class Video(ScrobblableMixin):
            "video_type": Video.VideoType.MOVIE,
        }

+        series = None
        if data_dict.get("ItemType", "") == "Episode":
            series_name = data_dict.get("SeriesName", "")
            series, series_created = Series.objects.get_or_create(
@ -101,13 +102,15 @@ class Video(ScrobblableMixin):
            "tagline": data_dict.get("Tagline", None),
            "run_time_ticks": data_dict.get("RunTimeTicks", 0) // 10000,
            "run_time": convert_to_seconds(data_dict.get("RunTime", "")),
-            "tv_series_id": series.id,
            "tvdb_id": data_dict.get("Provider_tvdb", None),
            "tvrage_id": data_dict.get("Provider_tvrage", None),
            "episode_number": data_dict.get("EpisodeNumber", ""),
            "season_number": data_dict.get("SeasonNumber", ""),
        }

+        if series:
+            video_extra_dict["tv_series_id"] = series.id
+
        if created:
            logger.debug(f"Created new video: {video}")
            for key, value in video_extra_dict.items():
--- a/vrobbler/templates/base.html
+++ b/vrobbler/templates/base.html
@ -213,7 +213,7 @@

                        <ul class="nav flex-column">
                            <li class="nav-item">
-                                <a class="nav-link active" aria-current="page" href="#">
+                                <a class="nav-link active" aria-current="page" href="/">
                                <span data-feather="music"></span>
                                Dashboard
                                </a>
--- a/vrobbler/templates/scrobbles/scrobble_list.html
+++ b/vrobbler/templates/scrobbles/scrobble_list.html
@ -37,7 +37,7 @@
                </ul>

                <div class="tab-content" id="myTabContent">
-                    <div class="tab-pane fade show" id="artists-week" role="tabpanel" aria-labelledby="artists-week-tab">
+                    <div class="tab-pane fade show active" id="artists-week" role="tabpanel" aria-labelledby="artists-week-tab">
                        <h2>Top artists this week</h2>
                        <div class="table-responsive">
                            <table class="table table-striped table-sm">
@ -59,7 +59,7 @@
                        </div>
                    </div>

-                    <div class="tab-pane fade show active" id="tracks-week" role="tabpanel" aria-labelledby="tracks-week-tab">
+                    <div class="tab-pane fade show" id="tracks-week" role="tabpanel" aria-labelledby="tracks-week-tab">
                        <h2>Top tracks this week</h2>
                        <div class="table-responsive">
                            <table class="table table-striped table-sm">
@ -92,6 +92,9 @@
                <li class="nav-item" role="presentation">
                    <button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#latest-watched" type="button" role="tab" aria-controls="profile" aria-selected="false">Latest Watched</button>
                </li>
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#latest-podcasted" type="button" role="tab" aria-controls="profile" aria-selected="false">Latest Podcasted</button>
+                </li>
            </ul>

            <div class="tab-content" id="myTabContent2">
@ -128,7 +131,6 @@
                            <th scope="col">Time</th>
                            <th scope="col">Title</th>
                            <th scope="col">Series</th>
-                            <th scope="col">Source</th>
                            </tr>
                        </thead>
                        <tbody>
@ -137,7 +139,30 @@
                                <td>{{scrobble.timestamp|naturaltime}}</td>
                                <td>{% if scrobble.video.tv_series %}E{{scrobble.video.season_number}}S{{scrobble.video.season_number}} -{% endif %} {{scrobble.video.title}}</td>
                                <td>{% if scrobble.video.tv_series %}{{scrobble.video.tv_series}}{% endif %}</td>
-                                <td>{{scrobble.source}}</td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                        </table>
+                    </div>
+                </div>
+
+                <div class="tab-pane fade show" id="latest-podcasted" role="tabpanel" aria-labelledby="latest-podcasted-tab">
+                    <h2>Latest Podcasted</h2>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-sm">
+                        <thead>
+                            <tr>
+                            <th scope="col">Date</th>
+                            <th scope="col">Title</th>
+                            <th scope="col">Podcast</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for scrobble in podcast_scrobble_list %}
+                            <tr>
+                                <td>{{scrobble.timestamp|naturaltime}}</td>
+                                <td>{{scrobble.podcast_episode.title}}</td>
+                                <td>{{scrobble.podcast_episode.podcast}}</td>
                            </tr>
                            {% endfor %}
                        </tbody>
--- a/vrobbler/templates/videos/movie_list.html
+++ b/vrobbler/templates/videos/movie_list.html
@ -1,12 +1,28 @@
 {% extends "base.html" %}

 {% block content %}
+<main class="col-md-4 ms-sm-auto col-lg-10 px-md-4">
+    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+        <h1 class="h2">Movies</h1>
+        <div class="btn-toolbar mb-2 mb-md-0">
+        <div class="btn-group me-2">
+            <button type="button" class="btn btn-sm btn-outline-secondary">Share</button>
+            <button type="button" class="btn btn-sm btn-outline-secondary">Export</button>
+        </div>
+        <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle">
+            <span data-feather="calendar"></span>
+            This week
+        </button>
+        </div>
+    </div>

-    <h2>Movies</h2>
+    <div class="container">

    <ul>
        {% for movie in object_list %}
        <li>{{movie}}</li>
        {% endfor %}
    </ul>
+    </div>
+</main>
 {% endblock %}
--- a/vrobbler/templates/videos/series_list.html
+++ b/vrobbler/templates/videos/series_list.html
@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+{% block content %}
+<main class="col-md-4 ms-sm-auto col-lg-10 px-md-4">
+    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+        <h1 class="h2">Series</h1>
+        <div class="btn-toolbar mb-2 mb-md-0">
+            <div class="btn-group me-2">
+                <button type="button" class="btn btn-sm btn-outline-secondary">Export</button>
+            </div>
+        </div>
+    </div>
+
+    <div class="container">
+        <ul>
+            {% for movie in object_list %}
+            <li>{{movie}}</li>
+            {% endfor %}
+        </ul>
+    </div>
+</main>
+{% endblock %}
Author	SHA1	Message	Date
Colin Powell	72fded4097	Bump version to 0.4.3	2023-01-12 23:51:58 -05:00
Colin Powell	d5eea53a01	Actually fix bug in loading extra video meta	2023-01-12 23:51:10 -05:00
Colin Powell	a49eb31276	Add podcasts to template list	2023-01-12 23:50:57 -05:00
Colin Powell	c1e1160db3	Bump version to 0.4.2	2023-01-12 23:39:11 -05:00
Colin Powell	0e17831724	Fix bug in load extra video info	2023-01-12 23:38:34 -05:00
Colin Powell	045fad8552	Remove errant base template	2023-01-12 22:59:29 -05:00