crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix retry for windows

Browse Source
This commit is contained in:
crazywhalecc 2024-03-10 16:35:19 +08:00 committed by Jerry Ma
parent e21b5676e7
commit 8358a985b3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SPC/store/Downloader.php
View File

@ -231,7 +231,7 @@ class Downloader
"--branch \"{$branch}\" " . (defined('GIT_SHALLOW_CLONE') ? '--depth 1 --single-branch' : '') . " --recursive \"{$url}\" \"{$download_path}\"" "--branch \"{$branch}\" " . (defined('GIT_SHALLOW_CLONE') ? '--depth 1 --single-branch' : '') . " --recursive \"{$url}\" \"{$download_path}\""
); );
} catch (RuntimeException $e) { } catch (RuntimeException $e) {
if ($e->getCode() === SIGINT) { if ($e->getCode() === 2 || $e->getCode() === -1073741510) {
throw new WrongUsageException('Keyboard interrupted, download failed !'); throw new WrongUsageException('Keyboard interrupted, download failed !');
} }
if ($retry > 0) { if ($retry > 0) {
@ -491,7 +491,7 @@ class Downloader
return $cache[$cmd]['cache']; return $cache[$cmd]['cache'];
} }
f_exec($cmd, $output, $ret); f_exec($cmd, $output, $ret);
if ($ret === SIGINT) { if ($ret === 2 || $ret === -1073741510) {
throw new RuntimeException('failed http fetch'); throw new RuntimeException('failed http fetch');
} }
if ($ret !== 0) { if ($ret !== 0) {
@ -503,7 +503,7 @@ class Downloader
return $cache[$cmd]['cache']; return $cache[$cmd]['cache'];
} }
f_exec($cmd, $output, $ret); f_exec($cmd, $output, $ret);
if ($ret === SIGINT) { if ($ret === 2 || $ret === -1073741510) {
throw new RuntimeException('failed http fetch'); throw new RuntimeException('failed http fetch');
} }
if ($ret !== 0) { if ($ret !== 0) {
@ -542,7 +542,8 @@ class Downloader
try { try {
f_passthru($cmd); f_passthru($cmd);
} catch (RuntimeException $e) { } catch (RuntimeException $e) {
if ($e->getCode() === SIGINT) { var_dump($e->getCode());
if ($e->getCode() === 2 || $e->getCode() === -1073741510) {
throw new WrongUsageException('Keyboard interrupted, download failed !'); throw new WrongUsageException('Keyboard interrupted, download failed !');
} }
if ($retry > 0) { if ($retry > 0) {
@ -564,7 +565,7 @@ class Downloader
if (PHP_OS_FAMILY === 'Windows') { if (PHP_OS_FAMILY === 'Windows') {
sapi_windows_set_ctrl_handler($callback); sapi_windows_set_ctrl_handler($callback);
} elseif (extension_loaded('pcntl')) { } elseif (extension_loaded('pcntl')) {
pcntl_signal(SIGINT, $callback); pcntl_signal(2, $callback);
} else { } else {
logger()->debug('You have not enabled `pcntl` extension, cannot prevent download file corruption when Ctrl+C'); logger()->debug('You have not enabled `pcntl` extension, cannot prevent download file corruption when Ctrl+C');
} }
@ -578,7 +579,7 @@ class Downloader
if (PHP_OS_FAMILY === 'Windows') { if (PHP_OS_FAMILY === 'Windows') {
sapi_windows_set_ctrl_handler(null); sapi_windows_set_ctrl_handler(null);
} elseif (extension_loaded('pcntl')) { } elseif (extension_loaded('pcntl')) {
pcntl_signal(SIGINT, SIG_IGN); pcntl_signal(2, SIG_IGN);
} }
} }
} }