fix:优化转移做种时过滤器、选择器提示顺序。

master
iyuu.cn 5 years ago
parent 0e32e625a4
commit 8a051d4d1f
  1. 15
      app/AutoReseed.php

@ -579,14 +579,13 @@ class AutoReseed
continue; continue;
} }
// 循环转移做种客户端 // 循环转移做种客户端
foreach ($infohash_Dir as $info_hash => $downloadDir) { foreach ($infohash_Dir as $info_hash => $downloadDir) {
// 做种实际路径与相对路径之间互转
echo '转换前:'.$downloadDir.PHP_EOL;
// 调用路径过滤 // 调用路径过滤
if (self::pathFilter($downloadDir)) { if (self::pathFilter($downloadDir)) {
echo $downloadDir;
continue; continue;
} }
// 做种实际路径与相对路径之间互转
echo '转换前:'.$downloadDir.PHP_EOL;
// 调用路径转换 // 调用路径转换
$downloadDir = self::pathReplace($downloadDir); $downloadDir = self::pathReplace($downloadDir);
echo '转换后:'.$downloadDir.PHP_EOL; echo '转换后:'.$downloadDir.PHP_EOL;
@ -737,7 +736,7 @@ class AutoReseed
return false; return false;
} }
} }
echo '已跳过转移选择器未匹配到:'.$path.PHP_EOL; echo '已跳过转移选择器未匹配到:'.$path.PHP_EOL;
return true; return true;
} }
} }
@ -746,7 +745,7 @@ class AutoReseed
if (\is_array($path_filter)) { if (\is_array($path_filter)) {
foreach ($path_filter as $pathName) { foreach ($path_filter as $pathName) {
if (strpos($path, $pathName)===0) { // 没用$path == $key判断,是为了提高兼容性 if (strpos($path, $pathName)===0) { // 没用$path == $key判断,是为了提高兼容性
echo '已跳过转移过滤器匹配到:'.$path.PHP_EOL; echo '已跳过转移过滤器匹配到:'.$path.PHP_EOL;
return true; return true;
} }
} }
@ -758,7 +757,7 @@ class AutoReseed
//先过滤器 //先过滤器
foreach ($path_filter as $pathName) { foreach ($path_filter as $pathName) {
if (strpos($path, $pathName)===0) { if (strpos($path, $pathName)===0) {
echo '已跳过转移过滤器匹配到:'.$path.PHP_EOL; echo '已跳过转移过滤器匹配到:'.$path.PHP_EOL;
return true; return true;
} }
} }
@ -768,7 +767,7 @@ class AutoReseed
return false; return false;
} }
} }
echo '已跳过转移选择器未匹配到:'.$path.PHP_EOL; echo '已跳过转移选择器未匹配到:'.$path.PHP_EOL;
return true; return true;
} }
} }

Loading…
Cancel
Save