From cf96d1697d91cd5be34ef00d603626ba0339b213 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 16 Jul 2018 20:34:42 -0400 Subject: [PATCH] Fixed bug when submitting --- app.py | 4 ++-- database.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index 1dfa05d..20b20a4 100644 --- a/app.py +++ b/app.py @@ -365,7 +365,7 @@ def try_enqueue(url): "an open directory or the server is not responding. If you think " \ "this is an error, please contact me.", "danger" - website_id = db.insert_website(Website(url, str(request.remote_addr + "|" + + website_id = db.insert_website(Website(url, str(request.remote_addr + "_" + request.headers.get("X-Forwarded-For", "")), request.user_agent)) @@ -620,7 +620,7 @@ def api_add_website(): name = db.check_api_token(token) if name: - website_id = db.insert_website(Website(url, str(request.remote_addr + "|" + + website_id = db.insert_website(Website(url, str(request.remote_addr + "_" + request.headers.get("X-Forwarded-For", "")), "API_CLIENT_" + name)) return str(website_id) diff --git a/database.py b/database.py index eb115e0..51edd67 100644 --- a/database.py +++ b/database.py @@ -91,7 +91,7 @@ class Database: with sqlite3.connect(self.db_path) as conn: cursor = conn.cursor() cursor.execute("INSERT INTO Website (url, logged_ip, logged_useragent) VALUES (?,?,?)", - (website.url, website.logged_ip, website.logged_useragent)) + (website.url, str(website.logged_ip), str(website.logged_useragent))) cursor.execute("SELECT LAST_INSERT_ROWID()") website_id = cursor.fetchone()[0] @@ -337,7 +337,6 @@ class Database: return [tasks.TaskResult(r[1], r[2], r[3], r[4], r[0], str(r[5])) for r in cursor.fetchall()] def get_stats_by_crawler(self): - stats = dict() task_results = self.get_crawl_logs()