From 0ad6c9c59ad8ec156949c449ea439fc5f163c066 Mon Sep 17 00:00:00 2001 From: projectdx Date: Tue, 12 Apr 2022 23:57:13 +0900 Subject: [PATCH] blueprint add static_folder --- plugin.py | 71 ++++++++++++------- {ohil24/static => static}/img_loader_x200.svg | 0 static/ohli24/img_loader_x200.svg | 23 ++++++ .../anime_downloader_ohli24_category.html | 2 +- .../anime_downloader_ohli24_request.html | 1 + 5 files changed, 69 insertions(+), 28 deletions(-) rename {ohil24/static => static}/img_loader_x200.svg (100%) create mode 100644 static/ohli24/img_loader_x200.svg diff --git a/plugin.py b/plugin.py index 4fb1302..6f6c288 100644 --- a/plugin.py +++ b/plugin.py @@ -1,13 +1,15 @@ # -*- coding: utf-8 -*- # @Time : 2022/02/08 2:57 PM # @Author : yommi -# @Site : +# @Site : # @File : plugin # @Software: PyCharm import os, traceback + # third-party from flask import Blueprint + # sjva 공용 from framework.logger import get_logger from framework import app, path_data @@ -17,56 +19,71 @@ from plugin import get_model_setting, Logic, default_route, PluginUtil ####################################################################### + class P(object): - package_name = __name__.split('.')[0] + package_name = __name__.split(".")[0] logger = get_logger(package_name) - blueprint = Blueprint(package_name, package_name, url_prefix='/%s' % package_name, - template_folder=os.path.join(os.path.dirname(__file__), 'templates')) + blueprint = Blueprint( + package_name, + package_name, + url_prefix="/%s" % package_name, + template_folder=os.path.join(os.path.dirname(__file__), "templates"), + static_folder="static", + ) menu = { - 'main': [package_name, u'애니 다운로드'], - 'sub': [ - ['ohli24', u'OHLI24'], ['linkkf', u'LINKKF'], ['log', u'로그'] - ], - 'category': 'vod', - 'sub2': { - 'ohli24': [ - ['setting', u'설정'], ['request', u'요청'], ['queue', u'큐'], ['category', u'분류'], ['list', u'목록'] + "main": [package_name, "애니 다운로드"], + "sub": [["ohli24", "OHLI24"], ["linkkf", "LINKKF"], ["log", "로그"]], + "category": "vod", + "sub2": { + "ohli24": [ + ["setting", "설정"], + ["request", "요청"], + ["queue", "큐"], + ["category", "분류"], + ["list", "목록"], ], - 'linkkf': [ - ['setting', u'설정'], ['request', u'요청'], ['queue', u'큐'], ['list', u'목록'] + "linkkf": [ + ["setting", "설정"], + ["request", "요청"], + ["queue", "큐"], + ["list", "목록"], ], - } + }, } plugin_info = { - 'version': '0.1.1.0', - 'name': 'anime_downloader', - 'category_name': 'vod', - 'icon': '', - 'developer': 'soju6jan && projectdx', - 'description': u'비디오 다운로드', - 'home': 'http://yommi.duckdns.org:20080/projectdx/anime-downloader', - 'more': '', + "version": "0.1.1.0", + "name": "anime_downloader", + "category_name": "vod", + "icon": "", + "developer": "soju6jan && projectdx", + "description": "비디오 다운로드", + "home": "http://yommi.duckdns.org:20080/projectdx/anime-downloader", + "more": "", } ModelSetting = get_model_setting(package_name, logger) logic = None module_list = None - home_module = 'ohli24' + home_module = "ohli24" # 초기화 함수 def initialize(): try: - app.config['SQLALCHEMY_BINDS'][P.package_name] = 'sqlite:///%s' % ( - os.path.join(path_data, 'db', '{package_name}.db'.format(package_name=P.package_name))) + app.config["SQLALCHEMY_BINDS"][P.package_name] = "sqlite:///%s" % ( + os.path.join( + path_data, "db", "{package_name}.db".format(package_name=P.package_name) + ) + ) PluginUtil.make_info_json(P.plugin_info, __file__) from .logic_ohli24 import LogicOhli24 from .logic_linkkf import LogicLinkkf + # P.module_list = [LogicOhli24(P), LogicLinkkf(P)] P.module_list = [LogicOhli24(P)] P.logic = Logic(P) default_route(P) except Exception as e: - P.logger.error('Exception:%s', e) + P.logger.error("Exception:%s", e) P.logger.error(traceback.format_exc()) diff --git a/ohil24/static/img_loader_x200.svg b/static/img_loader_x200.svg similarity index 100% rename from ohil24/static/img_loader_x200.svg rename to static/img_loader_x200.svg diff --git a/static/ohli24/img_loader_x200.svg b/static/ohli24/img_loader_x200.svg new file mode 100644 index 0000000..05f8d6f --- /dev/null +++ b/static/ohli24/img_loader_x200.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/anime_downloader_ohli24_category.html b/templates/anime_downloader_ohli24_category.html index dec361c..99e7ab0 100644 --- a/templates/anime_downloader_ohli24_category.html +++ b/templates/anime_downloader_ohli24_category.html @@ -136,7 +136,7 @@ tmp = '
'; tmp += '
'; // tmp += ''; - tmp += ''; + tmp += ''; tmp += '
' // {#tmp += '
';#} diff --git a/templates/anime_downloader_ohli24_request.html b/templates/anime_downloader_ohli24_request.html index 5367c74..de79350 100644 --- a/templates/anime_downloader_ohli24_request.html +++ b/templates/anime_downloader_ohli24_request.html @@ -210,6 +210,7 @@ data: {data:JSON.stringify(data)}, dataType: "json", success: function (data) { + console.log('#add_queue_btn::data >>', data) if (data.ret == 'enqueue_db_append' || data.ret == 'enqueue_db_exist') { $.notify('다운로드 작업을 추가 하였습니다.', {type: 'success'}); } else if (data.ret == 'queue_exist') {