diff options
| author | 魏曹先生 <1992414357@qq.com> | 2026-02-25 15:24:18 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2026-02-25 15:24:18 +0800 |
| commit | fcbd18c4b7d90388a9a2b9e28555d2526727958c (patch) | |
| tree | 0de680895d6a162a99356d6e4d733942a339275e /legacy_data/src/data/local/local_sheet.rs | |
| parent | 8b96e8171c4e9d6516fd63d37cbe613bd5927a04 (diff) | |
Replace string_proc with just_fmt as external dependency
Diffstat (limited to 'legacy_data/src/data/local/local_sheet.rs')
| -rw-r--r-- | legacy_data/src/data/local/local_sheet.rs | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/legacy_data/src/data/local/local_sheet.rs b/legacy_data/src/data/local/local_sheet.rs index b9c29f5..eee0866 100644 --- a/legacy_data/src/data/local/local_sheet.rs +++ b/legacy_data/src/data/local/local_sheet.rs @@ -1,8 +1,13 @@ -use std::{collections::HashMap, io::Error, path::PathBuf, time::SystemTime}; +use std::{ + collections::HashMap, + io::{Error, ErrorKind}, + path::PathBuf, + time::SystemTime, +}; use ::serde::{Deserialize, Serialize}; use cfg_file::{ConfigFile, config::ConfigFile}; -use string_proc::format_path::format_path; +use just_fmt::fmt_path::fmt_path; use crate::{ constants::CLIENT_FILE_LOCAL_SHEET_NOSET, @@ -278,7 +283,8 @@ impl LocalSheetData { path: &LocalFilePathBuf, mapping: LocalMappingMetadata, ) -> Result<(), std::io::Error> { - let path = format_path(path)?; + let path = fmt_path(path) + .map_err(|e| std::io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; if self.mapping.contains_key(&path) || self.vfs.contains_key(&mapping.mapping_vfid) { return Err(Error::new( std::io::ErrorKind::AlreadyExists, @@ -297,8 +303,10 @@ impl LocalSheetData { from: &LocalFilePathBuf, to: &LocalFilePathBuf, ) -> Result<(), std::io::Error> { - let from = format_path(from)?; - let to = format_path(to)?; + let from = fmt_path(from) + .map_err(|e| std::io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; + let to = fmt_path(to) + .map_err(|e| std::io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; if self.mapping.contains_key(&to) { return Err(Error::new( std::io::ErrorKind::AlreadyExists, @@ -325,7 +333,8 @@ impl LocalSheetData { &mut self, path: &LocalFilePathBuf, ) -> Result<LocalMappingMetadata, std::io::Error> { - let path = format_path(path)?; + let path = fmt_path(path) + .map_err(|e| std::io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; match self.mapping.remove(&path) { Some(mapping) => { self.vfs.remove(&mapping.mapping_vfid); @@ -343,7 +352,8 @@ impl LocalSheetData { &self, path: &LocalFilePathBuf, ) -> Result<&LocalMappingMetadata, std::io::Error> { - let path = format_path(path)?; + let path = fmt_path(path) + .map_err(|e| std::io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; let Some(data) = self.mapping.get(&path) else { return Err(Error::new( std::io::ErrorKind::NotFound, @@ -358,7 +368,8 @@ impl LocalSheetData { &mut self, path: &LocalFilePathBuf, ) -> Result<&mut LocalMappingMetadata, std::io::Error> { - let path = format_path(path)?; + let path = fmt_path(path) + .map_err(|e| std::io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; let Some(data) = self.mapping.get_mut(&path) else { return Err(Error::new( std::io::ErrorKind::NotFound, |
