aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/json/json_file.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-23 12:43:10 +0900
committernsfisis <nsfisis@gmail.com>2026-08-23 13:24:29 +0900
commit0b48f4a46d24248e4c012ef37d25b5963c27a78c (patch)
treea4c189be4419ded8e2252bc0c250aecfc66b3c36 /crates/shirabe/src/json/json_file.rs
parent890a50de2a740cc4c4edba12b37cc9aa4d0efdc5 (diff)
downloadphp-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.tar.gz
php-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.tar.zst
php-shirabe-0b48f4a46d24248e4c012ef37d25b5963c27a78c.zip
fix(fs): carry file_get_contents results as bytes
file_get_contents() and file_get_contents_with_max_length() return Vec<u8> 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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/json/json_file.rs')
-rw-r--r--crates/shirabe/src/json/json_file.rs14
1 files changed, 10 insertions, 4 deletions
diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs
index c4a06d77..703b9fbb 100644
--- a/crates/shirabe/src/json/json_file.rs
+++ b/crates/shirabe/src/json/json_file.rs
@@ -165,7 +165,11 @@ impl JsonFile {
io_interface::NORMAL,
);
}
- Ok(file_get_contents(&self.path))
+ // TODO(bytes): the JSON text travels as a String, as it does on the
+ // HttpDownloader branch above.
+ Ok(file_get_contents(&self.path)
+ .map(|c| String::from_utf8_lossy(&c).into_owned())
+ .ok())
}
})() {
Ok(j) => j,
@@ -282,10 +286,10 @@ impl JsonFile {
content: &str,
) -> anyhow::Result<Option<i64>> {
// PHP: @file_get_contents($path)
- let current_content = Silencer::call(|| Ok(file_get_contents(path)))
+ let current_content = Silencer::call(|| Ok(file_get_contents(path).ok()))
.ok()
.flatten();
- if current_content.is_none() || current_content.as_deref() != Some(content) {
+ if current_content.is_none() || current_content.as_deref() != Some(content.as_bytes()) {
return Ok(file_put_contents(path, content.as_bytes()));
}
@@ -307,7 +311,9 @@ impl JsonFile {
))
.into());
}
- let content = file_get_contents(&self.path).unwrap_or_default();
+ // TODO(bytes): json_decode_obj and validate_syntax take the JSON as a &str.
+ let content = String::from_utf8_lossy(&file_get_contents(&self.path).unwrap_or_default())
+ .into_owned();
let data = json_decode_obj(&content)?;
if matches!(data, PhpMixed::Null) && content != "null" {