Converted upload method to ORM and added route.

This commit is contained in:
Dan Dembinski
2020-03-11 16:50:52 -04:00
parent 2db2898d2f
commit 3d67df0f7d

75
main.py
View File

@@ -8,6 +8,10 @@ import time
# from Downloader import my_awesome_handler
import os
# PATH = 'Manga/'
# PATH = 'smb://MediaServer._smb._tcp.local/Downloads/Manga/'
PATH = '/download'
app = Flask(__name__)
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
@@ -47,10 +51,6 @@ def download():
# 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).filter_by(active=1).join(url_metadata, manga.url_flag==url_metadata.flag).all()
# PATH = 'Manga/'
# PATH = 'smb://MediaServer._smb._tcp.local/Downloads/Manga/'
PATH = '/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""")
@@ -59,44 +59,35 @@ def download():
return jsonify(updated='done')
# def upload_jason():
# url = []
# base = []
# name = []
# y = 0
# z = 0
#
# db_URI = 'mysql+pymysql://mdownload:mdownload@192.168.86.198:3306/Downloads'
#
# engine = db.create_engine(db_URI)
# con = engine.connect()
# metadata = db.MetaData()
# manga = db.Table('manga', metadata, autoload=True, autoload_with=engine)
#
# with open("tach.json", "r") as tf:
# data = json.load(tf)
# for x in data["mangas"]:
# # Manga Name
# name.append(data["mangas"][y]["manga"][1])
# # Mange URL
# url.append(data["mangas"][y]["manga"][0])
# # Mange Base URL
# base.append(data["mangas"][y]["manga"][2])
# y=y+1
# # query = """ Delete from manga"""
# # con.execute(query)
# # query = """ Alter table manga auto_increment = 1 """
# # con.execute(query)
# for x in name:
# query = """select name from manga where name = \"""" + name[z] + """\""""
# exists = con.execute(query).fetchone()
# if exists == None or exists[0] != name[z]:
# query = """ insert into manga(name, url, url_flag, view_format, unknown_value) values (\"""" + name[z] + """\",\"""" + url[z] + """\",\"""" + str(base[z]) + """\",\"0\",\"0\")"""
# print(query)
# con.execute(query)
# else:
# continue
# z=z+1
@app.route('/upload', METHODS=['GET'])
def upload_jason():
url = []
base = []
name = []
y = 0
z = 0
with open(PATH+"tach.json", "r") as tf:
data = json.load(tf)
for x in data["mangas"]:
# Manga Name
name.append(data["mangas"][y]["manga"][1])
# Mange URL
url.append(data["mangas"][y]["manga"][0])
# Mange Base URL
base.append(data["mangas"][y]["manga"][2])
y=y+1
for x in name:
if not manga.query.filter_by(name=name[z]):
query = manga(name=name[z], url=url[z], url_flag=str(base[z]), view_format=0, unkown_value=0)
db.session.add(query)
else:
continue
z=z+1
db.session.commit()
return jsonify(uploaded='done')
if __name__ == "__main__":
app.run(host='0.0.0.0', debug=True)