diff --git a/bin/Darwin/chromedriver b/bin/Darwin/chromedriver new file mode 100755 index 0000000..88d8a5b Binary files /dev/null and b/bin/Darwin/chromedriver differ diff --git a/info.json b/info.json new file mode 100644 index 0000000..409bbab --- /dev/null +++ b/info.json @@ -0,0 +1,10 @@ +{ + "version": "0.1.2.0", + "name": "anime_downloader", + "category_name": "vod", + "icon": "", + "developer": "soju6jan && projectdx", + "description": "비디오 다운로드", + "home": "http://yommi.duckdns.org:20080/projectdx/anime-downloader", + "more": "" +} \ No newline at end of file diff --git a/logic_ohli24.py b/logic_ohli24.py index 1e32129..e78367b 100644 --- a/logic_ohli24.py +++ b/logic_ohli24.py @@ -159,7 +159,7 @@ class LogicOhli24(LogicModuleBase): data = [] cate = request.form["type"] - logger.debug("cate", cate) + logger.debug("cate:: %s", cate) page = request.form["page"] data = self.get_anime_info(cate, page) @@ -268,15 +268,30 @@ class LogicOhli24(LogicModuleBase): data = [] # print(code) # logger.info("code::: %s", code) - logger.debug(item) + # logger.debug(item) # 잠시 중지 # data = self.get_series_info(item["code"], wr_id, bo_table) - logger.debug(data) + # logger.debug(data) # result = asyncio.run(LogicOhli24.main(url_list)) # logger.debug(f"result:: {result}") + elif len(content_code_list) > 0: + for item in content_code_list: + url = P.ModelSetting.get("ohli24_url") + "/c/" + item + print("scheduling url: %s", url) + # ret_data = LogicOhli24.get_auto_anime_info(self, url=url) + content_info = self.get_series_info(item, "", "") + + for episode_info in content_info["episode"]: + add_ret = self.add(episode_info) + if add_ret.startswith("enqueue"): + self.socketio_callback("list_refresh", "") + # logger.debug(f"data: {data}") + # self.current_data = data + # db에서 다운로드 완료 유무 체크 + @staticmethod async def get_data(url) -> str: async with aiohttp.ClientSession() as session: @@ -640,12 +655,12 @@ class LogicOhli24(LogicModuleBase): return "queue_exist" else: db_entity = ModelOhli24Item.get_by_ohli24_id(episode_info["_id"]) - logger.debug("db_entity:::> %s", db_entity) + # logger.debug("db_entity:::> %s", db_entity) if db_entity is None: entity = Ohli24QueueEntity(P, self, episode_info) - logger.debug("entity:::> %s", entity.as_dict()) + # logger.debug("entity:::> %s", entity.as_dict()) ModelOhli24Item.append(entity.as_dict()) - logger.debug("entity:: type >> %s", type(entity)) + # logger.debug("entity:: type >> %s", type(entity)) self.queue.add_queue(entity) return "enqueue_db_append" diff --git a/plugin.py b/plugin.py index e4e8113..13acf85 100644 --- a/plugin.py +++ b/plugin.py @@ -13,7 +13,6 @@ from flask import Blueprint # sjva 공용 from framework.logger import get_logger from framework import app, path_data -from framework.util import Util from plugin import get_model_setting, Logic, default_route, PluginUtil @@ -32,7 +31,12 @@ class P(object): ) menu = { "main": [package_name, "애니 다운로드"], - "sub": [["ohli24", "OHLI24"], ["linkkf", "LINKKF"], ["log", "로그"]], + "sub": [ + ["ohli24", "OHLI24"], + ["linkkf", "LINKKF"], + ["anilife", "애니라이프"], + ["log", "로그"], + ], "category": "vod", "sub2": { "ohli24": [ @@ -48,10 +52,17 @@ class P(object): ["queue", "큐"], ["list", "목록"], ], + "anilife": [ + ["setting", "설정"], + ["request", "요청"], + ["category", "검색"], + ["queue", "큐"], + ["list", "목록"], + ], }, } plugin_info = { - "version": "0.1.1.0", + "version": "0.1.2.0", "name": "anime_downloader", "category_name": "vod", "icon": "", @@ -76,10 +87,10 @@ def initialize(): ) PluginUtil.make_info_json(P.plugin_info, __file__) from .logic_ohli24 import LogicOhli24 - from .logic_linkkf import LogicLinkkf + from .logic_anilife import LogicAniLife # P.module_list = [LogicOhli24(P), LogicLinkkf(P)] - P.module_list = [LogicOhli24(P)] + P.module_list = [LogicOhli24(P), LogicAniLife(P)] P.logic = Logic(P) default_route(P) except Exception as e: diff --git a/templates/anime_downloader_anilife_category.html b/templates/anime_downloader_anilife_category.html new file mode 100644 index 0000000..9bb3b14 --- /dev/null +++ b/templates/anime_downloader_anilife_category.html @@ -0,0 +1,656 @@ +{% extends "base.html" %} {% block content %} + +