voussoir/bringrss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use datetime object for News.published.

Browse source
This commit is contained in:
voussoir 2024-04-14 15:11:27 -07:00
parent 465330fae1
commit bdfb2c792d
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bringrss/objects.py
View file

@ -1195,7 +1195,6 @@ class News(ObjectBase):
self.feed_id = db_row['feed_id'] self.feed_id = db_row['feed_id']
self.original_feed_id = db_row['original_feed_id'] self.original_feed_id = db_row['original_feed_id']
self.rss_guid = db_row['rss_guid'] self.rss_guid = db_row['rss_guid']
self.published = db_row['published']
self.updated = db_row['updated'] self.updated = db_row['updated']
self.title = db_row['title'] self.title = db_row['title']
self.text = db_row['text'] self.text = db_row['text']
@ -1204,6 +1203,13 @@ class News(ObjectBase):
self.created = db_row['created'] self.created = db_row['created']
self.read = db_row['read'] self.read = db_row['read']
self.recycled = db_row['recycled'] self.recycled = db_row['recycled']
self.published_unix = db_row['published']
# utcfromtimestamp doesn't like negative numbers, but timedelta can
# handle it, so this does better than just calling
# utcfromtimestamp(published)
self.published = datetime.datetime.utcfromtimestamp(0) + datetime.timedelta(seconds=self.published_unix)
if db_row['authors']: if db_row['authors']:
self.authors = json.loads(db_row['authors']) self.authors = json.loads(db_row['authors'])
else: else:
@ -1357,7 +1363,7 @@ class News(ObjectBase):
'created': self.created, 'created': self.created,
'enclosures': self.enclosures, 'enclosures': self.enclosures,
'feed_id': self.feed_id, 'feed_id': self.feed_id,
'published': self.published, 'published_unix': self.published_unix,
'published_string': self.published_string, 'published_string': self.published_string,
'published_string_local': self.published_string_local, 'published_string_local': self.published_string_local,
'read': self.read, 'read': self.read,
@ -1396,23 +1402,12 @@ class News(ObjectBase):
@property @property
def published_string(self): def published_string(self):
published = self.published published = self.published.strftime('%Y-%m-%d %H:%M')
if published < 0:
published = datetime.datetime.utcfromtimestamp(0) + datetime.timedelta(seconds=published)
else:
published = datetime.datetime.utcfromtimestamp(published)
published = published.strftime('%Y-%m-%d %H:%M')
return published return published
@property @property
def published_string_local(self): def published_string_local(self):
published = self.published return self.published.astimezone().strftime('%Y-%m-%d %H:%M')
if published < 0:
published = datetime.datetime.fromtimestamp(0) + datetime.timedelta(seconds=published)
else:
published = datetime.datetime.fromtimestamp(published)
published = published.strftime('%Y-%m-%d %H:%M')
return published
@worms.atomic @worms.atomic
def set_read(self, read): def set_read(self, read):