aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/downloader
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-06 10:37:12 +0900
committernsfisis <nsfisis@gmail.com>2026-08-06 10:37:12 +0900
commitd9dca94603766712b5989ea8169c9e286d27a60c (patch)
treeb8c75845bf2d93771c91c7d7058a0ed041f94edc /crates/shirabe/src/downloader
parent70e463708b461efd61a611061cfee0539d28645a (diff)
downloadphp-shirabe-d9dca94603766712b5989ea8169c9e286d27a60c.tar.gz
php-shirabe-d9dca94603766712b5989ea8169c9e286d27a60c.tar.zst
php-shirabe-d9dca94603766712b5989ea8169c9e286d27a60c.zip
refactor(php-shim): take &str and return String from pathinfo
pathinfo only ever receives a string and only ever returns one for the single-component options it supports, so the PhpMixed wrapping forced every call site to pack and unpack the value again. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/downloader')
-rw-r--r--crates/shirabe/src/downloader/file_downloader.rs18
-rw-r--r--crates/shirabe/src/downloader/gzip_downloader.rs11
2 files changed, 10 insertions, 19 deletions
diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs
index c5dfc5f7..4ee580f8 100644
--- a/crates/shirabe/src/downloader/file_downloader.rs
+++ b/crates/shirabe/src/downloader/file_downloader.rs
@@ -712,20 +712,14 @@ impl FileDownloader {
impl FileDownloader {
fn get_dist_path(&self, package: PackageInterfaceHandle, component: i64) -> String {
pathinfo(
- PhpMixed::String(
- parse_url(
- &strtr(&package.get_dist_url().unwrap_or_default(), "\\", "/"),
- PHP_URL_PATH,
- )
- .as_string()
- .unwrap_or("")
- .to_string(),
- ),
+ parse_url(
+ &strtr(&package.get_dist_url().unwrap_or_default(), "\\", "/"),
+ PHP_URL_PATH,
+ )
+ .as_string()
+ .unwrap_or(""),
component,
)
- .as_string()
- .unwrap_or("")
- .to_string()
}
pub(crate) fn clear_last_cache_write(&self, package: PackageInterfaceHandle) {
diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs
index 70b9f7bb..297cbc11 100644
--- a/crates/shirabe/src/downloader/gzip_downloader.rs
+++ b/crates/shirabe/src/downloader/gzip_downloader.rs
@@ -84,15 +84,12 @@ impl ArchiveDownloader for GzipDownloader {
parse_url(
&strtr(&package.get_dist_url().unwrap_or_default(), "\\", "/"),
PHP_URL_PATH,
- ),
+ )
+ .as_string()
+ .unwrap_or(""),
PATHINFO_FILENAME,
);
- let target_filepath = format!(
- "{}{}{}",
- path,
- DIRECTORY_SEPARATOR,
- filename.as_string().unwrap_or_default()
- );
+ let target_filepath = format!("{}{}{}", path, DIRECTORY_SEPARATOR, filename);
if !Platform::is_windows() {
let command = vec![