simon987/od-database
1
0
Fork 0
mirror of https://github.com/simon987/od-database.git synced 2025-04-19 18:36:44 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug when submitting

Browse Source
This commit is contained in:
Simon 2018-07-16 20:34:42 -04:00
parent a8a658f55b
commit cf96d1697d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.py
View File

@ -365,7 +365,7 @@ def try_enqueue(url):
"an open directory or the server is not responding. If you think " \ "an open directory or the server is not responding. If you think " \
"this is an error, please <a href='/contribute'>contact me</a>.", "danger" "this is an error, please <a href='/contribute'>contact me</a>.", "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.headers.get("X-Forwarded-For", "")),
request.user_agent)) request.user_agent))
@ -620,7 +620,7 @@ def api_add_website():
name = db.check_api_token(token) name = db.check_api_token(token)
if name: 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", "")), request.headers.get("X-Forwarded-For", "")),
"API_CLIENT_" + name)) "API_CLIENT_" + name))
return str(website_id) return str(website_id)

3
database.py
View File

@ -91,7 +91,7 @@ class Database:
with sqlite3.connect(self.db_path) as conn: with sqlite3.connect(self.db_path) as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("INSERT INTO Website (url, logged_ip, logged_useragent) VALUES (?,?,?)", 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()") cursor.execute("SELECT LAST_INSERT_ROWID()")
website_id = cursor.fetchone()[0] 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()] 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): def get_stats_by_crawler(self):
stats = dict() stats = dict()
task_results = self.get_crawl_logs() task_results = self.get_crawl_logs()