crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-22 00:05:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't extract local sources

Browse Source
This commit is contained in:
henderkes
2026-05-15 14:30:58 +07:00
parent 70e717adb6
commit 1707d21569
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/StaticPHP/Artifact/Artifact.php
View File

@@ -285,15 +285,19 @@ class Artifact
* Get source extraction directory. * Get source extraction directory.
* *
* Rules: * Rules:
* 1. If extract is not specified: SOURCE_PATH/{artifact_name} * 1. If cache_type is 'local': use the absolute dirname recorded at download time (no symlink/copy).
* 2. If extract is relative path: SOURCE_PATH/{value} * 2. If extract is not specified: SOURCE_PATH/{artifact_name}
* 3. If extract is absolute path: {value} * 3. If extract is relative path: SOURCE_PATH/{value}
* 4. If extract is array (dict): handled by extractor (selective extraction) * 4. If extract is absolute path: {value}
* 5. If extract is array (dict): handled by extractor (selective extraction)
*/ */
public function getSourceDir(): string public function getSourceDir(): string
{ {
// Prefer cache extract path, fall back to config // Prefer cache extract path, fall back to config
$cache_info = ApplicationContext::get(ArtifactCache::class)->getSourceInfo($this->name); $cache_info = ApplicationContext::get(ArtifactCache::class)->getSourceInfo($this->name);
if (($cache_info['cache_type'] ?? null) === 'local' && isset($cache_info['dirname'])) {
return FileSystem::convertPath($cache_info['dirname']);
}
$extract = is_string($cache_info['extract'] ?? null) $extract = is_string($cache_info['extract'] ?? null)
? $cache_info['extract'] ? $cache_info['extract']
: ($this->config['source']['extract'] ?? null); : ($this->config['source']['extract'] ?? null);

14
src/StaticPHP/Artifact/ArtifactExtractor.php
View File

@@ -136,6 +136,12 @@ class ArtifactExtractor
throw new WrongUsageException("Artifact source [{$name}] not downloaded, please download it first!"); throw new WrongUsageException("Artifact source [{$name}] not downloaded, please download it first!");
} }
// Local (--custom-local): source lives in place at $cache_info['dirname'].
if (($cache_info['cache_type'] ?? null) === 'local') {
$artifact->emitAfterSourceExtract($artifact->getSourceDir());
return SPC_STATUS_ALREADY_EXTRACTED;
}
$source_file = $this->cache->getCacheFullPath($cache_info); $source_file = $this->cache->getCacheFullPath($cache_info);
$target_path = $artifact->getSourceDir(); $target_path = $artifact->getSourceDir();
@@ -171,8 +177,12 @@ class ArtifactExtractor
return SPC_STATUS_ALREADY_EXTRACTED; return SPC_STATUS_ALREADY_EXTRACTED;
} }
// Remove old directory if hash mismatch // Remove old directory if hash mismatch.
if (is_dir($target_path)) { // Guard: a symlink at $target_path (left over from older local-source handling) must be
// unlinked directly — never recurse into the link target, that would wipe the user's tree.
if (is_link($target_path)) {
@unlink($target_path);
} elseif (is_dir($target_path)) {
logger()->notice("Source [{$name}] hash mismatch, re-extracting..."); logger()->notice("Source [{$name}] hash mismatch, re-extracting...");
FileSystem::removeDir($target_path); FileSystem::removeDir($target_path);
} }