od_util can be used when od-database is a submodule part 2

This commit is contained in:
Simon 2018-08-08 23:31:50 -04:00
parent 88166054ad
commit f729b462f0
4 changed files with 11 additions and 2 deletions

1
app.py
View File

@ -5,7 +5,6 @@ from urllib.parse import urlparse
import os import os
import time import time
import datetime import datetime
import itertools
from database import Database, Website, InvalidQueryException from database import Database, Website, InvalidQueryException
from flask_recaptcha import ReCaptcha from flask_recaptcha import ReCaptcha
import od_util import od_util

View File

@ -2,6 +2,7 @@ from tasks import Task, TaskResult
from reddit_bot import RedditBot from reddit_bot import RedditBot
import praw import praw
from search.search import SearchEngine from search.search import SearchEngine
import json
class PostCrawlCallback: class PostCrawlCallback:
@ -9,6 +10,9 @@ class PostCrawlCallback:
def __init__(self, task: Task): def __init__(self, task: Task):
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): def run(self, task_result: TaskResult, search: SearchEngine):
raise NotImplementedError raise NotImplementedError

View File

@ -5,7 +5,12 @@ import os
import validators import validators
import re import re
from ftplib import FTP from ftplib import FTP
# TODO: find a better way to do this
try:
from . import config from . import config
except ImportError:
import config
import urllib3 import urllib3
urllib3.disable_warnings() urllib3.disable_warnings()

View File

@ -58,6 +58,7 @@ class RedditBot:
try: try:
reddit_comment.edit(new_message) reddit_comment.edit(new_message)
print("Edit comment " + reddit_comment.id) print("Edit comment " + reddit_comment.id)
break
except Exception as e: except Exception as e:
print("Waiting 5 minutes: " + str(e)) print("Waiting 5 minutes: " + str(e))
time.sleep(300) time.sleep(300)