trent/flask_photo_scaling_app
1
0
Fork 0
mirror of https://github.com/TrentSPalmer/flask_photo_scaling_app.git synced 2025-02-18 13:40:55 -08:00
Code Issues Projects Releases Wiki Activity

fix style app/photo_routes/delete_download.py

Browse Source
This commit is contained in:
Trent Palmer 2025-02-09 17:19:38 -08:00
parent bab12d33e9
commit b3f0de046b
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/photo_routes/delete_download.py
View File

@ -1,6 +1,9 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from flask import Blueprint, request, redirect, url_for, render_template, current_app, send_file from flask import (
Blueprint, request, redirect, url_for,
render_template, current_app, send_file,
)
from flask_login import current_user from flask_login import current_user
from app.models import Photo from app.models import Photo
from app.forms import ConfirmPhotoDelete from app.forms import ConfirmPhotoDelete
@ -17,7 +20,10 @@ def download():
if current_user.is_authenticated: if current_user.is_authenticated:
f = request.args['file'] f = request.args['file']
try: try:
return send_file('/var/lib/photo_app/photos/{}'.format(f), attachment_filename=f) return send_file(
'/var/lib/photo_app/photos/{}'.format(f),
attachment_filename=f,
)
except Exception as e: except Exception as e:
return str(e) return str(e)
@ -27,11 +33,14 @@ def delete():
photo = Photo.query.get(request.args['photo_id']) photo = Photo.query.get(request.args['photo_id'])
if photo is None: if photo is None:
return(redirect(url_for('proute.index'))) return(redirect(url_for('proute.index')))
if not current_user.is_authenticated or photo.contributor_id != current_user.id: cu = current_user
if not cu.is_authenticated or photo.contributor_id != cu.id:
return(redirect(url_for('proute.index'))) return(redirect(url_for('proute.index')))
form = ConfirmPhotoDelete() form = ConfirmPhotoDelete()
if request.method == 'POST' and form.validate_on_submit(): if request.method == 'POST' and form.validate_on_submit():
return(redirect(url_for('p_route.photo', photo_id=delete_photo(photo)))) return(
redirect(url_for('p_route.photo', photo_id=delete_photo(photo))),
)
return(render_template( return(render_template(
'delete_photo.html', 'delete_photo.html',
title="Delete Photo?", title="Delete Photo?",
@ -49,11 +58,19 @@ def delete_photo(photo):
password=current_app.config['DATABASE_PASSWORD'] password=current_app.config['DATABASE_PASSWORD']
) )
cur = conn.cursor() cur = conn.cursor()
cur.execute("SELECT count(id) FROM photo WHERE contributor_id=%s AND id>%s", (photo.contributor_id, photo.id)) cur.execute(
"SELECT count(id) FROM photo WHERE contributor_id=%s AND id>%s",
(photo.contributor_id, photo.id),
)
if cur.fetchone()[0] == 0: if cur.fetchone()[0] == 0:
cur.execute("SELECT id FROM photo WHERE contributor_id=%s ORDER BY id", (photo.contributor_id, )) cur.execute(
"SELECT id FROM photo WHERE contributor_id=%s ORDER BY id",
(photo.contributor_id, ),
)
else: else:
cur.execute("SELECT id FROM photo WHERE contributor_id=%s AND id>%s ORDER BY id", (photo.contributor_id, photo.id)) my_statement = "SELECT id FROM photo WHERE contributor_id=%s "
my_statement += "AND id>%s ORDER BY id"
cur.execute(my_statement, (photo.contributor_id, photo.id))
next_photo_id = cur.fetchone()[0] next_photo_id = cur.fetchone()[0]
os.chdir(current_app.config['PHOTO_SAVE_PATH']) os.chdir(current_app.config['PHOTO_SAVE_PATH'])
if os.path.exists('raw_' + photo.photo_name): if os.path.exists('raw_' + photo.photo_name):