From 4ba097060ae9ccfb7d298a6056e91b82e9e2fa34 Mon Sep 17 00:00:00 2001 From: printfuck Date: Mon, 20 Apr 2020 01:16:44 +0200 Subject: [PATCH] fixes --- .gitignore | 1 + main.py | 12 ++++++++---- web.py | 9 +++++---- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bee8a64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__ diff --git a/main.py b/main.py index 79382f9..637f5b2 100755 --- a/main.py +++ b/main.py @@ -13,7 +13,7 @@ from cssselect import HTMLTranslator, SelectorError import requests as req from io import StringIO -import web +#import web DB_HOST = "127.0.0.1" DB_USER = "dbuser" @@ -172,11 +172,15 @@ def main(): createTableMa(db, "feeds") if not createTableIm(db, "feed01"): die() - rt = Periodic(60*60*1, updateFeed, [db, "feed01"]) + updateFeed(db,"feed01") + #rt = Periodic(60*60*1, updateFeed, [db, "feed01"]) while True: time.sleep(5) +if __name__ == "__main__": + main() + class lf: def __init__(self, db, name): @@ -266,7 +270,7 @@ class lf: "feeds",self.name,self.url,self.password, self.username,self.selector, self.selector_login_user,self.selector_login_pass, - self.selector_login_verify,self.selector_login_url + self.selector_login_verify,self.selector_login_url, self.selector_login_verify_url) ) else: @@ -280,7 +284,7 @@ class lf: self.url,self.password, self.username,self.selector, self.selector_login_user,self.selector_login_pass, - self.selector_login_verify,self.selector_login_url + self.selector_login_verify,self.selector_login_url, self.selector_login_verify_url) ) diff --git a/web.py b/web.py index a81ee27..da171f5 100644 --- a/web.py +++ b/web.py @@ -7,8 +7,9 @@ from flask import Flask,request app = Flask(__name__) -def run_flask(host,port) - app.run(host=host, port=port) +def run_flask(host,port): + app = Flask(host=host, port=port) + app.run() def getFeeds(db): db = getDb() @@ -21,7 +22,7 @@ def getFeeds(db): return feeds @app.route('/') -def list() +def list(): feeds = getFeeds() a = "

Header


" for i in feeds: @@ -53,4 +54,4 @@ def configure(feed_name):
'''.format(i,i,feed.query_db(i),i) - a += " + a += ""
Feeds