Fix get_feeds(feed='') and get_entries(entry=('', '')) bug.

Fixes #392.

Author: lemon24

CHANGES.rst

@@ -15,8 +15,11 @@ Unreleased
 
   * Add support for import / export in the web app; :ref:`screenshots <screenshots-import>`.
 
-
 * Deprecate the :func:`~reader.utils.archive_entries` ``feed_user_title`` argument.
+* Fix :meth:`get_feeds(feed='') <Reader.get_feeds>` and
+  :meth:`get_entries(entry=('', '')) <Reader.get_entries>`
+  returning wrong entries.
+  (:issue:`392`)
 
 
 Version 3.22

src/reader/_storage/_entries.py

@@ -523,10 +523,10 @@ def entry_filter(
 
     context = {}
 
-    if feed_url:
+    if feed_url is not None:
         add("entries.feed = :feed_url")
         context['feed_url'] = feed_url
-        if entry_id:
+        if entry_id is not None:
             add("entries.id = :entry_id")
             context['entry_id'] = entry_id
 

src/reader/_storage/_feeds.py

@@ -346,7 +346,7 @@ def feed_filter(query: Query, filter: FeedFilter) -> dict[str, Any]:
 
     context: dict[str, object] = {}
 
-    if url:
+    if url is not None:
         query.WHERE("url = :url")
         context.update(url=url)
 

tests/test_reader_filter.py

@@ -3,8 +3,10 @@
 from fakeparser import Parser
 from reader import Enclosure
 from reader import Entry
+from reader import EntryNotFoundError
 from reader import EntrySource
 from reader import Feed
+from reader import FeedNotFoundError
 from reader import make_reader
 from reader_methods import get_feeds
 from reader_methods import get_feeds_via_update
@@ -244,6 +246,20 @@ def test_entries_error(reader, get_entries, kwargs):
         get_entries(reader, **kwargs)
 
 
+def test_entries_empty_string(reader, parser):
+    """https://github.com/lemon24/reader/issues/392"""
+
+    reader.add_feed(parser.feed(1))
+    parser.entry(1, 1)
+    reader.update_feeds()
+
+    with pytest.raises(EntryNotFoundError):
+        reader.get_entry(('', ''))
+
+    with pytest.raises(EntryNotFoundError):
+        reader.get_entry(('1', ''))
+
+
 # TODO: ideally, systematize all filtering tests?
 
 # END entry filtering tests
@@ -326,4 +342,13 @@ def test_feeds_error(reader, kwargs):
         reader.get_feeds(**kwargs)
 
 
+def test_feeds_empty_string(reader, parser):
+    """https://github.com/lemon24/reader/issues/392"""
+
+    reader.add_feed(parser.feed(1))
+
+    with pytest.raises(FeedNotFoundError):
+        reader.get_feed('')
+
+
 # END feed filtering tests