Fix Feedreader Atom feeds using updated date (#73208)

* Feedreader: Properly support Atom feeds that use only the `updated` date format and resolve #73207.

* Revert "Feedreader: Properly support Atom feeds that use only the `updated` date format and resolve #73207."

This reverts commit 4dbd11ee04.

* Properly support Atom feeds that use only the `updated` date format and resolve #73207.

* Revert "Properly support Atom feeds that use only the `updated` date format and resolve #73207."

This reverts commit 14366c6a24.

* Properly support Atom feeds that use only the `updated` date format and resolve #73207.
This commit is contained in:
d0nni3q84 2022-06-08 13:32:01 -05:00 committed by GitHub
parent b4a5abce16
commit f7bd88c952
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 74 additions and 7 deletions

View file

@ -70,6 +70,7 @@ class FeedManager:
self._last_entry_timestamp = None
self._last_update_successful = False
self._has_published_parsed = False
self._has_updated_parsed = False
self._event_type = EVENT_FEEDREADER
self._feed_id = url
hass.bus.listen_once(EVENT_HOMEASSISTANT_START, lambda _: self._update())
@ -122,7 +123,7 @@ class FeedManager:
)
self._filter_entries()
self._publish_new_entries()
if self._has_published_parsed:
if self._has_published_parsed or self._has_updated_parsed:
self._storage.put_timestamp(
self._feed_id, self._last_entry_timestamp
)
@ -143,7 +144,7 @@ class FeedManager:
def _update_and_fire_entry(self, entry):
"""Update last_entry_timestamp and fire entry."""
# Check if the entry has a published date.
# Check if the entry has a published or updated date.
if "published_parsed" in entry and entry.published_parsed:
# We are lucky, `published_parsed` data available, let's make use of
# it to publish only new available entries since the last run
@ -151,9 +152,20 @@ class FeedManager:
self._last_entry_timestamp = max(
entry.published_parsed, self._last_entry_timestamp
)
elif "updated_parsed" in entry and entry.updated_parsed:
# We are lucky, `updated_parsed` data available, let's make use of
# it to publish only new available entries since the last run
self._has_updated_parsed = True
self._last_entry_timestamp = max(
entry.updated_parsed, self._last_entry_timestamp
)
else:
self._has_published_parsed = False
_LOGGER.debug("No published_parsed info available for entry %s", entry)
self._has_updated_parsed = False
_LOGGER.debug(
"No published_parsed or updated_parsed info available for entry %s",
entry,
)
entry.update({"feed_url": self._url})
self._hass.bus.fire(self._event_type, entry)
@ -167,9 +179,16 @@ class FeedManager:
# Set last entry timestamp as epoch time if not available
self._last_entry_timestamp = datetime.utcfromtimestamp(0).timetuple()
for entry in self._feed.entries:
if self._firstrun or (
"published_parsed" in entry
and entry.published_parsed > self._last_entry_timestamp
if (
self._firstrun
or (
"published_parsed" in entry
and entry.published_parsed > self._last_entry_timestamp
)
or (
"updated_parsed" in entry
and entry.updated_parsed > self._last_entry_timestamp
)
):
self._update_and_fire_entry(entry)
new_entries = True