This commit is contained in:
Andreas Stephanides
2017-01-14 16:02:28 +01:00
parent 64a915ee17
commit 491fd2d25b
4 changed files with 21 additions and 13 deletions

View File

@@ -16,7 +16,13 @@ def urls_que(id):
cu=CrawlUrl.query.get(id)
mworker.queue_url(cu.tpe, cu.url)
return cu
def url_add(url,tpe):
u=CrawlUrl.find_or_create(tpe, url)
db_session2.add(u)
db_session2.commit()
return u
def start_workers():
mworker.start_workers(1,1,1)
return "started workers"

View File

@@ -15,7 +15,8 @@ import mworker
from compiler import do_compile
from fetching import fetch_page
from .controller import urls_test, start_workers, urls_que
from .controller import urls_test, start_workers, urls_que, url_add
#flask.json.JSONEncoder.default = lambda self,obj: ((obj.__json__()) if isinstance(obj, (Article,CrawlUrl)) else None)
@compiler_pages.route("/")
@@ -125,9 +126,7 @@ def add_urls():
# Finde oder Erzeuge Url in der Datenbank
url=CrawlUrlSchema().load(js["url"])
clogger.info(url)
url=CrawlUrl.find_or_create(url.data["tpe"], url.data["url"])
db_session2.add(url)
db_session2.commit()
url=url_add(url.data["url"],url.data["tpe"])
return jsonify(url=url, kk=js)
@compiler_pages.route("/urls/<int:id>",methods=['DELETE'])