Reformat python code via black

This commit is contained in:
CakesTwix 2024-09-23 19:17:25 +03:00
parent 0ada059a22
commit d0c45a6a62
Signed by: CakesTwix
GPG key ID: 7B11051D5CE19825
8 changed files with 44 additions and 28 deletions

View file

@ -1,5 +1,14 @@
import os
from flask import Flask, render_template, request, jsonify, redirect, url_for, current_app, send_file
from flask import (
Flask,
render_template,
request,
jsonify,
redirect,
url_for,
current_app,
send_file,
)
from flask_caching import Cache
from toloka2MediaServer.main_logic import (
@ -12,15 +21,15 @@ from toloka2MediaServer.main_logic import (
)
from app.services.torrents import initiate_config, serialize_operation_result
#from .api import api_bp
# from .api import api_bp
from .client import client_bp
from .api import *
from .db import db
# App
app = Flask(__name__, static_folder='../frontend/dist/assets')
app = Flask(__name__, static_folder="../frontend/dist/assets")
app.register_blueprint(client_bp)
app.register_blueprint(api_bp)
app.register_blueprint(api_bp)
# Cache
cache = Cache(config={"CACHE_TYPE": "SimpleCache"})
@ -35,10 +44,12 @@ with app.app_context():
# Production route
from .config import Config
app.logger.info('>>> {}'.format(Config.FLASK_ENV))
@app.route('/')
app.logger.info(">>> {}".format(Config.FLASK_ENV))
@app.route("/")
def index_client():
dist_dir = current_app.config['DIST_DIR']
entry = os.path.join(dist_dir, 'index.html')
dist_dir = current_app.config["DIST_DIR"]
entry = os.path.join(dist_dir, "index.html")
return send_file(entry)

View file

@ -1,7 +1,7 @@
from flask import Blueprint
api_bp = Blueprint('api', __name__)
api_bp = Blueprint("api", __name__)
from .titles import *
from .toloka import *
from .config_api import *
from .config_api import *

View file

@ -2,6 +2,7 @@ from flask import jsonify
from app.services.torrents import initiate_config
from . import api_bp
@api_bp.route("/api/config/")
def config_route():
config = initiate_config()

View file

@ -20,7 +20,7 @@ def titles_route():
sections = []
config = initiate_config()
titles = config.titles_config
for title in titles.sections():
if request.args.get("query", "") in title:
image_cache = db.session.execute(
@ -47,17 +47,18 @@ def titles_route():
'"', ""
)
sections.append(dict(titles[title]))
return jsonify(sections)
@api_bp.route("/api/add", methods=['POST'])
@api_bp.route("/api/add", methods=["POST"])
def add_route():
config = initiate_config()
requestData = RequestData(
url=request.json["tolokaUrl"],
season=request.json["seasonIndex"],
index=int(request.json["episodeIndex"].split('.')[0]),
index=int(request.json["episodeIndex"].split(".")[0]),
correction=int(request.json["adjustedEpisodeNumber"]),
title=request.json["dirname"],
)
@ -99,6 +100,3 @@ def update_route(codename):
except Exception as e:
message = f"Error: {str(e)}"
return {"error": message}

View file

@ -2,7 +2,8 @@ from flask import jsonify
from app.services.torrents import initiate_config
from . import api_bp
@api_bp.route("/api/toloka/<id>")
def toloka_torrent_route(id):
config = initiate_config()
return jsonify(config.toloka.get_torrent('https://toloka.to/' + id))
return jsonify(config.toloka.get_torrent("https://toloka.to/" + id))

View file

@ -3,7 +3,9 @@
import os
from flask import Blueprint, render_template
client_bp = Blueprint('client_app', __name__,
static_folder='../frontend/dist/assets/',
template_folder='../frontend/dist/',
)
client_bp = Blueprint(
"client_app",
__name__,
static_folder="../frontend/dist/assets/",
template_folder="../frontend/dist/",
)

View file

@ -7,18 +7,19 @@ See `.flaskenv` for default settings.
import os
from app import app
class Config(object):
# If not set fall back to production for safety
FLASK_ENV = os.getenv('FLASK_ENV', 'production')
FLASK_ENV = os.getenv("FLASK_ENV", "production")
# Set FLASK_SECRET on your production Environment
SECRET_KEY = os.getenv('FLASK_SECRET', 'Secret')
SECRET_KEY = os.getenv("FLASK_SECRET", "Secret")
APP_DIR = os.path.dirname(__file__)
ROOT_DIR = os.path.dirname(APP_DIR)
DIST_DIR = os.path.join(ROOT_DIR, 'frontend/dist')
DIST_DIR = os.path.join(ROOT_DIR, "frontend/dist")
if not os.path.exists(DIST_DIR):
raise Exception(
'DIST_DIR not found: {}'.format(DIST_DIR))
raise Exception("DIST_DIR not found: {}".format(DIST_DIR))
app.config.from_object('app.config.Config')
app.config.from_object("app.config.Config")

View file

@ -4,9 +4,11 @@ from sqlalchemy.orm import DeclarativeBase, MappedAsDataclass
db = SQLAlchemy()
class Base(DeclarativeBase, MappedAsDataclass):
pass
class ImagesCache(Base):
__tablename__ = "image_cache"