mirror of
https://github.com/Derpy-Leggies/OnlyLegs.git
synced 2025-06-29 03:26:16 +00:00
Moved some scripts to a utils folder
Renamed upload route to file as its more approprete Fixed random CSS issues that occur on older browsers or Safari
This commit is contained in:
parent
9cfb8befd2
commit
3008a55899
19 changed files with 102 additions and 76 deletions
|
|
@ -4,6 +4,7 @@ Used intermally by the frontend and possibly by other applications
|
|||
"""
|
||||
from uuid import uuid4
|
||||
import os
|
||||
import pathlib
|
||||
import io
|
||||
import logging
|
||||
from datetime import datetime as dt
|
||||
|
|
@ -19,7 +20,7 @@ from sqlalchemy.orm import sessionmaker
|
|||
from gallery.auth import login_required
|
||||
|
||||
from gallery import db
|
||||
from gallery import metadata as mt
|
||||
from gallery.utils import metadata as mt
|
||||
|
||||
|
||||
blueprint = Blueprint('api', __name__, url_prefix='/api')
|
||||
|
|
@ -27,58 +28,77 @@ db_session = sessionmaker(bind=db.engine)
|
|||
db_session = db_session()
|
||||
|
||||
|
||||
@blueprint.route('/uploads/<file>', methods=['GET'])
|
||||
def uploads(file):
|
||||
@blueprint.route('/file/<file_name>', methods=['GET'])
|
||||
def get_file(file_name):
|
||||
"""
|
||||
Returns a file from the uploads folder
|
||||
t is the type of file (thumb, etc)
|
||||
w and h are the width and height of the image for resizing
|
||||
f is whether to apply filters to the image, such as blurring NSFW images
|
||||
b is whether to force blur the image, even if it's not NSFW
|
||||
"""
|
||||
# Get args
|
||||
type = request.args.get('t', default=None, type=str) # Type of file (thumb, etc)
|
||||
width = request.args.get('w', default=0, type=int) # Width of image
|
||||
height = request.args.get('h', default=0, type=int) # Height of image
|
||||
filtered = request.args.get('f', default=False, type=bool) # Whether to apply filters
|
||||
blur = request.args.get('b', default=False, type=bool) # Whether to force blur
|
||||
|
||||
# if no args are passed, return the raw file
|
||||
if width == 0 and height == 0 and not filtered:
|
||||
if not os.path.exists(os.path.join(current_app.config['UPLOAD_FOLDER'],
|
||||
secure_filename(file))):
|
||||
file_name = secure_filename(file_name) # Sanitize file name
|
||||
|
||||
# If type is thumb(nail), return from database instead of file system
|
||||
# as it's faster than generating a new thumbnail on every request
|
||||
if type == 'thumb':
|
||||
thumb = db_session.query(db.Thumbnails).filter_by(file_name=file_name).first()
|
||||
|
||||
# If no thumbnail exists, return 404
|
||||
if not thumb:
|
||||
abort(404)
|
||||
return send_from_directory(current_app.config['UPLOAD_FOLDER'], file, as_attachment=True)
|
||||
|
||||
# Of either width or height is 0, set it to the other value to keep aspect ratio
|
||||
if width > 0 and height == 0:
|
||||
return send_file(thumb.data, mimetype='image/' + thumb.file_ext)
|
||||
|
||||
# if no args are passed, return the raw file
|
||||
if not request.args:
|
||||
if not os.path.exists(os.path.join(current_app.config['UPLOAD_FOLDER'], file_name)):
|
||||
abort(404)
|
||||
|
||||
return send_from_directory(current_app.config['UPLOAD_FOLDER'], file_name)
|
||||
|
||||
# If only width is passed, set height to width
|
||||
if width and not height:
|
||||
height = width
|
||||
elif width == 0 and height > 0:
|
||||
# If only height is passed, set width to height
|
||||
elif not width and height:
|
||||
width = height
|
||||
# If neither are passed, return 400 as one is required for resizing
|
||||
elif not width and not height:
|
||||
abort(400)
|
||||
|
||||
buff = io.BytesIO()
|
||||
buff = io.BytesIO() # Image Buffer
|
||||
|
||||
# Open image and set extension
|
||||
try:
|
||||
img = Image.open(os.path.join(current_app.config['UPLOAD_FOLDER'], file))
|
||||
img = Image.open(os.path.join(current_app.config['UPLOAD_FOLDER'], file_name))
|
||||
# FileNotFound is raised if the file doesn't exist
|
||||
except FileNotFoundError:
|
||||
logging.error('File not found: %s, possibly broken upload', file)
|
||||
logging.error('File not found: %s', file_name)
|
||||
abort(404)
|
||||
except Exception as err:
|
||||
logging.error('Error opening image: %s', err)
|
||||
# OSError is raised if the file is broken or corrupted
|
||||
except OSError as err:
|
||||
logging.error('Possibly broken image %s, error: %s', file_name, err)
|
||||
abort(500)
|
||||
|
||||
img_ext = os.path.splitext(file)[-1].lower().replace('.', '')
|
||||
img_ext = current_app.config['ALLOWED_EXTENSIONS'][img_ext]
|
||||
img_icc = img.info.get("icc_profile") # Get ICC profile as it alters colours when saving
|
||||
img_ext = pathlib.Path(file_name).suffix.replace('.', '').lower() # Get file extension
|
||||
img_ext = current_app.config['ALLOWED_EXTENSIONS'][img_ext] # Convert to MIME type
|
||||
img_icc = img.info.get("icc_profile") # Get ICC profile
|
||||
|
||||
# Resize image and orientate correctly
|
||||
img.thumbnail((width, height), Image.LANCZOS)
|
||||
img = ImageOps.exif_transpose(img)
|
||||
img.thumbnail((width, height), Image.LANCZOS) # Resize image
|
||||
img = ImageOps.exif_transpose(img) # Rotate image based on EXIF data
|
||||
|
||||
# If has NSFW tag, blur image, etc.
|
||||
if filtered:
|
||||
# img = img.filter(ImageFilter.GaussianBlur(20))
|
||||
pass
|
||||
|
||||
|
||||
# If forced to blur, blur image
|
||||
if blur:
|
||||
img = img.filter(ImageFilter.GaussianBlur(20))
|
||||
|
|
@ -91,12 +111,12 @@ def uploads(file):
|
|||
img = img.convert('RGB')
|
||||
img.save(buff, img_ext, icc_profile=img_icc)
|
||||
except Exception as err:
|
||||
logging.error('Could not resize image %s, error: %s', file, err)
|
||||
logging.error('Could not resize image %s, error: %s', file_name, err)
|
||||
abort(500)
|
||||
|
||||
img.close()
|
||||
img.close() # Close image to free memory, learned the hard way
|
||||
buff.seek(0) # Reset buffer to start
|
||||
|
||||
|
||||
return send_file(buff, mimetype='image/' + img_ext)
|
||||
|
||||
|
||||
|
|
@ -108,23 +128,21 @@ def upload():
|
|||
"""
|
||||
form_file = request.files['file']
|
||||
form = request.form
|
||||
form_description = form['description']
|
||||
form_alt = form['alt']
|
||||
|
||||
# If no image is uploaded, return 404 error
|
||||
if not form_file:
|
||||
return abort(404)
|
||||
|
||||
img_ext = os.path.splitext(form_file.filename)[-1].replace('.', '').lower()
|
||||
# Get file extension, generate random name and set file path
|
||||
img_ext = pathlib.Path(form_file.filename).suffix.replace('.', '').lower()
|
||||
img_name = "GWAGWA_"+str(uuid4())
|
||||
img_path = os.path.join(current_app.config['UPLOAD_FOLDER'], img_name+'.'+img_ext)
|
||||
|
||||
# Check if file extension is allowed
|
||||
if img_ext not in current_app.config['ALLOWED_EXTENSIONS'].keys():
|
||||
logging.info('File extension not allowed: %s', img_ext)
|
||||
abort(403)
|
||||
|
||||
if os.path.isdir(current_app.config['UPLOAD_FOLDER']) is False:
|
||||
os.mkdir(current_app.config['UPLOAD_FOLDER'])
|
||||
|
||||
# Save file
|
||||
try:
|
||||
form_file.save(img_path)
|
||||
|
|
@ -132,28 +150,27 @@ def upload():
|
|||
logging.error('Could not save file: %s', err)
|
||||
abort(500)
|
||||
|
||||
# Get metadata and colors
|
||||
img_exif = mt.Metadata(img_path).yoink()
|
||||
img_colors = ColorThief(img_path).get_palette(color_count=3)
|
||||
|
||||
img_exif = mt.Metadata(img_path).yoink() # Get EXIF data
|
||||
img_colors = ColorThief(img_path).get_palette(color_count=3) # Get color palette
|
||||
|
||||
# Save to database
|
||||
try:
|
||||
try:
|
||||
query = db.Posts(author_id=g.user.id,
|
||||
created_at=dt.utcnow(),
|
||||
file_name=img_name+'.'+img_ext,
|
||||
file_type=img_ext,
|
||||
image_exif=img_exif,
|
||||
image_colours=img_colors,
|
||||
post_description=form_description,
|
||||
post_alt=form_alt)
|
||||
|
||||
post_description=form['description'],
|
||||
post_alt=form['alt'])
|
||||
|
||||
db_session.add(query)
|
||||
db_session.commit()
|
||||
except Exception as err:
|
||||
logging.error('Could not save to database: %s', err)
|
||||
abort(500)
|
||||
|
||||
return 'Gwa Gwa'
|
||||
return 'Gwa Gwa' # Return something so the browser doesn't show an error
|
||||
|
||||
|
||||
@blueprint.route('/delete/<int:image_id>', methods=['POST'])
|
||||
|
|
@ -180,11 +197,11 @@ def delete_image(image_id):
|
|||
|
||||
try:
|
||||
db_session.query(db.Posts).filter_by(id=image_id).delete()
|
||||
|
||||
|
||||
groups = db_session.query(db.GroupJunction).filter_by(post_id=image_id).all()
|
||||
for group in groups:
|
||||
db_session.delete(group)
|
||||
|
||||
|
||||
db_session.commit()
|
||||
except Exception as err:
|
||||
logging.error('Could not remove from database: %s', err)
|
||||
|
|
@ -205,10 +222,10 @@ def create_group():
|
|||
description=request.form['description'],
|
||||
author_id=g.user.id,
|
||||
created_at=dt.utcnow())
|
||||
|
||||
|
||||
db_session.add(new_group)
|
||||
db_session.commit()
|
||||
|
||||
|
||||
return ':3'
|
||||
|
||||
|
||||
|
|
@ -220,7 +237,7 @@ def modify_group():
|
|||
"""
|
||||
group_id = request.form['group']
|
||||
image_id = request.form['image']
|
||||
|
||||
|
||||
group = db_session.query(db.Groups).filter_by(id=group_id).first()
|
||||
|
||||
if group is None:
|
||||
|
|
@ -233,9 +250,9 @@ def modify_group():
|
|||
db_session.add(db.GroupJunction(group_id=group_id, post_id=image_id, date_added=dt.utcnow()))
|
||||
elif request.form['action'] == 'remove':
|
||||
db_session.query(db.GroupJunction).filter_by(group_id=group_id, post_id=image_id).delete()
|
||||
|
||||
|
||||
db_session.commit()
|
||||
|
||||
|
||||
return ':3'
|
||||
|
||||
|
||||
|
|
@ -262,10 +279,9 @@ def logfile():
|
|||
Gets the log file and returns it as a JSON object
|
||||
"""
|
||||
log_dict = {}
|
||||
i = 0
|
||||
|
||||
with open('only.log', encoding='utf-8') as file:
|
||||
for line in file:
|
||||
for i, line in enumerate(file):
|
||||
line = line.split(' : ')
|
||||
|
||||
event = line[0].strip().split(' ')
|
||||
|
|
@ -290,6 +306,4 @@ def logfile():
|
|||
|
||||
log_dict[i] = {'event': event_data, 'message': message_data}
|
||||
|
||||
i += 1 # Line number, starts at 0
|
||||
|
||||
return jsonify(log_dict)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue