From a8d25d482150697357c723e8d408673ce265ac81 Mon Sep 17 00:00:00 2001 From: deflax Date: Thu, 6 Feb 2025 16:59:44 +0000 Subject: [PATCH] rename flask_api to api --- src/api/app/{flask_api.py => api.py} | 20 ++++++++++---------- src/api/scripts/entrypoint.sh | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) rename src/api/app/{flask_api.py => api.py} (96%) diff --git a/src/api/app/flask_api.py b/src/api/app/api.py similarity index 96% rename from src/api/app/flask_api.py rename to src/api/app/api.py index 660fa0a..d6e6fd9 100644 --- a/src/api/app/flask_api.py +++ b/src/api/app/api.py @@ -11,7 +11,7 @@ from flask.helpers import send_file, send_from_directory from apscheduler.schedulers.background import BackgroundScheduler from core_client import Client -api = Flask(__name__) +app = Flask(__name__) scheduler = BackgroundScheduler() # Log handlers @@ -238,7 +238,7 @@ def client_address(req): return req.environ['HTTP_X_FORWARDED_FOR'] # Frontend -@api.route('/', methods=['GET']) +@app.route('/', methods=['GET']) def root_route(): # Get a list of video files and thumbnails video_files = [file for file in os.listdir(f'{rec_path}/vod/') if file.endswith(('.mp4', '.mkv', '.avi'))] @@ -254,18 +254,18 @@ def root_route(): return render_template('index.html', now=datetime.utcnow(), video_files=video_files, thumbnails=sorted_thumbnails) # JSON Data -@api.route('/playhead', methods=['GET']) +@app.route('/playhead', methods=['GET']) def playhead_route(): global playhead return jsonify(playhead) -@api.route('/database', methods=['GET']) +@app.route('/database', methods=['GET']) def database_route(): global database return jsonify(database) # Images -@api.route("/thumb/", methods=['GET']) +@app.route("/thumb/", methods=['GET']) def thumb_route(thumb_file): thumb_path = f'{rec_path}/thumb/{thumb_file}' if not os.path.exists(thumb_path): @@ -273,7 +273,7 @@ def thumb_route(thumb_file): return send_file(thumb_path, mimetype='image/png') # Video -@api.route("/video/", methods=['GET']) +@app.route("/video/", methods=['GET']) def video_route(video_file): video_path = f'{rec_path}/vod/{video_file}' if not os.path.exists(video_path): @@ -281,7 +281,7 @@ def video_route(video_file): logger_content.warning('[' + client_address(request) + '] stream' + str(video_path)) return send_file(video_path, mimetype='video/mp4') -@api.route("/video/download/", methods=['GET']) +@app.route("/video/download/", methods=['GET']) def video_download_route(video_file): video_path = f'{rec_path}/vod/{video_file}' if not os.path.exists(video_path): @@ -289,7 +289,7 @@ def video_download_route(video_file): logger_content.warning('[' + client_address(request) + '] download' + str(video_path)) return send_file(video_path, as_attachment=True, download_name=video_file) -@api.route("/video/watch/", methods=['GET']) +@app.route("/video/watch/", methods=['GET']) def video_watch_route(video_file_no_extension): video_file = f'{video_file_no_extension}.mp4' thumb_file = f'{video_file_no_extension}.png' @@ -302,5 +302,5 @@ def video_watch_route(video_file_no_extension): logger_content.warning('[' + client_address(request) + '] player' + str(video_path)) return render_template('watch.html', video_file=video_file, thumb_file=thumb_file) -def create_api(): - return api +def create_app(): + return app diff --git a/src/api/scripts/entrypoint.sh b/src/api/scripts/entrypoint.sh index feb7131..9ebd089 100644 --- a/src/api/scripts/entrypoint.sh +++ b/src/api/scripts/entrypoint.sh @@ -2,11 +2,11 @@ set -e -if [ -f /app/flask_api.py ]; then - DEFAULT_MODULE_NAME=flask_api +if [ -f /app/api.py ]; then + DEFAULT_MODULE_NAME=api fi MODULE_NAME=${MODULE_NAME:-$DEFAULT_MODULE_NAME} -VARIABLE_NAME=${VARIABLE_NAME:-create_api} +VARIABLE_NAME=${VARIABLE_NAME:-create_app} export APP_MODULE=${APP_MODULE:-"$MODULE_NAME:$VARIABLE_NAME"} exec "$@" \ No newline at end of file