diff --git a/catalog/jobs/discover.py b/catalog/jobs/discover.py index 6ef47fe4..8fc479b8 100644 --- a/catalog/jobs/discover.py +++ b/catalog/jobs/discover.py @@ -79,8 +79,10 @@ def get_popular_commented_podcast_ids(self, days, exisiting_ids): def cleanup_shows(self, items): seasons = [i for i in items if i.__class__ == TVSeason] for season in seasons: - if season.show in items: - items.remove(season.show) + if season.show: + items.remove(season) + if season.show not in items: + items.append(season.show) return items def run(self): diff --git a/catalog/podcast/models.py b/catalog/podcast/models.py index bf25834a..f2dc9ab6 100644 --- a/catalog/podcast/models.py +++ b/catalog/podcast/models.py @@ -67,7 +67,7 @@ class Podcast(Item): # "brief", "localized_title", "language", - "hosts", + "host", "genre", "official_site", "localized_description", diff --git a/catalog/podcast/tests.py b/catalog/podcast/tests.py index ba938c4f..8ab25897 100644 --- a/catalog/podcast/tests.py +++ b/catalog/podcast/tests.py @@ -138,7 +138,7 @@ def test_scrape_typlog(self): # metadata = site.resource.metadata # self.assertEqual(metadata["title"], "大内密谈") # self.assertEqual(metadata["genre"], ["other"]) - # self.assertEqual(metadata["hosts"], ["大内密谈"]) + # self.assertEqual(metadata["host"], ["大内密谈"]) # self.assertIsNotNone(site.get_item().recent_episodes[0].title) # self.assertIsNotNone(site.get_item().recent_episodes[0].link) # self.assertIsNotNone(site.get_item().recent_episodes[0].media_url) diff --git a/catalog/templates/album.html b/catalog/templates/album.html index 68824414..5da6277e 100644 --- a/catalog/templates/album.html +++ b/catalog/templates/album.html @@ -9,7 +9,7 @@ {% load duration %} {% block details %} -
{% include '_people.html' with people=item.additional_title role='other title' max=5 %}
+
{% include '_people.html' with people=item.additional_title role='' max=99 %}
{% include '_people.html' with people=item.artist role='artist' max=5 %}
{% include '_people.html' with people=item.company role='publisher' max=5 %}
diff --git a/catalog/templates/game.html b/catalog/templates/game.html index 3592c2d0..473ce6e7 100644 --- a/catalog/templates/game.html +++ b/catalog/templates/game.html @@ -9,7 +9,7 @@ {% block details %}
- {% include '_people.html' with people=item.additional_title _role='other title' max=99 %} + {% include '_people.html' with people=item.additional_title _role='' max=99 %}
{% if item.release_date %} diff --git a/catalog/templates/movie.html b/catalog/templates/movie.html index a7f93007..fc31face 100644 --- a/catalog/templates/movie.html +++ b/catalog/templates/movie.html @@ -8,7 +8,7 @@ {% load thumb %} {% block details %} -
{% include '_people.html' with people=item.additional_title role='other title' max=5 %}
+
{% include '_people.html' with people=item.additional_title role='' max=99 %}
{% include '_people.html' with people=item.director role='director' max=5 %}
{% include '_people.html' with people=item.playwright role='playwright' max=5 %}
{% include '_people.html' with people=item.actor role='actor' max=5 %}
diff --git a/catalog/templates/performance.html b/catalog/templates/performance.html index 282e042a..f617550b 100644 --- a/catalog/templates/performance.html +++ b/catalog/templates/performance.html @@ -8,7 +8,7 @@ {% load thumb %} {% block details %} -
{% include '_people.html' with people=item.additional_title _role='other title' max=5 %}
+
{% include '_people.html' with people=item.additional_title _role='' max=99 %}
{% if item.opening_date %} {% trans "opening date" %}: diff --git a/catalog/templates/performanceproduction.html b/catalog/templates/performanceproduction.html index 82ba1580..4b5ad3e4 100644 --- a/catalog/templates/performanceproduction.html +++ b/catalog/templates/performanceproduction.html @@ -15,7 +15,7 @@ {% if item.closing_date %}~ {{ item.closing_date }}{% endif %} {% endif %}
-
{% include '_people.html' with people=item.additional_title _role='other title' max=5 %}
+
{% include '_people.html' with people=item.additional_title _role='' max=99 %}
{% include '_people.html' with people=item.genre role='genre' max=5 %}
{% include '_people.html' with people=item.troupe role='troupe' max=5 %}
{% include '_people.html' with people=item.location role='theater' max=5 %}
diff --git a/catalog/templates/tvshow.html b/catalog/templates/tvshow.html index 524d10f4..04044aa5 100644 --- a/catalog/templates/tvshow.html +++ b/catalog/templates/tvshow.html @@ -8,7 +8,7 @@ {% load thumb %} {% block details %} -
{% include '_people.html' with people=item.additional_title role='other title' max=5 %}
+
{% include '_people.html' with people=item.additional_title role='' max=99 %}
{% include '_people.html' with people=item.director role='director' max=5 %}
{% include '_people.html' with people=item.playwright role='playwright' max=5 %}
{% include '_people.html' with people=item.actor role='actor' max=5 %}
diff --git a/catalog/templates/work.html b/catalog/templates/work.html index 201aa675..a4cd49ba 100644 --- a/catalog/templates/work.html +++ b/catalog/templates/work.html @@ -8,7 +8,7 @@ {% load thumb %} {% block details %} -
{% include '_people.html' with people=item.additional_title role='other title' max=5 %}
+
{% include '_people.html' with people=item.additional_title role='' max=99 %}
{% include '_people.html' with people=item.author role='author' max=5 %}
{% endblock %} {% block left_sidebar %} diff --git a/compose.yml b/compose.yml index f1a083c1..221fc82b 100644 --- a/compose.yml +++ b/compose.yml @@ -188,7 +188,7 @@ services: neodb-worker: <<: *neodb-service - command: neodb-manage rqworker --with-scheduler import export mastodon fetch crawl ap cron + command: neodb-manage rqworker-pool --num-workers ${NEODB_RQ_WORKER_NUM:-4} --with-scheduler import export mastodon fetch crawl ap cron depends_on: migration: condition: service_completed_successfully