From d0c45a6a62c1e651c167d929c84e14decfecca3c Mon Sep 17 00:00:00 2001 From: CakesTwix Date: Mon, 23 Sep 2024 19:17:25 +0300 Subject: [PATCH] Reformat python code via `black` --- app/__init__.py | 27 +++++++++++++++++++-------- app/api/__init__.py | 4 ++-- app/api/config_api.py | 1 + app/api/titles.py | 12 +++++------- app/api/toloka.py | 3 ++- app/client.py | 10 ++++++---- app/config.py | 13 +++++++------ app/db.py | 2 ++ 8 files changed, 44 insertions(+), 28 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4722bdc..b310d41 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -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) diff --git a/app/api/__init__.py b/app/api/__init__.py index bc6c705..8510411 100644 --- a/app/api/__init__.py +++ b/app/api/__init__.py @@ -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 * \ No newline at end of file +from .config_api import * diff --git a/app/api/config_api.py b/app/api/config_api.py index e54ba3f..407c5ac 100644 --- a/app/api/config_api.py +++ b/app/api/config_api.py @@ -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() diff --git a/app/api/titles.py b/app/api/titles.py index 76867db..45085d3 100644 --- a/app/api/titles.py +++ b/app/api/titles.py @@ -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} - - - diff --git a/app/api/toloka.py b/app/api/toloka.py index 02e32ff..56f7652 100644 --- a/app/api/toloka.py +++ b/app/api/toloka.py @@ -2,7 +2,8 @@ from flask import jsonify from app.services.torrents import initiate_config from . import api_bp + @api_bp.route("/api/toloka/") 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)) diff --git a/app/client.py b/app/client.py index cc3092f..5c9fa83 100644 --- a/app/client.py +++ b/app/client.py @@ -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/", +) diff --git a/app/config.py b/app/config.py index 2d9206d..9505951 100644 --- a/app/config.py +++ b/app/config.py @@ -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') \ No newline at end of file + +app.config.from_object("app.config.Config") diff --git a/app/db.py b/app/db.py index 0fa5a5c..0e993f1 100644 --- a/app/db.py +++ b/app/db.py @@ -4,9 +4,11 @@ from sqlalchemy.orm import DeclarativeBase, MappedAsDataclass db = SQLAlchemy() + class Base(DeclarativeBase, MappedAsDataclass): pass + class ImagesCache(Base): __tablename__ = "image_cache"