Skip to content

Commit

Permalink
美化 mpv pot 标题,改善版本筛选
Browse files Browse the repository at this point in the history
  • Loading branch information
kjtsune committed Dec 11, 2023
1 parent a1db326 commit 9ee9a8e
Show file tree
Hide file tree
Showing 6 changed files with 393 additions and 252 deletions.
9 changes: 6 additions & 3 deletions embyToLocalPlayer.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def start_play(data):
start_sec = data['start_sec']
sub_file = data['sub_file']
media_title = data['media_title']
mount_disk_mode = data['mount_disk_mode']
eps_data_thread = ThreadWithReturnValue(target=list_episodes, args=(data,))
eps_data_thread.start()

Expand All @@ -94,9 +95,10 @@ def start_play(data):
player_name = player_name[0]
if configs.check_str_match(_str=data['netloc'], section='playlist', option='enable_host') \
and player_name in ('mpv', 'vlc', 'mpc', 'potplayer', 'iina') \
or (player_name == 'dandanplay' and not media_title):
or (player_name == 'dandanplay' and mount_disk_mode):
player_manager = PlayerManager(data=data, player_name=player_name, player_path=player_path)
player_manager.start_player(cmd=cmd, start_sec=start_sec, sub_file=sub_file, media_title=media_title)
player_manager.start_player(cmd=cmd, start_sec=start_sec, sub_file=sub_file, media_title=media_title,
mount_disk_mode=mount_disk_mode)
eps_data = eps_data_thread.join()
player_manager.playlist_add(eps_data=eps_data)
player_manager.update_playlist_time_loop()
Expand All @@ -105,7 +107,8 @@ def start_play(data):
return

player_function = player_start_func_dict[player_name]
stop_sec_kwargs = player_function(cmd=cmd, start_sec=start_sec, sub_file=sub_file, media_title=media_title)
stop_sec_kwargs = player_function(cmd=cmd, start_sec=start_sec, sub_file=sub_file, media_title=media_title,
mount_disk_mode=mount_disk_mode)
stop_sec = stop_sec_function_dict[player_name](**stop_sec_kwargs)
logger.info('stop_sec', stop_sec)
if stop_sec is None:
Expand Down
25 changes: 13 additions & 12 deletions embyToLocalPlayer_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
### v v # # # # # # # # # 基础配置 # # # # # # # # # # # # v v ###

[exe]
# 各播放器路径,不要的可以随意删除。
# 各播放器路径,不要的可以随意删除。记得选择哪种播放器是在下一项设置里。
mpv = C:\Green\mpv\mpv.exe
mpve = C:\Green\mpvnet\mpvnet.exe
pot = C:\Program Files\DAUM\PotPlayer\PotPlayerMini64.exe
Expand All @@ -17,7 +17,7 @@ linux_vlc = vlc
others = 其他播放器一般也可以,只是不回传记录。

[emby]
# 选择播放器
# 选择播放器,填写上方的播放器名称,比如 pot
player = mpv

# 是否回传进度
Expand Down Expand Up @@ -62,22 +62,23 @@ b = F:\TV
# 需要开启播放列表的域名的关键词,逗号隔开。禁用就留空或删除。
enable_host = localhost, 127.0.0.1, 192.168. , 192-168-, example.com:8096, . ,

# 影响范围:pot 和 vlc(Linux/macOS) 播放含外挂字幕的剧集网络流时。是否采用连播模式。
# 尝试下一集保持播放相同版本,失败会禁用播放列表,可能影响 S0 插入混播。
# 写下不同版本间,文件名之间的差异字段,用|隔开。(实际是正则,不分大小写)
# 示例:720|1080|2160|4k|remux|hevc|265|264|sdr|hdr|dv|vision|baha|cr|global|house|vcb|mkv|mp4|简.|.语|内.|..字幕|....组|..@..
version_filter =

# 条目数量限制,需要大于0,-1 为采用预设值。
item_limit = -1

# pot 和 vlc(Linux/macOS) 播放含外挂字幕的剧集网络流时。下一集无法加载字幕,故禁用播放列表。
# 这种情况下,是否需要按下方策略简易连播。
# 策略:当播放进度超过0.9时关闭播放器,会自动启动播放器播放下一集。
# 若禁用,在影响范围内会禁用播放列表。避免下一集无法加载字幕的情况。
http_sub_auto_next_ep = yes
http_sub_auto_next_ep = no

# 切换下一集时的字幕优先顺序,逗号隔开,仅处理外挂字幕。
# 这些字符串是浏览器里选择字幕时,显示的名称的一部分。
subtitle_priority = Chinese Simplified, Chinese, 中文, ASS, SRT, Und

# 同一集有不同版本时生效,下一集保持播放相同版本。
# 写下不同版本间,文件名之间的差异字段,用|隔开。(实际是正则,不分大小写)
version_filter = 720|1080|2160|4k|remux|hevc|265|264|sdr|hdr|dv|vision|baha|cr|global|house|vcb|mkv|mp4|简.|.语|内.|..字幕|....组|..@..

# 条目数量限制,需要大于0,-1 为采用预设值。
item_limit = -1

##################################################################
### v v # # # # # # # # # 其他设置 # # # # # # # # # # # # # v v ###

Expand Down
Loading

0 comments on commit 9ee9a8e

Please sign in to comment.