diff --git a/main.py b/main.py index 11100f1..53fca0a 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ from flask_sqlalchemy import SQLAlchemy -from flask import Flask +from flask import Flask, jsonify import json import time @@ -39,12 +39,13 @@ class url_metadata(db.Model): @app.route('/download', methods=['GET']) def download(): + # updated = [] # db_URI = 'mysql+pymysql://mdownload:mdownload@192.168.86.198:3306/Downloads' # query = db.select([manga.columns.url, url_metadata.columns.base_url, manga.columns.url_flag]) # result = db.session.query(manga.base_url, manga.name, manga.url, url_metadata.base_url, url_metadata.flag).join(manga.url_flag == url_metadata.flag).all() - result = db.session.query(manga, url_metadata).join(url_metadata, manga.url_flag==url_metadata.flag).all() + result = db.session.query(manga, url_metadata).filter_by(active=1).join(url_metadata, manga.url_flag==url_metadata.flag).all() # PATH = 'Manga/' # PATH = 'smb://MediaServer._smb._tcp.local/Downloads/Manga/' @@ -52,9 +53,11 @@ def download(): for each in result: execute = """manga-py """ + each.url_metadata.base_url+each.manga.url + """ -n \"""" + each.manga.name + """\" -d \"""" + PATH + """\" -z -N""" + # print("""manga-py """ + each.url_metadata.base_url+each.manga.url + """ -n \"""" + each.manga.name + """\" -d \"""" + PATH + """\" -z -N""") os.system(execute) + # updated.append(each.manga.name) - return "neat" + return jsonify(updated='done') # def upload_jason(): # url = []