codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
jxxghp 2023-08-13 22:02:48 +08:00
parent 3dd18ef10c
commit f2fdd9d232
3 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/modules/filetransfer/__init__.py
View File

@ -425,30 +425,49 @@ class FileTransferModule(_ModuleBase):
try: try:
# 识别文件元数据，不包含后缀 # 识别文件元数据，不包含后缀
file_meta = MetaInfo(transfer_file.stem) file_meta = MetaInfo(transfer_file.stem)
# 组合目录和文件的Meta信息
meta.type = file_meta.type
# 开始季 # 开始季
if file_meta.begin_season: if not file_meta.begin_season:
meta.begin_season = file_meta.begin_season file_meta.begin_season = meta.begin_season
# 开始集
if file_meta.begin_episode:
meta.begin_episode = file_meta.begin_episode
# 结束集
if file_meta.end_episode:
meta.end_episode = file_meta.end_episode
# 总季数
if file_meta.total_seasons:
meta.total_seasons = file_meta.total_seasons
# 总集数
if file_meta.total_episode:
meta.total_episode = file_meta.total_episode
# 结束季为空 # 结束季为空
meta.end_season = None file_meta.end_season = None
# 总季数
if file_meta.begin_season:
file_meta.total_seasons = 1
# 开始集
if not file_meta.begin_episode:
file_meta.begin_episode = meta.begin_episode
# 结束集
if not file_meta.end_episode:
file_meta.end_episode = meta.end_episode
# 总集数
if not file_meta.total_episode:
file_meta.total_episode = meta.total_episode
# 版本
if not file_meta.resource_type:
file_meta.resource_type = meta.resource_type
# 分辨率
if not file_meta.resource_pix:
file_meta.resource_pix = meta.resource_pix
# 制作组/字幕组
if not file_meta.resource_team:
file_meta.resource_team = meta.resource_team
# 特效
if not file_meta.resource_effect:
file_meta.resource_effect = meta.resource_effect
# 视频编码
if not file_meta.video_encode:
file_meta.video_encode = meta.video_encode
# 音频编码
if not file_meta.audio_encode:
file_meta.audio_encode = meta.audio_encode
# Part
if not file_meta.part:
file_meta.part = meta.part
# 目的文件名 # 目的文件名
new_file = self.get_rename_path( new_file = self.get_rename_path(
path=target_dir, path=target_dir,
template_string=rename_format, template_string=rename_format,
rename_dict=self.__get_naming_dict(meta=meta, rename_dict=self.__get_naming_dict(meta=file_meta,
mediainfo=mediainfo, mediainfo=mediainfo,
file_ext=transfer_file.suffix) file_ext=transfer_file.suffix)
) )

6
app/modules/qbittorrent/qbittorrent.py
View File

@ -317,10 +317,8 @@ class Qbittorrent(metaclass=Singleton):
download_limit = download_limit * 1024 download_limit = download_limit * 1024
upload_limit = upload_limit * 1024 upload_limit = upload_limit * 1024
try: try:
if self.qbc.transfer.upload_limit != upload_limit: self.qbc.transfer.upload_limit = int(upload_limit)
self.qbc.transfer.upload_limit = upload_limit self.qbc.transfer.download_limit = int(download_limit)
if self.qbc.transfer.download_limit != download_limit:
self.qbc.transfer.download_limit = download_limit
except Exception as err: except Exception as err:
logger.error(f"设置速度限制出错：{err}") logger.error(f"设置速度限制出错：{err}")
return False return False

11
app/modules/transmission/transmission.py
View File

@ -247,16 +247,9 @@ class Transmission(metaclass=Singleton):
session = self.trc.get_session() session = self.trc.get_session()
download_limit_enabled = True if download_limit else False download_limit_enabled = True if download_limit else False
upload_limit_enabled = True if upload_limit else False upload_limit_enabled = True if upload_limit else False
if download_limit_enabled == session.speed_limit_down_enabled and \
upload_limit_enabled == session.speed_limit_up_enabled and \
download_limit == session.speed_limit_down and \
upload_limit == session.speed_limit_up:
return
self.trc.set_session( self.trc.set_session(
speed_limit_down=download_limit if download_limit != session.speed_limit_down speed_limit_down=int(download_limit),
else session.speed_limit_down, speed_limit_up=int(upload_limit),
speed_limit_up=upload_limit if upload_limit != session.speed_limit_up
else session.speed_limit_up,
speed_limit_down_enabled=download_limit_enabled, speed_limit_down_enabled=download_limit_enabled,
speed_limit_up_enabled=upload_limit_enabled speed_limit_up_enabled=upload_limit_enabled
) )