From 0b48f4a46d24248e4c012ef37d25b5963c27a78c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 23 Aug 2026 12:43:10 +0900 Subject: fix(fs): carry file_get_contents results as bytes file_get_contents() and file_get_contents_with_max_length() return Vec instead of a from_utf8_lossy'd String. Call sites whose consumer takes a &str still convert lossily and are marked TODO(bytes). file_get_contents_with_max_length() now reads at most the requested number of bytes instead of the whole file. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/downloader/zip_downloader.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/src/downloader') diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs index cdb9307c..c0470162 100644 --- a/crates/shirabe/src/downloader/zip_downloader.rs +++ b/crates/shirabe/src/downloader/zip_downloader.rs @@ -12,7 +12,7 @@ use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ CmpOp, ErrorException, PhpMixed, RuntimeException, UnexpectedValueException, ZipArchive, bin2hex, class_exists, file_exists, file_get_contents, filesize, hash_file, impl_php_class, - is_file, json_encode, php_regex, preg_match, random_int, str_replace, strlen, substr, + is_file, json_encode, php_regex, preg_match, random_int, str_replace, strlen, substr_bytes, version_compare, }; use shirabe_symfony_process::ExecutableFinder; @@ -233,16 +233,19 @@ impl ZipDownloader { )); self.inner.io.borrow().write_error(&format!( "First 100 bytes (hex): {}", - bin2hex( - substr(&file_get_contents(file).unwrap_or_default(), 0, Some(100)) - .as_bytes() - ) + bin2hex(&substr_bytes( + &file_get_contents(file).unwrap_or_default(), + 0, + Some(100) + )) )); self.inner.io.borrow().write_error(&format!( "Last 100 bytes (hex): {}", - bin2hex( - substr(&file_get_contents(file).unwrap_or_default(), -100, None).as_bytes() - ) + bin2hex(&substr_bytes( + &file_get_contents(file).unwrap_or_default(), + -100, + None + )) )); if strlen(&package.get_dist_url().unwrap_or_default()) > 0 { self.inner.io.borrow().write_error(&format!( -- cgit v1.3.1-4-g156e