Merge pull request #143 from matagus/bug-fixes-may-2026

matagus · web-flow · commit cdd5005aed1c · 2026-05-09T14:10:37.000-05:00
Bug fixes
diff --git a/planet/__about__.py b/planet/__about__.py
@@ -1 +1 @@
-version = "1.0.0"
+version = "1.1.0"
diff --git a/planet/admin.py b/planet/admin.py
@@ -166,7 +166,7 @@ class BlogAdmin(admin.ModelAdmin):
     list_display = ("title", "url", "date_created")
     search_fields = ["title", "url"]
     list_filter = (
-        ("feed__language", admin.RelatedOnlyFieldListFilter),
-        ("feed__is_active", admin.RelatedOnlyFieldListFilter),
+        "feed__language",
+        "feed__is_active",
     )
     inlines = [FeedInlineReadOnly]
diff --git a/planet/context_processors.py b/planet/context_processors.py
@@ -6,7 +6,7 @@
 
 
 def context(request):
-    if request.method == "GET" and request.GET.get("search"):
+    if request.method == "GET" and request.GET.get("q"):
         search_form = SearchForm(request.GET)
     else:
         search_form = SearchForm()
diff --git a/planet/locale/es/LC_MESSAGES/django.po b/planet/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-20 15:22+0000\n"
+"POT-Creation-Date: 2026-05-09 18:48+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgid "Feed Status"
 msgstr "Feeds"
 
 #: admin.py:81 admin.py:124 forms.py:9 models.py:218 templates/base.html:36
-#: templates/base.html:43 templates/planet/authors/blocks/list.html:5
+#: templates/planet/authors/blocks/list.html:5
 #: templates/planet/authors/detail.html:21 templates/planet/authors/list.html:7
 #: templates/planet/authors/list.html:13 templates/planet/authors/list.html:19
 msgid "Authors"
@@ -79,12 +79,12 @@ msgstr "Feeds"
 msgid "No feeds"
 msgstr "Feeds"
 
-#: forms.py:7 models.py:182 templates/base.html:33 templates/base.html:41
+#: forms.py:7 models.py:182 templates/base.html:33
 #: templates/planet/feeds/detail.html:55 templates/planet/posts/list.html:20
 msgid "Posts"
 msgstr "Posts"
 
-#: forms.py:8 models.py:35 templates/base.html:34 templates/base.html:42
+#: forms.py:8 models.py:35 templates/base.html:34
 #: templates/planet/blogs/detail.html:22 templates/planet/blogs/list.html:7
 #: templates/planet/blogs/list.html:13 templates/planet/blogs/list.html:19
 #: templates/planet/feeds/detail.html:15 templates/planet/posts/detail.html:17
diff --git a/planet/managers.py b/planet/managers.py
@@ -56,7 +56,7 @@ def create_from(self, feed_data, blog):
         feed.title = feed_data.feed.get("title") or urlparse(feed_data.href).netloc
         feed.subtitle = feed_data.feed.get("subtitle")
         feed.rights = feed_data.feed.get("rights") or feed_data.feed.get("license")
-        feed.guid = md5_hash(feed_data.feed.get("id") or feed.url)
+        feed.guid = md5_hash(feed.url)
         feed.language = normalize_language(feed_data.feed.get("language"))
         feed.etag = feed_data.get("etag") or None
         feed.last_modified = to_datetime(feed_data.get("updated_parsed"))
@@ -174,6 +174,10 @@ def create_from(self, entry_data, feed):
         post.url = post_url
         post.guid = md5_hash(post.url)
 
+        if self.model.objects.filter(guid=post.guid).exists():
+            logger.debug("Skipping post %r: URL already exists in another feed", post.url)
+            return None
+
         try:
             post.content = entry_data.summary
         except AttributeError:
diff --git a/planet/migrations/0003_fix_feed_guid.py b/planet/migrations/0003_fix_feed_guid.py
@@ -0,0 +1,22 @@
+import hashlib
+
+from django.db import migrations
+
+
+def recompute_feed_guids(apps, schema_editor):
+    Feed = apps.get_model("planet", "Feed")
+
+    for feed in Feed.objects.all():
+        feed.guid = hashlib.md5(feed.url.encode("utf-8")).hexdigest()
+        feed.save(update_fields=["guid"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("planet", "0002_post_original_content"),
+    ]
+
+    operations = [
+        migrations.RunPython(recompute_feed_guids, migrations.RunPython.noop),
+    ]
diff --git a/planet/templates/base.html b/planet/templates/base.html
@@ -36,11 +36,11 @@
                             <li class="nav-item"><a href="{% url 'planet:author-list' %}" class="nav-link text-success">{% trans "Authors" %}</a></li>
                         </ul>
                         <form class="d-flex mt-2 mt-md-0" role="search" method="GET" action="{% url 'planet:search' %}">
-                            <input name="q" class="form-control me-2" type="search" placeholder="{% trans 'Search' %}" aria-label="{% trans 'Search' %}">
+                            <input name="q" value="{{ search_form.q.value|default_if_none:'' }}" class="form-control me-2" type="search" placeholder="{% trans 'Search' %}" aria-label="{% trans 'Search' %}">
                             <select name="w" class="form-select me-2" aria-label="{% trans 'Search for...' %}">
-                                <option selected value="posts">{% trans 'Posts' %}</option>
-                                <option value="blogs">{% trans 'Blogs' %}</option>
-                                <option value="authors">{% trans 'Authors' %}</option>
+                                {% for value, label in search_form.w.field.choices %}
+                                    <option value="{{ value }}"{% if value == search_form.w.value %} selected{% endif %}>{{ label }}</option>
+                                {% endfor %}
                             </select>
                             <button class="btn btn-outline-success" type="submit">{% trans 'Search' %}</button>
                         </form>
diff --git a/project/requirements.txt b/project/requirements.txt
@@ -2,7 +2,7 @@ Django==6.0.5
 django-environ==0.12.0
 django-extensions==4.1
 django-pagination-py3==1.2.0
-django-planet==1.0.0
+django-planet==1.1.0
 feedparser==6.0.12
 gunicorn==23.0.0
 ipython==8.10.0
diff --git a/tests/mocks.py b/tests/mocks.py
@@ -0,0 +1,58 @@
+from unittest.mock import MagicMock
+
+
+def _make_feed_data(
+    href="https://example.com/feed.xml",
+    title="",
+    link="",
+    feed_id="feed-id",
+    subtitle="",
+):
+    """Create a mock feedparser feed_data object."""
+    feed_data = MagicMock()
+    feed_data.href = href
+    feed_data.status = 200
+    feed_data.bozo = False
+    feed_data.entries = []
+    feed_data.feed = {
+        "title": title,
+        "link": link,
+        "subtitle": subtitle,
+        "id": feed_id,
+        "language": "en",
+    }
+    feed_data.get = lambda key, default=None: {
+        "etag": None,
+        "updated_parsed": None,
+    }.get(key, default)
+    return feed_data
+
+
+def _make_entry_data(link="", title="", authors=None, author=""):
+    """Create a mock feedparser entry_data object."""
+    if authors is None:
+        authors = []
+
+    class MockEntryData(dict):
+        def get(self, key, default=""):
+            data = {
+                "link": link,
+                "title": title,
+                "authors": authors,
+                "author": author,
+            }
+            return data.get(key, default)
+
+        @property
+        def published_parsed(self):
+            raise AttributeError("published_parsed")
+
+        @property
+        def summary_detail(self):
+            raise AttributeError("summary_detail")
+
+        @property
+        def summary(self):
+            return "Test summary"
+
+    return MockEntryData()
diff --git a/tests/settings.py b/tests/settings.py
@@ -66,13 +66,16 @@
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
+                "planet.context_processors.context",
             ],
         },
     },
 ]
 
 WSGI_APPLICATION = "example_project.wsgi.application"
 
+SITE_ID = 1
+
 
 # Database
 # https://docs.djangoproject.com/en/5.0/ref/settings/#databases
diff --git a/tests/test_admin.py b/tests/test_admin.py
@@ -139,6 +139,26 @@ def test_inline_has_no_add_form(self):
         self.assertNotContains(response, 'id="planet_feed-empty"')
 
 
+class BlogAdminChangelistTest(TestCase):
+    def setUp(self):
+        self.superuser = User.objects.create_superuser(username="admin", password="password", email="admin@example.com")
+        self.client.force_login(self.superuser)
+        self.list_url = reverse("admin:planet_blog_changelist")
+
+    def test_changelist_loads(self):
+        FeedFactory(language="en", is_active=True)
+        FeedFactory(language="es", is_active=False)
+        response = self.client.get(self.list_url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_changelist_filter_by_language(self):
+        feed_en = FeedFactory(language="en")
+        FeedFactory(language="es")
+        response = self.client.get(self.list_url, {"feed__language": "en"})
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, feed_en.blog.title)
+
+
 class PostAuthorDataAdminTest(TestCase):
     def setUp(self):
         self.superuser = User.objects.create_superuser(username="admin", password="password", email="admin@example.com")
diff --git a/tests/test_commands.py b/tests/test_commands.py
@@ -5,7 +5,9 @@
 from django.utils import timezone
 
 from planet.models import Author, Feed, Post, PostAuthorData
+from planet.utils import md5_hash
 from tests.factories import FeedFactory, PostFactory
+from tests.mocks import _make_feed_data
 
 
 class CreateAuthorsForPostTest(TestCase):
@@ -44,22 +46,6 @@ def test_no_retrieve_and_update_method(self):
         self.assertFalse(hasattr(Feed, "retrieve_and_update"))
 
 
-def _make_feed_data(title="Real Feed Title", link="https://example.com"):
-    feed_data = MagicMock()
-    feed_data.href = "https://example.com/feed.xml"
-    feed_data.status = 200
-    feed_data.bozo = False
-    feed_data.entries = []
-    feed_data.feed = {
-        "title": title,
-        "link": link,
-        "subtitle": "A subtitle",
-        "language": "en",
-    }
-    feed_data.get = lambda key, default=None: {"etag": None, "updated_parsed": None}.get(key, default)
-    return feed_data
-
-
 class UpdateAllFeedsMetadataTest(TestCase):
     def test_stub_feed_gets_metadata_updated(self):
         """A stub feed (last_checked=None) should have title updated on first run."""
@@ -119,6 +105,23 @@ def test_entry_with_no_url_is_skipped(self):
 
         self.assertEqual(Post.objects.count(), 0)
 
+    def test_add_feed_already_exists_logs_warning_no_exception(self):
+        """planet_add_feed should report 'already exists' (no IntegrityError) when re-run on an existing feed."""
+        url = "https://fly.io/django-beats/feed.xml"
+        feed_data = _make_feed_data()
+        feed_data.href = url
+        feed_data.feed["id"] = "urn:something:different"
+
+        with patch("planet.management.commands.planet_add_feed.parse_feed", return_value=feed_data):
+            call_command("planet_add_feed", url)
+            initial_count = Feed.objects.count()
+            self.assertEqual(initial_count, 1)
+
+            # Second invocation must not raise IntegrityError and must not duplicate.
+            call_command("planet_add_feed", url)
+
+        self.assertEqual(Feed.objects.count(), initial_count)
+
     def test_fetch_original_content_called_for_new_posts(self):
         """When FETCH_ORIGINAL_CONTENT is True, fetch_post_content() is called for each new post."""
         feed = FeedFactory(last_checked=None)
@@ -148,3 +151,20 @@ def test_fetch_original_content_called_for_new_posts(self):
             call_command("planet_update_all_feeds")
 
         self.assertEqual(mock_fetch.call_count, Post.objects.count())
+
+
+class AddFeedCommandTestCase(TestCase):
+
+    def test_add_feed_skips_entries_whose_url_already_exists(self):
+        """planet_add_feed skips entries whose URL already exists in another feed, without raising."""
+        existing_url = "https://example.com/already-imported"
+        existing_feed = FeedFactory()
+        PostFactory(feed=existing_feed, url=existing_url, guid=md5_hash(existing_url))
+
+        feed_data = _make_feed_data()
+        feed_data.entries = [{"link": existing_url, "title": "Duplicate Post", "authors": []}]
+
+        with patch("planet.management.commands.planet_add_feed.parse_feed", return_value=feed_data):
+            call_command("planet_add_feed", "https://example.com/feed.xml")
+
+        self.assertEqual(Post.objects.count(), 1)
diff --git a/tests/test_managers.py b/tests/test_managers.py
diff --git a/tests/test_views.py b/tests/test_views.py
