merge all rss

my/feedly.py

@@ -6,7 +6,7 @@ import json
 from pathlib import Path
 from typing import Dict, List
 from datetime import datetime
-from dateutil.parser import isoparse
+import pytz
 
 
 @listify
@@ -14,12 +14,13 @@ def parse_file(f: Path):
     raw = json.loads(f.read_text())
     for r in raw:
         # err, some even don't have website..
-        website = r.get('website')
+        rid = r['id']
+        website = r.get('website', rid) # meh
         yield Subscription(
             # TODO created_at?
             title=r['title'],
             url=website,
-            id=r['id'],
+            id=rid,
         )
 
 def get_states() -> Dict[datetime, List[Subscription]]:
@@ -27,6 +28,7 @@ def get_states() -> Dict[datetime, List[Subscription]]:
     for f in sorted(Path(paths.feedly.export_dir).glob('*.json')):
         dts = f.stem.split('_')[-1]
         dt = datetime.strptime(dts, '%Y%m%d%H%M%S')
+        dt = pytz.utc.localize(dt)
         subs = parse_file(f)
         res[dt] = subs
     return res