diff --git a/README.md b/README.md index c07d271..5c2e77c 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ # YYeTsBot -人人影视bot，[戳我使用](https://t.me/yyets_bot) +人人影视bot，[戳我使用](https://t.me/yyets_bot) 此机器人长期维护，如果遇到问题可以发送报告给我。 # 使用说明 + 直接发送想要看的剧集名称就可以了，可选分享网页或者链接（ed2k和磁力链接）。 **由于译名的不同，建议输入部分译名，然后从列表中进行选择。比如说想看权力的游戏第四季，那么直接搜索"权力的游戏"就可以了。** @@ -51,8 +52,7 @@ pip install -r requirements.py * PROXY ：是否需要使用代理 格式 `http://userproxy:password@proxy_address:port` * MAINTAINER：维护者的Telegram UserID * REDIS：redis的地址，一般为localhost -* OFFLINE： 离线模式，使用离线数据 -也可以使用环境变量，如 `export TOKEN="1234"` +* OFFLINE： 离线模式，使用离线数据 也可以使用环境变量，如 `export TOKEN="1234"` ### 3. 运行 @@ -65,15 +65,16 @@ python /path/to/YYeTsBot/bot.py 参考 `yyets.service` # TODO -- [ ] 添加对FIX的支持 +- [x] 添加对FIX的支持 +- [x] 文件/函数重命名，类化 +- [x] 优先字幕组顺序设置 - [ ] 整理fix资源 -- [ ] 文件/函数重命名，类化 - [ ] test case...啊不想写 -- [ ] 优先字幕组顺序设置 参见分支 `zimuxia` # 归档资源下载 + 包含了2021年1月11日为止的最新资源，有兴趣的盆友可以用这个数据进行二次开发 [戳我查看详情](https://t.me/mikuri520/668) diff --git a/yyetsbot/bot.py b/yyetsbot/bot.py index 544e9fb..c025064 100644 --- a/yyetsbot/bot.py +++ b/yyetsbot/bot.py @@ -19,12 +19,10 @@ from telebot import types, apihelper from tgbot_ping import get_runtime from apscheduler.schedulers.background import BackgroundScheduler -from fansub import Zimuxia +from fansub import FansubEntrance -# mock -YYeTs = Zimuxia -from utils import (save_error_dump, get_error_dump, reset_request, today_request, - show_usage, redis_announcement +from utils import (save_error_dump, get_error_dump, reset_request, + today_request, show_usage, redis_announcement ) from config import PROXY, TOKEN, YYETS_SEARCH_URL, MAINTAINER, REPORT, OFFLINE @@ -162,7 +160,7 @@ def send_my_response(message): @bot.message_handler(content_types=["photo", "text"]) def send_search(message): - yyets = YYeTs() + fan = FansubEntrance() bot.send_chat_action(message.chat.id, 'typing') today_request("total") @@ -185,12 +183,13 @@ def send_search(message): logging.warning("☢️ Going offline mode!!!") bot.send_message(message.chat.id, "人人影视官网不可用，目前在使用离线模式，可能没有最新的剧集。") bot.send_chat_action(message.chat.id, 'upload_document') - result = yyets.offline_search_preview(name) + result = fan.offline_search_preview(name) else: - result = yyets.online_search_preview(name) + result = fan.online_search_preview(name) markup = types.InlineKeyboardMarkup() - source = result["source"] + + source = result.get("source") result.pop("source") for url, detail in result.items(): btn = types.InlineKeyboardButton(detail, callback_data="choose%s" % url) @@ -208,7 +207,6 @@ def send_search(message): encoded = quote_plus(name) bot.send_message(message.chat.id, f"没有找到你想要的信息，是不是你打了错别字，或者搜索了一些国产影视剧。🤪\n" f"还是你想调戏我哦🙅‍️\n\n" - f"可以看看这个链接，看看有没有结果。 {YYETS_SEARCH_URL.format(kw=encoded)} \n\n" "⚠️如果确定要我背锅，那么请使用 /help 来提交错误", disable_web_page_preview=True) if REPORT: btn = types.InlineKeyboardButton("快来修复啦", callback_data="fix") @@ -229,14 +227,14 @@ def send_search(message): @bot.callback_query_handler(func=lambda call: re.findall(r"choose(\S*)", call.data)) def choose_link(call): - yyets = YYeTs() + fan = FansubEntrance() bot.send_chat_action(call.message.chat.id, 'typing') # call.data is url, http://www.rrys2020.com/resource/36588 resource_url = re.findall(r"choose(\S*)", call.data)[0] markup = types.InlineKeyboardMarkup() if OFFLINE: - worker_page_data = yyets.offline_search_result(resource_url) + worker_page_data = fan.offline_search_result(resource_url) btn1 = types.InlineKeyboardButton("打开网页", url=worker_page_data["share"]) markup.add(btn1) bot.send_message(call.message.chat.id, "离线模式，点击按钮打开网页获取结果", reply_markup=markup) @@ -253,20 +251,20 @@ def choose_link(call): @bot.callback_query_handler(func=lambda call: re.findall(r"share(\S*)", call.data)) def share_page(call): - yyets = YYeTs() + fan = FansubEntrance() bot.send_chat_action(call.message.chat.id, 'typing') resource_url = re.findall(r"share(\S*)", call.data)[0] - result = yyets.online_search_result(resource_url) + result = fan.online_search_result(resource_url) bot.send_message(call.message.chat.id, result['share']) @bot.callback_query_handler(func=lambda call: re.findall(r"all(\S*)", call.data)) def all_episode(call): # just send a file - yyets = YYeTs() + fan = FansubEntrance() bot.send_chat_action(call.message.chat.id, 'typing') resource_url = re.findall(r"all(\S*)", call.data)[0] - result = yyets.online_search_result(resource_url) + result = fan.online_search_result(resource_url) with tempfile.NamedTemporaryFile(mode='wb+', prefix=result["cnname"], suffix=".txt") as tmp: bytes_data = json.dumps(result["all"], ensure_ascii=False, indent=4).encode('u8') diff --git a/yyetsbot/fansub.py b/yyetsbot/fansub.py index df09aaf..cf3b8b6 100644 --- a/yyetsbot/fansub.py +++ b/yyetsbot/fansub.py @@ -292,4 +292,30 @@ class Zimuxia(BaseFansub): class FansubEntrance(BaseFansub): - pass + # order = [Zimuxia, YYeTs] + order = [YYeTs, Zimuxia] + fansub_class = None + + def online_search_preview(self, search_text: str) -> dict: + source = "聪明机智温柔可爱的benny" + for sub in self.order: + logging.info("Looping from %s", sub) + result = sub().online_search_preview(search_text) + # this result contains source:sub, so we'll pop and add it + source = result.pop("source") + if result: + logging.info("Result hit in %s", sub) + FansubEntrance.fansub_class = sub + result["source"] = source + return result + + return dict(source=source) + + def online_search_result(self, resource_url: str) -> dict: + return self.fansub_class().online_search_result(resource_url) + + def offline_search_preview(self, search_text: str) -> dict: + pass + + def offline_search_result(self, resource_url) -> dict: + pass