nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-04-13 16:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix download && message

Browse Source
This commit is contained in:
jxxghp
2024-09-19 08:30:58 +08:00
parent 152546d89a
commit 786b317cea
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/chain/__init__.py
View File

@@ -483,7 +483,7 @@ class ChainBase(metaclass=ABCMeta):
if not message.userid and message.mtype:
# 没有指定用户ID时，按规则确定发送对象
# 默认发送全体
to_targets = {}
to_targets = None
notify_action = self.notificationhelper.get_switch(message.mtype)
if notify_action == "admin":
# 仅发送管理员

8
app/modules/qbittorrent/__init__.py
View File

@@ -146,7 +146,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase):
if settings.TORRENT_TAG and settings.TORRENT_TAG not in torrent_tags:
logger.info(f"给种子 {torrent_hash} 打上标签：{settings.TORRENT_TAG}")
server.set_torrents_tag(ids=torrent_hash, tags=[settings.TORRENT_TAG])
return downloader or self._default_server, torrent_hash, f"下载任务已存在"
return downloader or self._default_server_name, torrent_hash, f"下载任务已存在"
return None, None, f"添加种子任务失败：{content}"
else:
# 获取种子Hash
@@ -158,7 +158,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase):
# 种子文件
torrent_files = server.get_files(torrent_hash)
if not torrent_files:
return downloader or self._default_server, torrent_hash, "获取种子文件失败，下载任务可能在暂停状态"
return downloader or self._default_server_name, torrent_hash, "获取种子文件失败，下载任务可能在暂停状态"
# 不需要的文件ID
file_ids = []
@@ -183,11 +183,11 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase):
server.torrents_set_force_start(torrent_hash)
else:
server.start_torrents(torrent_hash)
return downloader or self._default_server, torrent_hash, f"添加下载成功，已选择集数：{sucess_epidised}"
return downloader or self._default_server_name, torrent_hash, f"添加下载成功，已选择集数：{sucess_epidised}"
else:
if server.is_force_resume():
server.torrents_set_force_start(torrent_hash)
return downloader or self._default_server, torrent_hash, "添加下载成功"
return downloader or self._default_server_name, torrent_hash, "添加下载成功"
def list_torrents(self, status: TorrentStatus = None,
hashs: Union[list, str] = None,

10
app/modules/slack/slack.py
View File

@@ -24,14 +24,14 @@ class Slack:
_ds_url = f"http://127.0.0.1:{settings.PORT}/api/v1/message?token={settings.API_TOKEN}"
_channel = ""
def __init__(self, oauth_token: str = None, app_token: str = None, channel: str = "", **kwargs):
def __init__(self, SLACK_OAUTH_TOKEN: str = None, SLACK_APP_TOKEN: str = None, SLACK_CHANNEL: str = "", **kwargs):
if not oauth_token or not app_token:
if not SLACK_OAUTH_TOKEN or not SLACK_APP_TOKEN:
logger.error("Slack 配置不完整！")
return
try:
slack_app = App(token=oauth_token,
slack_app = App(token=SLACK_OAUTH_TOKEN,
ssl_check_enabled=False,
url_verification_enabled=False)
except Exception as err:
@@ -39,7 +39,7 @@ class Slack:
return
self._client = slack_app.client
self._channel = channel
self._channel = SLACK_CHANNEL
# 标记消息来源
if kwargs.get("name"):
@@ -79,7 +79,7 @@ class Slack:
try:
self._service = SocketModeHandler(
slack_app,
app_token
SLACK_APP_TOKEN
)
self._service.connect()
logger.info("Slack消息接收服务启动")

8
app/modules/synologychat/synologychat.py
View File

@@ -14,13 +14,13 @@ lock = Lock()
class SynologyChat:
def __init__(self, webhook: str = None, token: str = None, **kwargs):
if not webhook or not token:
def __init__(self, SYNOLOGYCHAT_WEBHOOK: str = None, SYNOLOGYCHAT_TOKEN: str = None, **kwargs):
if not SYNOLOGYCHAT_WEBHOOK or not SYNOLOGYCHAT_TOKEN:
logger.error("SynologyChat配置不完整！")
return
self._req = RequestUtils(content_type="application/x-www-form-urlencoded")
self._webhook_url = webhook
self._token = token
self._webhook_url = SYNOLOGYCHAT_WEBHOOK
self._token = SYNOLOGYCHAT_TOKEN
if self._webhook_url:
self._domain = StringUtils.get_base_url(self._webhook_url)

6
app/modules/telegram/__init__.py
View File

@@ -113,9 +113,9 @@ class TelegramModule(_ModuleBase, _MessageBase):
if text:
logger.info(f"收到来自 {source} 的Telegram消息：userid={user_id}, username={user_name}, text={text}")
# 检查权限
admin_users = config.config.get("admins")
user_list = config.config.get("users")
chat_id = config.config.get("chat_id")
admin_users = config.config.get("TELEGRAM_ADMINS")
user_list = config.config.get("TELEGRAM_USERS")
chat_id = config.config.get("TELEGRAM_CHAT_ID")
if text.startswith("/"):
if admin_users \
and str(user_id) not in admin_users.split(',') \

8
app/modules/telegram/telegram.py
View File

@@ -25,17 +25,17 @@ class Telegram:
_event = Event()
_bot: telebot.TeleBot = None
def __init__(self, token: str = None, chat_id: str = None, **kwargs):
def __init__(self, TELEGRAM_TOKEN: str = None, TELEGRAM_CHAT_ID: str = None, **kwargs):
"""
初始化参数
"""
if not token or not chat_id:
if not TELEGRAM_TOKEN or not TELEGRAM_CHAT_ID:
logger.error("Telegram配置不完整！")
return
# Token
self._telegram_token = token
self._telegram_token = TELEGRAM_TOKEN
# Chat Id
self._telegram_chat_id = chat_id
self._telegram_chat_id = TELEGRAM_CHAT_ID
# 初始化机器人
if self._telegram_token and self._telegram_chat_id:
# bot

8
app/modules/transmission/__init__.py
View File

@@ -146,7 +146,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase):
if settings.TORRENT_TAG and settings.TORRENT_TAG not in labels:
labels.append(settings.TORRENT_TAG)
server.set_torrent_tag(ids=torrent_hash, tags=labels)
return downloader or self._default_server, torrent_hash, f"下载任务已存在"
return downloader or self._default_server_name, torrent_hash, f"下载任务已存在"
return None, None, f"添加种子任务失败：{content}"
else:
torrent_hash = torrent.hashString
@@ -154,7 +154,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase):
# 选择文件
torrent_files = server.get_files(torrent_hash)
if not torrent_files:
return downloader or self._default_server, torrent_hash, "获取种子文件失败，下载任务可能在暂停状态"
return downloader or self._default_server_name, torrent_hash, "获取种子文件失败，下载任务可能在暂停状态"
# 需要的文件信息
file_ids = []
unwanted_file_ids = []
@@ -175,9 +175,9 @@ class TransmissionModule(_ModuleBase, _DownloaderBase):
server.set_unwanted_files(torrent_hash, unwanted_file_ids)
# 开始任务
server.start_torrents(torrent_hash)
return downloader or self._default_server, torrent_hash, "添加下载任务成功"
return downloader or self._default_server_name, torrent_hash, "添加下载任务成功"
else:
return downloader or self._default_server, torrent_hash, "添加下载任务成功"
return downloader or self._default_server_name, torrent_hash, "添加下载任务成功"
def list_torrents(self, status: TorrentStatus = None,
hashs: Union[list, str] = None,

10
app/modules/vocechat/vocechat.py
View File

@@ -22,21 +22,21 @@ class VoceChat:
# 请求对象
_client = None
def __init__(self, host: str = None, apikey: str = None, channel_id: str = None, **kwargs):
def __init__(self, VOCECHAT_HOST: str = None, VOCECHAT_API_KEY: str = None, VOCECHAT_CHANNEL_ID: str = None, **kwargs):
"""
初始化
"""
if not host or not apikey or not channel_id:
if not VOCECHAT_HOST or not VOCECHAT_API_KEY or not VOCECHAT_CHANNEL_ID:
logger.error("VoceChat配置不完整！")
return
self._host = host
self._host = VOCECHAT_HOST
if self._host:
if not self._host.endswith("/"):
self._host += "/"
if not self._host.startswith("http"):
self._playhost = "http://" + self._host
self._apikey = apikey
self._channel_id = channel_id
self._apikey = VOCECHAT_API_KEY
self._channel_id = VOCECHAT_CHANNEL_ID
if self._apikey and self._host and self._channel_id:
self._client = RequestUtils(headers={
"content-type": "text/markdown",

14
app/modules/wechat/wechat.py
View File

@@ -37,18 +37,18 @@ class WeChat:
# 企业微信创新菜单URL
_create_menu_url = "/cgi-bin/menu/create?access_token=%s&agentid=%s"
def __init__(self, corpid: str = None, appsecret: str = None, appid: str = None,
proxy: str = None, **kwargs):
def __init__(self, WECHAT_CORPID: str = None, WECHAT_APP_SECRET: str = None, WECHAT_APP_ID: str = None,
WECHAT_PROXY: str = None, **kwargs):
"""
初始化
"""
if not corpid or not appsecret or not appid:
if not WECHAT_CORPID or not WECHAT_APP_SECRET or not WECHAT_APP_ID:
logger.error("企业微信配置不完整！")
return
self._corpid = corpid
self._appsecret = appsecret
self._appid = appid
self._proxy = proxy or "https://qyapi.weixin.qq.com"
self._corpid = WECHAT_CORPID
self._appsecret = WECHAT_APP_SECRET
self._appid = WECHAT_APP_ID
self._proxy = WECHAT_PROXY or "https://qyapi.weixin.qq.com"
if self._corpid and self._appsecret and self._appid:
self.__get_access_token()