PrivateCoffee/matrix-reportbot
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved timestamp handling

Browse source
This commit is contained in:
Kumi 2024-03-02 18:03:07 +01:00
parent db37f31b93
commit 2729a29807
Signed by: kumi
GPG key ID: ECBCC9082395383F
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/matrix_rssbot/classes/bot.py
View file

@ -529,6 +529,8 @@ class RSSBot:
return event return event
async def process_room(self, room): async def process_room(self, room):
self.logger.log(f"Processing room {room}", "debug")
state = await self.get_state_event(room, "rssbot.feeds") state = await self.get_state_event(room, "rssbot.feeds")
if not state: if not state:
@ -537,12 +539,14 @@ class RSSBot:
feeds = state["content"]["feeds"] feeds = state["content"]["feeds"]
for feed in feeds: for feed in feeds:
self.logger.log(f"Processing {feed} in {room}", "debug")
feed_state = await self.get_state_event(room, "rssbot.feed_state", feed) feed_state = await self.get_state_event(room, "rssbot.feed_state", feed)
if feed_state: if feed_state:
self.logger.log( self.logger.log(
f"Identified timestamp as {feed_state['content']['timestamp']}", f"Identified feed timestamp as {feed_state['content']['timestamp']}",
"debug" "debug",
) )
timestamp = int(feed_state["content"]["timestamp"]) timestamp = int(feed_state["content"]["timestamp"])
else: else:
@ -552,9 +556,15 @@ class RSSBot:
feed_content = feedparser.parse(feed) feed_content = feedparser.parse(feed)
new_timestamp = timestamp new_timestamp = timestamp
for entry in feed_content.entries: for entry in feed_content.entries:
entry_timestamp = int( try:
datetime(*entry.published_parsed[:6]).timestamp() entry_time_info = entry.published_parsed
) except:
entry_time_info = entry.updated_parsed
entry_timestamp = int(datetime(*entry_time_info[:6]).timestamp())
self.logger.log(f"Entry timestamp identified as {entry_timestamp}")
if entry_timestamp > timestamp: if entry_timestamp > timestamp:
entry_message = f"__{feed_content.feed.title}: {entry.title}__\n\n{entry.description}\n\n{entry.link}" entry_message = f"__{feed_content.feed.title}: {entry.title}__\n\n{entry.description}\n\n{entry.link}"
await self.send_message(room, entry_message) await self.send_message(room, entry_message)
@ -576,18 +586,23 @@ class RSSBot:
self.logger.log("Starting to process rooms", "debug") self.logger.log("Starting to process rooms", "debug")
start_timestamp = datetime.now() start_timestamp = datetime.now()
for room in self.matrix_client.rooms.values(): for room in self.matrix_client.rooms.values():
try: try:
await self.process_room(room) await self.process_room(room)
except Exception as e: except Exception as e:
self.logger.log(f"Something went wrong processing room {room.room_id}: {e}", "error") self.logger.log(
f"Something went wrong processing room {room.room_id}: {e}",
"error",
)
end_timestamp = datetime.now() end_timestamp = datetime.now()
self.logger.log("Done processing rooms", "debug") self.logger.log("Done processing rooms", "debug")
if (time_taken := (end_timestamp - start_timestamp).seconds) < self.loop_duration: if (
time_taken := (end_timestamp - start_timestamp).seconds
) < self.loop_duration:
await asyncio.sleep(self.loop_duration - time_taken) await asyncio.sleep(self.loop_duration - time_taken)
async def run(self): async def run(self):