From 244d416f6eb4dc2b92101f0feb4f0d4267961b4a Mon Sep 17 00:00:00 2001
From: Jason Schwarzenberger <jason@credisense.io>
Date: Tue, 3 Nov 2020 17:01:29 +1300
Subject: [PATCH] settings config of sitemap/substack publications.

---
 apiserver/feed.py             | 37 +++++++++++++++--------------------
 apiserver/settings.py.example | 14 +++++++++----
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/apiserver/feed.py b/apiserver/feed.py
index db51f1a..a18451f 100644
--- a/apiserver/feed.py
+++ b/apiserver/feed.py
@@ -16,10 +16,12 @@ READ_API = 'http://127.0.0.1:33843'
 INVALID_DOMAINS = ['youtube.com', 'bloomberg.com', 'wsj.com']
 TWO_DAYS = 60*60*24*2
 
-webworm = substack.Publication("https://www.webworm.co")
-bulletin = substack.Publication("https://thespinoff.substack.com")
-stuff = sitemap.Sitemap("https://www.stuff.co.nz/sitemap.xml")
-nzherald = sitemap.Sitemap("https://www.nzherald.co.nz/arcio/news-sitemap/")
+substacks = {}
+for key, value in settings.SUBSTACK.values():
+    substacks[key] = substack.Publication(value['url'])
+sitemaps = {}
+for key, value in settings.SITEMAP.values():
+    sitemaps[key] = sitemap.Sitemap(value['url'])
 
 def list():
     feed = []
@@ -35,17 +37,14 @@ def list():
     if settings.NUM_SUBSTACK:
         feed += [(x, 'substack') for x in substack.top.feed()[:settings.NUM_SUBSTACK]]
 
-    if settings.NUM_STUFF:
-        feed += [(x, 'stuff') for x in stuff.feed()[:settings.NUM_STUFF]]
+    for key, publication in substacks.values():
+        count = settings.SUBSTACK[key].count
+        feed += [(x, key) for x in publication.feed()[:count]]
 
-    if settings.NUM_NZHERALD:
-        feed += [(x, 'nzherald') for x in nzherald.feed()[:settings.NUM_NZHERALD]]
+    for key, sites in sitemaps.values():
+        count = settings.SITEMAP[key].count
+        feed += [(x, key) for x in sites.feed()[:count]]
 
-    if settings.NUM_WEBWORM:
-        feed += [(x, 'webworm') for x in webworm.feed()[:settings.NUM_WEBWORM]]
-
-    if settings.NUM_BULLETIN:
-        feed += [(x, 'the bulletin') for x in bulletin.feed()[:settings.NUM_BULLETIN]]
 
     return feed
 
@@ -104,16 +103,12 @@ def update_story(story, is_manual=False):
         res = reddit.story(story['ref'])
     elif story['source'] == 'tildes':
         res = tildes.story(story['ref'])
-    elif story['source'] == 'webworm':
-        res = webworm.story(story['ref'])
-    elif story['source'] == 'the bulletin':
-        res = bulletin.story(story['ref'])
     elif story['source'] == 'substack':
         res = substack.top.story(story['ref'])
-    elif story['source'] == 'stuff':
-        res = stuff.story(story['ref'])
-    elif story['source'] == 'nzherald':
-        res = nzherald.story(story['ref'])
+    elif story['source'] in sitemaps.keys():
+        res = sitemaps[story['source']].story(story['ref'])
+    elif story['source'] in substacks.keys():
+        res = substacks[story['source']].story(story['ref'])
     elif story['source'] == 'manual':
         res = manual.story(story['ref'])
 
diff --git a/apiserver/settings.py.example b/apiserver/settings.py.example
index 50ed6b2..3a21597 100644
--- a/apiserver/settings.py.example
+++ b/apiserver/settings.py.example
@@ -8,10 +8,16 @@ NUM_HACKERNEWS = 15
 NUM_REDDIT = 10
 NUM_TILDES = 5
 NUM_SUBSTACK = 10
-NUM_WEBWORM = 0
-NUM_NZHERALD = 0
-NUM_STUFF = 0
-NUM_BULLETIN = 0
+
+# SITEMAP = {
+#     'nzherald': { 'url': "https://www.nzherald.co.nz/arcio/news-sitemap/", 'count': 10},
+#     'stuff': { 'url': "https://www.stuff.co.nz/sitemap.xml", 'count': 10},
+# }
+
+# SUBSTACK = {
+#     'webworm': { 'url': "https://www.webworm.co", 'count': 10},
+#     'the bulletin': { 'url': "https://thespinoff.substack.com", 'count': 10},
+# }
 
 # Reddit account info
 # leave blank if not using Reddit