pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Timezone fixes

master
pictuga 2020-04-10 20:33:59 +02:00
parent ee78a7875a
commit 8e5e8d24a4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
morss/feeds.py
View File

@ -484,13 +484,13 @@ def parse_time(value):
elif isinstance(value, basestring): elif isinstance(value, basestring):
if re.match(r'^[0-9]+$', value): if re.match(r'^[0-9]+$', value):
return datetime.fromtimestamp(int(value), tz.UTC) return datetime.fromtimestamp(int(value), tz.tzutc())
else: else:
return dateutil.parser.parse(value) return dateutil.parser.parse(value).replace(tzinfo=tz.tzutc())
elif isinstance(value, int): elif isinstance(value, int):
return datetime.fromtimestamp(value, tz.UTC) return datetime.fromtimestamp(value, tz.tzutc())
elif isinstance(value, datetime): elif isinstance(value, datetime):
return value return value

6
morss/morss.py
View File

@ -1,7 +1,10 @@
import sys import sys
import os import os
import os.path import os.path
import time import time
from datetime import datetime
from dateutil import tz
import threading import threading
@ -420,7 +423,8 @@ def FeedGather(rss, url, options):
t.daemon = True t.daemon = True
t.start() t.start()
sorted_items = sorted(rss.items, key=lambda x:x.updated or x.time or 0, reverse=True) now = datetime.now(tz.tzutc())
sorted_items = sorted(rss.items, key=lambda x:x.updated or x.time or now, reverse=True)
for i, item in enumerate(sorted_items): for i, item in enumerate(sorted_items):
if threads == 1: if threads == 1:
worker(*[i, item]) worker(*[i, item])