GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 14:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Reset files.rs and Cargo.toml to main

Browse source
This commit is contained in:
Amanda Sternberg 2025-09-12 10:46:44 +02:00
parent 41df1fc9dd
commit 0acad15c25
1 changed files with 2 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
rslib/src/media/files.rs
View file

@ -3,7 +3,7 @@
use std::borrow::Cow;
use std::fs;
use filetime::FileTimes;
use std::fs::FileTimes;
use std::io;
use std::io::Read;
use std::path::Path;
@ -320,18 +320,6 @@ pub(crate) fn mtime_as_i64<P: AsRef<Path>>(path: P) -> io::Result<i64> {
.as_millis() as i64)
}
pub(crate) fn safe_rename(src: &Path, dst: &Path) -> io::Result<()> {
match fs::rename(src, dst) {
Ok(_) => Ok(()),
Err(e) if e.raw_os_error() == Some(18) => {
fs::copy(src, dst)?;
fs::remove_file(src)?;
Ok(())
}
Err(e) => Err(e),
}
}
pub fn remove_files<S>(media_folder: &Path, files: &[S]) -> Result<()>
where
S: AsRef<str> + std::fmt::Debug,
@ -356,7 +344,7 @@ where
}
// move file to trash, clobbering any existing file with the same name
safe_rename(&src_path, &dst_path)?;
fs::rename(&src_path, &dst_path)?;
// mark it as modified, so we can expire it in the future
let secs = time::SystemTime::now();
@ -562,21 +550,4 @@ mod test {
Cow::<str>::Owned(format!("{}_", " ".repeat(MAX_MEDIA_FILENAME_LENGTH - 2)))
);
}
#[test]
fn safe_rename_moves_file() {
let dir = tempdir().unwrap();
let src = dir.path().join("myfile.txt");
let dst = dir.path().join("myfile_trashed.txt");
fs::write(&src, b"My test content").unwrap();
safe_rename(&src, &dst).unwrap();
assert!(dst.exists());
assert!(!src.exists());
let contents = fs::read(&dst).unwrap();
assert_eq!(contents, b"My test content");
fs::remove_file(&dst).unwrap();
}
}