From 4cc4e7922ec1f5dda5f3a4d1aaf041e62bbdd029 Mon Sep 17 00:00:00 2001 From: bvn13 Date: Wed, 16 Oct 2024 01:40:23 +0300 Subject: [PATCH] added namings to feeds --- src/app.py | 2 +- src/fetcher.py | 2 +- src/server.py | 5 +++-- src/templates/index.html | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app.py b/src/app.py index 22c4832..2a75c9b 100644 --- a/src/app.py +++ b/src/app.py @@ -48,7 +48,7 @@ def _start_scheduling(): time.sleep(1) def _start_web_server(): - start_server(args=args) + start_server(args=args, settings=settings) if __name__ == "__main__": diff --git a/src/fetcher.py b/src/fetcher.py index f66727e..8d7e743 100644 --- a/src/fetcher.py +++ b/src/fetcher.py @@ -17,7 +17,7 @@ def fetch(settings: list, args: Namespace) -> None: s = Session() retries = Retry( total=3, - backoff_factor=0.1, + backoff_factor=0.2, status_forcelist=[502, 503, 504], allowed_methods={'GET'}, ) diff --git a/src/server.py b/src/server.py index 841aacd..1518e09 100644 --- a/src/server.py +++ b/src/server.py @@ -5,11 +5,12 @@ import tornado from src.logger import logger as l -def start_server(args: Namespace) -> None: +def start_server(settings: list, args: Namespace) -> None: logger = l.getChild(__name__) def _get_all_feeds(): - return [{ 'rss': f, 'file': f"/feeds/{f}" } for f in fnmatch.filter(os.listdir(args.directory), '*.xml')] + return [{ 'rss': sets['name'], 'file': f"/feeds/{sets['rss']}" } for sets in settings if os.path.isfile(f"{args.directory}/{sets['rss']}")] + # return [{ 'rss': f, 'file': f"/feeds/{f}" } for f in fnmatch.filter(os.listdir(args.directory), '*.xml')] class MainHandler(tornado.web.RequestHandler): def set_default_headers(self): diff --git a/src/templates/index.html b/src/templates/index.html index 9f0d88d..5e03d0e 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -6,7 +6,7 @@
-

Feeds:

+

Feeds available:

    {% for feed in feeds %} {% module Template("feed.html", feed=feed) %}