okay passing a string through works now, yippee

This commit is contained in:
Jack Eilles 2023-12-21 16:19:22 +00:00
parent e582c74363
commit df987b400d
2 changed files with 14 additions and 1 deletions

View file

@ -1,6 +1,8 @@
from app import app, worker from app import app, worker
from config import Config, Errors from config import Config, Errors
from flask import render_template, request, send_file from flask import render_template, request, send_file
from werkzeug.datastructures import FileStorage
from io import BytesIO
import os import os
import io import io
import random import random
@ -41,6 +43,16 @@ def index():
return result, status return result, status
elif 'file' in request.form:
file = FileStorage(stream=BytesIO(request.form['file'].encode("utf-8")), filename=id, content_type="text/plain")
result, status = worker.uploadFile(file, ip, userid, filename, id, retention)
result = "https://xygt.cc/{}".format(result)
return result, status
elif 'url' in request.form: elif 'url' in request.form:
result, status = worker.shortURL(url, ip, userid, id, retention) result, status = worker.shortURL(url, ip, userid, id, retention)

View file

@ -1,4 +1,5 @@
from config import disallowedMimeTypes, Errors, Config from config import disallowedMimeTypes, Errors, Config
from werkzeug.datastructures import FileStorage
import secrets import secrets
import magic import magic
import datetime import datetime
@ -32,7 +33,7 @@ def uploadFile(file, ip, userid, filename, id, retention):
elif retention > (Config.minretention+(-Config.maxretention + Config.minretention)*pow((fileSize / Config.maxFileSize -1), 3)): elif retention > (Config.minretention+(-Config.maxretention + Config.minretention)*pow((fileSize / Config.maxFileSize -1), 3)):
retention = (Config.minretention+(-Config.maxretention + Config.minretention)*pow((fileSize / Config.maxFileSize -1), 3)) retention = (Config.minretention+(-Config.maxretention + Config.minretention)*pow((fileSize / Config.maxFileSize -1), 3))
if file.
# Create the file # Create the file
with open(f"{os.path.abspath(Config.fileDir)}/{filename}", "wb") as f: with open(f"{os.path.abspath(Config.fileDir)}/{filename}", "wb") as f:
f.write(file.read()) f.write(file.read())