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

Refactor safe_rename to use crossesDevices and added comments

Browse source
This commit is contained in:
Amanda Sternberg 2025-09-15 12:33:17 +02:00
parent 77ccd69ada
commit 012bae12b5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -320,10 +320,12 @@ pub(crate) fn mtime_as_i64<P: AsRef<Path>>(path: P) -> io::Result<i64> {
.as_millis() as i64) .as_millis() as i64)
} }
/// On POSIX this is EXDEV (error 18) and on Windows it is ERROR_NOT_SAME_DEVICE
/// (error 17).
pub(crate) fn safe_rename(src: &Path, dst: &Path) -> io::Result<()> { pub(crate) fn safe_rename(src: &Path, dst: &Path) -> io::Result<()> {
match fs::rename(src, dst) { match fs::rename(src, dst) {
Ok(_) => Ok(()), Ok(_) => Ok(()),
Err(e) if e.raw_os_error() == Some(18) => { Err(e) if e.kind() == io::ErrorKind::CrossesDevices => {
fs::copy(src, dst)?; fs::copy(src, dst)?;
fs::remove_file(src)?; fs::remove_file(src)?;
Ok(()) Ok(())
@ -566,6 +568,8 @@ mod test {
} }
#[test] #[test]
fn safe_rename_moves_file() { fn safe_rename_moves_file() {
// This test only verifies that ´safe_rename´calls back to copy+remove logic
// when needed. It does not simulate a real cross-device move.
let dir = tempdir().unwrap(); let dir = tempdir().unwrap();
let src = dir.path().join("test_src.txt"); let src = dir.path().join("test_src.txt");
let dst = dir.path().join("test_dst.txt"); let dst = dir.path().join("test_dst.txt");