Change main() into a stub which passes default values to an function, in preparation for adding argparse options.

capcom.py

@@ -29,7 +29,7 @@ def items_from_feed_string(feed_str):
     feed = feed_obj.feed
     return [(entry.updated_parsed, entry.link, entry.title, feed.title) for entry in feed_obj.entries]
 
-def format_aggregated(items, n_feeds, filename="index.gmi"):
+def format_aggregated(items, filename, n_feeds):
     with open(filename, "w") as fp:
         # Add header
         if os.path.exists("header.gmi"):
@@ -53,8 +53,8 @@ def format_aggregated(items, n_feeds, filename="index.gmi"):
             with open("footer.gmi", "r") as fp2:
                 fp.write(fp2.read())
 
-def main():
-    feed_urls = load_feed_urls()
+def aggregate(feed_file="feeds.txt", output_file="index.gmi"):
+    feed_urls = load_feed_urls(feed_file)
     items = []
     for feed_url in feed_urls:
         print("Fetching ", feed_url)
@@ -64,7 +64,10 @@ def main():
             items.extend(items_from_feed_string(resp.content))
     items.sort(reverse=True)
     items = items[0:64]
-    format_aggregated(items, len(feed_urls))
+    format_aggregated(items, output_file, len(feed_urls))
+
+def main():
+    aggregate("feeds.txt", "index.gmi")
 
 if __name__ == "__main__":
     main()