Add EntryCounts.unread/unimportant. #283 / #342

src/reader/_app/__init__.py

@@ -418,7 +418,7 @@ def add_entry():
 FEED_SORT_NATIVE = {'title', 'added'}
 FEED_SORT_FANCY = {
     'important': lambda counts: counts.important,
-    # TODO: an unread/unimportant property would be nice
+    'unimportant':lambda counts: counts.unimportant,
     'unread': lambda counts: counts.total - counts.read,
     # TODO: if we keep these average intervals, properties for them might be nice too
     'avg1m': lambda counts: counts.averages[0],
@@ -435,7 +435,6 @@ def feeds():
 
     updates_enabled = request.args.get('updates-enabled')
     updates_enabled = {None: None, 'no': False, 'yes': True}[updates_enabled]
-
     sort = request.args.get('sort', 'title')
     assert sort in FEED_SORT_ALL
 

src/reader/_storage/_entries.py

@@ -101,8 +101,7 @@ def get_entry_counts(
         context.update(new_context)
 
         row = exactly_one(self.get_db().execute(str(query), context))
-
-        return EntryCounts(*row[:4], row[4:7])  # type: ignore[call-arg]
+        return EntryCounts(*row[:5], row[5:8])  # type: ignore[call-arg]
 
     @wrap_exceptions()
     def set_entry_read(
@@ -593,6 +592,7 @@ def get_entry_counts_query(
             'count(*)',
             'coalesce(sum(read == 1), 0)',
             'coalesce(sum(important == 1), 0)',
+            'coalesce(sum(important == 0), 0)',
             """
             coalesce(
                 sum(
@@ -606,7 +606,6 @@ def get_entry_counts_query(
         .FROM("entries_filtered")
         .JOIN("entries USING (id, feed)")
     )
-
     # one CTE / period + HAVING in the CTE is a tiny bit faster than
     # one CTE + WHERE in the SELECT
 

src/reader/_storage/_search.py

@@ -486,7 +486,7 @@ def search_entry_counts(
 
         context = dict(query=query, **query_context)
         row = exactly_one(self.get_db().execute(str(sql_query), context))
-        return EntrySearchCounts(*row[:4], row[4:7])  # type: ignore[call-arg]
+        return EntrySearchCounts(*row[:5], row[5:8])  # type: ignore[call-arg]
 
 
 def make_search_entries_query(

src/reader/types.py

@@ -898,6 +898,9 @@ class EntryCounts(_namedtuple_compat):
     #: Number of important entries.
     important: int | None = None
 
+    #: Number of unimportant entries.
+    unimportant: int | None = None
+
     #: Number of entries that have enclosures.
     has_enclosures: int | None = None
 
@@ -935,6 +938,9 @@ class EntrySearchCounts(_namedtuple_compat):
     #: Number of important entries.
     important: int | None = None
 
+    #: Number of unimportant entries.
+    unimportant: int | None = None
+
     #: Number of entries that have enclosures.
     has_enclosures: int | None = None
 

tests/test_reader_counts.py

@@ -66,6 +66,7 @@ def entries_per_day(month, quarter, year):
             9,
             read=2,
             important=4,
+            unimportant=0,
             has_enclosures=8,
             averages=entries_per_day(2, 3, 7),
         ),
@@ -76,6 +77,7 @@ def entries_per_day(month, quarter, year):
             1,
             read=0,
             important=0,
+            unimportant=0,
             has_enclosures=0,
             averages=entries_per_day(0, 0, 1),
         ),
@@ -86,6 +88,7 @@ def entries_per_day(month, quarter, year):
             8,
             read=2,
             important=4,
+            unimportant=0,
             has_enclosures=8,
             averages=entries_per_day(2, 3, 6),
         ),
@@ -96,6 +99,7 @@ def entries_per_day(month, quarter, year):
             1,
             read=0,
             important=0,
+            unimportant=0,
             has_enclosures=0,
             averages=entries_per_day(0, 0, 1),
         ),
@@ -106,6 +110,7 @@ def entries_per_day(month, quarter, year):
             1,
             read=1,
             important=1,
+            unimportant=0,
             has_enclosures=1,
             averages=entries_per_day(0, 0, 0),
         ),
@@ -116,6 +121,7 @@ def entries_per_day(month, quarter, year):
             1,
             read=0,
             important=1,
+            unimportant=0,
             has_enclosures=1,
             averages=entries_per_day(0, 0, 1),
         ),
@@ -126,6 +132,7 @@ def entries_per_day(month, quarter, year):
             1,
             read=0,
             important=0,
+            unimportant=0,
             has_enclosures=1,
             averages=entries_per_day(0, 0, 1),
         ),
@@ -136,6 +143,7 @@ def entries_per_day(month, quarter, year):
             2,
             read=2,
             important=2,
+            unimportant=0,
             has_enclosures=2,
             averages=entries_per_day(1, 1, 1),
         ),
@@ -146,6 +154,7 @@ def entries_per_day(month, quarter, year):
             7,
             read=0,
             important=2,
+            unimportant=0,
             has_enclosures=6,
             averages=entries_per_day(1, 2, 6),
         ),
@@ -156,6 +165,7 @@ def entries_per_day(month, quarter, year):
             4,
             read=2,
             important=4,
+            unimportant=0,
             has_enclosures=4,
             averages=entries_per_day(1, 1, 2),
         ),
@@ -166,6 +176,7 @@ def entries_per_day(month, quarter, year):
             5,
             read=0,
             important=0,
+            unimportant=0,
             has_enclosures=4,
             averages=entries_per_day(1, 2, 5),
         ),
@@ -176,6 +187,7 @@ def entries_per_day(month, quarter, year):
             8,
             read=2,
             important=4,
+            unimportant=0,
             has_enclosures=8,
             averages=entries_per_day(2, 3, 6),
         ),
@@ -186,6 +198,7 @@ def entries_per_day(month, quarter, year):
             1,
             read=0,
             important=0,
+            unimportant=0,
             has_enclosures=0,
             averages=entries_per_day(0, 0, 1),
         ),
@@ -196,6 +209,7 @@ def entries_per_day(month, quarter, year):
             1,
             read=0,
             important=0,
+            unimportant=0,
             has_enclosures=0,
             averages=entries_per_day(0, 0, 1),
         ),

tests/test_reader_search.py

@@ -600,7 +600,7 @@ def test_search_entries_basic(reader, sort):
     # TODO: the asserts below look parametrizable
 
     assert list(search('zero')) == []
-    assert search_counts('zero') == EntrySearchCounts(0, 0, 0, 0, (0, 0, 0))
+    assert search_counts('zero') == EntrySearchCounts(0, 0, 0, 0, 0, (0, 0, 0))
     assert list(search('one')) == [
         EntrySearchResult(
             feed.url,
@@ -611,7 +611,7 @@ def test_search_entries_basic(reader, sort):
             },
         )
     ]
-    assert search_counts('one') == EntrySearchCounts(1, 0, 0, 0, (0, 0, 0))
+    assert search_counts('one') == EntrySearchCounts(1, 0, 0, 0,0,(0, 0, 0))
     assert list(search('two')) == [
         EntrySearchResult(
             feed.url,
@@ -684,7 +684,7 @@ def test_search_entries_basic(reader, sort):
             ),
         ]
     }
-    assert search_counts('summary') == EntrySearchCounts(3, 0, 0, 0, (0, 0, 0))
+    assert search_counts('summary') == EntrySearchCounts(3, 0, 0, 0, 0,(0, 0, 0))
 
 
 # search_entries() filtering is tested in test_reader.py::test_entries_filtering{,_error}