Converted upload method to ORM and added route.
This commit is contained in:
75
main.py
75
main.py
@@ -8,6 +8,10 @@ import time
|
|||||||
# from Downloader import my_awesome_handler
|
# from Downloader import my_awesome_handler
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
# PATH = 'Manga/'
|
||||||
|
# PATH = 'smb://MediaServer._smb._tcp.local/Downloads/Manga/'
|
||||||
|
PATH = '/download'
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
|
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.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()
|
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:
|
for each in result:
|
||||||
execute = """manga-py """ + each.url_metadata.base_url+each.manga.url + """ -n \"""" + each.manga.name + """\" -d \"""" + PATH + """\" -z -N"""
|
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""")
|
# 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')
|
return jsonify(updated='done')
|
||||||
|
|
||||||
# def upload_jason():
|
@app.route('/upload', METHODS=['GET'])
|
||||||
# url = []
|
def upload_jason():
|
||||||
# base = []
|
url = []
|
||||||
# name = []
|
base = []
|
||||||
# y = 0
|
name = []
|
||||||
# z = 0
|
y = 0
|
||||||
#
|
z = 0
|
||||||
# db_URI = 'mysql+pymysql://mdownload:mdownload@192.168.86.198:3306/Downloads'
|
|
||||||
#
|
with open(PATH+"tach.json", "r") as tf:
|
||||||
# engine = db.create_engine(db_URI)
|
data = json.load(tf)
|
||||||
# con = engine.connect()
|
for x in data["mangas"]:
|
||||||
# metadata = db.MetaData()
|
# Manga Name
|
||||||
# manga = db.Table('manga', metadata, autoload=True, autoload_with=engine)
|
name.append(data["mangas"][y]["manga"][1])
|
||||||
#
|
# Mange URL
|
||||||
# with open("tach.json", "r") as tf:
|
url.append(data["mangas"][y]["manga"][0])
|
||||||
# data = json.load(tf)
|
# Mange Base URL
|
||||||
# for x in data["mangas"]:
|
base.append(data["mangas"][y]["manga"][2])
|
||||||
# # Manga Name
|
y=y+1
|
||||||
# name.append(data["mangas"][y]["manga"][1])
|
|
||||||
# # Mange URL
|
for x in name:
|
||||||
# url.append(data["mangas"][y]["manga"][0])
|
|
||||||
# # Mange Base URL
|
if not manga.query.filter_by(name=name[z]):
|
||||||
# base.append(data["mangas"][y]["manga"][2])
|
query = manga(name=name[z], url=url[z], url_flag=str(base[z]), view_format=0, unkown_value=0)
|
||||||
# y=y+1
|
db.session.add(query)
|
||||||
# # query = """ Delete from manga"""
|
else:
|
||||||
# # con.execute(query)
|
continue
|
||||||
# # query = """ Alter table manga auto_increment = 1 """
|
z=z+1
|
||||||
# # con.execute(query)
|
db.session.commit()
|
||||||
# for x in name:
|
return jsonify(uploaded='done')
|
||||||
# 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
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
app.run(host='0.0.0.0', debug=True)
|
app.run(host='0.0.0.0', debug=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user