Expose Feed.update_after and Feed.last_retrieved. #332

CHANGES.rst

@@ -13,6 +13,13 @@ Unreleased
 
 * Update entries whenever their :attr:`~Entry.updated` changes,
   don't compare the values. (:issue:`332`)
+* Add :attr:`Feed.update_after` and :attr:`Feed.last_retrieved`. (:issue:`332`)
+* The ``new`` filter of :meth:`~Reader.update_feeds()` etc. considers
+  a feed as new if it was never retrieved (:attr:`~Feed.last_retrieved`),
+  not if it was never updated successfully (:attr:`~Feed.last_updated`). (:issue:`332`)
+
+  .. FIXME: versionchanged on update_feeds() etc.
+
 * Group mutually-exclusive attributes of :class:`~.FeedUpdateIntent`
   into its :attr:`~.FeedUpdateIntent.value` union attribute. (:issue:`332`)
 

src/reader/_storage/_entries.py

@@ -415,6 +415,8 @@ def get_entries_query(
             feeds.last_updated
             feeds.last_exception
             feeds.updates_enabled
+            feeds.update_after
+            feeds.last_retrieved
             entries.id
             entries.updated
             entries.title
@@ -444,7 +446,7 @@ def get_entries_query(
 
 
 def entry_factory(row: tuple[Any, ...]) -> Entry:
-    feed = feed_factory(row[0:12])
+    feed = feed_factory(row[0:14])
     (
         id,
         updated,
@@ -464,7 +466,7 @@ def entry_factory(row: tuple[Any, ...]) -> Entry:
         last_updated,
         original_feed,
         sequence,
-    ) = row[12:30]
+    ) = row[14:32]
     return Entry(
         id,
         convert_timestamp(updated) if updated else None,

src/reader/_storage/_feeds.py

@@ -285,6 +285,8 @@ def get_feeds_query(filter: FeedFilter, sort: FeedSort) -> tuple[Query, dict[str
             'last_updated',
             'last_exception',
             'updates_enabled',
+            'update_after',
+            'last_retrieved',
         )
         .FROM("feeds")
         .scrolling_window_sort_key(FEED_SORT_KEYS[sort])
@@ -307,7 +309,9 @@ def feed_factory(row: tuple[Any, ...]) -> Feed:
         last_updated,
         last_exception,
         updates_enabled,
-    ) = row[:12]
+        update_after,
+        last_retrieved,
+    ) = row[:14]
     return Feed(
         url,
         convert_timestamp(updated) if updated else None,
@@ -321,6 +325,8 @@ def feed_factory(row: tuple[Any, ...]) -> Feed:
         convert_timestamp(last_updated) if last_updated else None,
         ExceptionInfo(**json.loads(last_exception)) if last_exception else None,
         updates_enabled == 1,
+        convert_timestamp(update_after) if update_after else None,
+        convert_timestamp(last_retrieved) if last_retrieved else None,
     )
 
 

src/reader/types.py

@@ -119,7 +119,7 @@ class Feed(_namedtuple_compat):
     #: .. versionadded:: 1.3
     added: datetime = cast(datetime, None)
 
-    #: The date when the feed was last retrieved by reader.
+    #: The date when the feed was last (successfully) updated by reader.
     #:
     #: .. versionadded:: 1.3
     last_updated: datetime | None = None
@@ -139,6 +139,18 @@ class Feed(_namedtuple_compat):
     #: .. versionadded:: 1.11
     updates_enabled: bool = True
 
+    #: The earliest time the feed will next be updated
+    #: (when using scheduled updates).
+    #:
+    #: .. versionadded:: 3.13
+    update_after: datetime | None = None
+
+    #: The date when the feed was last retrieved by reader,
+    #: regardless of the outcome.
+    #:
+    #: .. versionadded:: 3.13
+    last_retrieved: datetime | None = None
+
     @property
     def resource_id(self) -> tuple[str]:
         """Alias for (:attr:`~url`,).