fix(修复github错误仓储地址导致最后tar包只有10k的bug)
This commit is contained in:
@@ -42,7 +42,7 @@ $task_worker->onMessage = function ($connection, $task_data) use ($webDir,$datat
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!preg_match("/^((https|http):\/\/)?([\w\.\/\-\_^]+?)\.(tar\.gz|gz|tar\.bz2|bz2|tar|zip|tar\.xz|tar\.z|rpm|deb|rar)$/iu",$dataArr['url'],$ext) && !preg_match("/^https:\/\/github.com\/([\w\/\-\.\_]+)$/iu", $dataArr['url'])
|
||||
if (!preg_match("/^((https|http):\/\/)?([\w\.\/\-\_^]+?)\.(tar\.gz|gz|tar\.bz2|exe|apk|bz2|tar|zip|tar\.xz|tar\.z|rpm|deb|rar)$/iu",$dataArr['url'],$ext) && !preg_match("/^https:\/\/github.com\/([\w\/\-\.\_]+)$/iu", $dataArr['url'])
|
||||
) {
|
||||
$connection->send(json_encode(["status" => 1, "msg" => "请输入正确的github地址:仅支持https协议 或<br> (gz|tar.gz|bz2|tar|tar.bz2|zip|tar.xz|tar.z|rpm|deb|rar)格式的压缩包下载链接"]) . "\r\n");
|
||||
$connection->send("true");
|
||||
@@ -72,6 +72,15 @@ $task_worker->onMessage = function ($connection, $task_data) use ($webDir,$datat
|
||||
]
|
||||
], JSON_UNESCAPED_UNICODE) . "\r\n");
|
||||
if (!is_file($webDir . "/{$git_dir_path}.tar")) {
|
||||
if(!is_dir($webDir."/".$git_dir_path)){
|
||||
$connection->send(json_encode([
|
||||
'status' => 1,
|
||||
'msg' => "您输入的链接可能是不支持的后缀,如果是git仓储,请确认链接正确",
|
||||
'data' => []
|
||||
], JSON_UNESCAPED_UNICODE) . "\r\n");
|
||||
$connection->send("true");
|
||||
return;
|
||||
}
|
||||
system('cd ' . $webDir . ";tar -cvf {$git_dir_path}.tar {$git_dir_path} ");
|
||||
system("rm -rf " . $webDir . "/" . $git_dir_path);
|
||||
}
|
||||
|
||||
@@ -36,6 +36,6 @@
|
||||
<div class="copy-right">
|
||||
<p>Copyright © 2019-<script>document.write((new Date).getFullYear())</script> <a href="http://www.widora.cn/" title="widora" class="widora" target="_blank">歪朵拉</a> | Designed by xiaoxin | <a href="https://github.com/xiaoxinda/github-proxy" title="source" class="widora" target="_blank">获取source</a> | <a href="javascript;" title="copyright" class="widora exemption">免责声明</a> | 更新日志 </p>
|
||||
</div>
|
||||
<script src="/js/index.js" type="application/javascript"></script>
|
||||
<script src="/js/index.js?v2.0" type="application/javascript"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -47,6 +47,7 @@ var webSocketClick = {
|
||||
var data = JSON.parse(event.data)
|
||||
if (data.status == 1) {
|
||||
layer.msg(data.msg);
|
||||
setTimeout(function(){window.location.reload();},3000)
|
||||
return false;
|
||||
}
|
||||
switch (data.data.sta) {
|
||||
@@ -95,7 +96,7 @@ var webSocketClick = {
|
||||
var __this = this;
|
||||
var githubUrl = __this.app_block.find(".text");
|
||||
var githubUrlReg = new RegExp('^https:\\/\\/github.com\\/([\\w\\/\\d\\-\\_\\.]+)$','ig');
|
||||
var githubUrlReg1 = new RegExp('^((https|http):\\/\\/)?([\\w\\.\\/\\-\\_^]+?)\\.([tar\\.gz|gz|tar\\.bz2|bz2|tar|zip|tar\\.xz|tar\\.z|rpm|deb|rar]+?)$','ig');
|
||||
var githubUrlReg1 = new RegExp('^((https|http):\\/\\/)?([\\w\\.\\/\\-\\_^]+?)\\.([tar\\.gz|gz|tar\\.bz2|bz2|tar|zip|tar\\.xz|tar\\.z|rpm|deb|rar|apk|exe]+?)$','ig');
|
||||
if(!githubUrl.val()){
|
||||
layer.msg("请输入github地址");
|
||||
githubUrl.select();
|
||||
|
||||
Reference in New Issue
Block a user