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

Merge pull request #37 from thsrite/main

Browse Source
This commit is contained in:
jxxghp 2023-08-07 12:04:12 +08:00 committed by GitHub
commit 08881c40e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/plugins/cloudflarespeedtest/__init__.py
View File

@ -134,10 +134,9 @@ class CloudflareSpeedTest(_PluginBase):
hosts = customHosts.get("hosts") hosts = customHosts.get("hosts")
if isinstance(hosts, str): if isinstance(hosts, str):
hosts = str(hosts).split('\n') hosts = str(hosts).split('\n')
# 校正优选ip # 校正优选ip
if self._check: if self._check:
self.__check_cf_if(hosts=hosts) self.__check_cf_ip(hosts=hosts)
# 开始优选 # 开始优选
if err_flag: if err_flag:
@ -205,7 +204,7 @@ class CloudflareSpeedTest(_PluginBase):
self.__update_config() self.__update_config()
self.stop_service() self.stop_service()
def __check_cf_if(self, hosts): def __check_cf_ip(self, hosts):
""" """
校正cf优选ip 校正cf优选ip
防止特殊情况下cf优选ip和自定义hosts插件中ip不一致 防止特殊情况下cf优选ip和自定义hosts插件中ip不一致
@ -213,6 +212,7 @@ class CloudflareSpeedTest(_PluginBase):
# 统计每个IP地址出现的次数 # 统计每个IP地址出现的次数
ip_count = {} ip_count = {}
for host in hosts: for host in hosts:
if host:
ip = host.split()[0] ip = host.split()[0]
if ip in ip_count: if ip in ip_count:
ip_count[ip] += 1 ip_count[ip] += 1

2
app/plugins/mediasyncdel/__init__.py
View File

@ -558,7 +558,7 @@ class MediaSyncDel(_PluginBase):
for match in matches: for match in matches:
mtime = match[0] mtime = match[0]
# 排除已处理的媒体信息 # 排除已处理的媒体信息
if last_time and time < last_time: if last_time and mtime < last_time:
continue continue
mtype = match[1] mtype = match[1]