diff --git a/app.py b/app.py index 27da164..c8ba6f5 100644 --- a/app.py +++ b/app.py @@ -5,7 +5,6 @@ from urllib.parse import urlparse import os import time import datetime -import itertools from database import Database, Website, InvalidQueryException from flask_recaptcha import ReCaptcha import od_util diff --git a/callbacks.py b/callbacks.py index a238cdb..1965b82 100644 --- a/callbacks.py +++ b/callbacks.py @@ -2,6 +2,7 @@ from tasks import Task, TaskResult from reddit_bot import RedditBot import praw from search.search import SearchEngine +import json class PostCrawlCallback: @@ -9,6 +10,9 @@ class PostCrawlCallback: def __init__(self, task: Task): self.task = task + if self.task.callback_args: + self.task.callback_args = json.loads(self.task.callback_args) + def run(self, task_result: TaskResult, search: SearchEngine): raise NotImplementedError diff --git a/od_util.py b/od_util.py index dc1e5e2..e74f377 100644 --- a/od_util.py +++ b/od_util.py @@ -5,7 +5,12 @@ import os import validators import re from ftplib import FTP -from . import config + +# TODO: find a better way to do this +try: + from . import config +except ImportError: + import config import urllib3 urllib3.disable_warnings() diff --git a/reddit_bot.py b/reddit_bot.py index 26defae..3f15c5f 100644 --- a/reddit_bot.py +++ b/reddit_bot.py @@ -58,6 +58,7 @@ class RedditBot: try: reddit_comment.edit(new_message) print("Edit comment " + reddit_comment.id) + break except Exception as e: print("Waiting 5 minutes: " + str(e)) time.sleep(300)