Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/app-lib/src/api/jre.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
let path = path.join(dir);

if path.exists() {
io::remove_dir_all(path).await?;
io::remove_dir_all(&path).await?;
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/app-lib/src/api/worlds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ pub async fn delete_world(instance: &Path, world: &str) -> Result<()> {
while let Some(entry) = dir.next_entry().await? {
let path = entry.path();
if entry.file_type().await?.is_dir() {
io::remove_dir_all(path).await?;
io::remove_dir_all(&path).await?;
continue;
}
if path != lock_path {
Expand Down
89 changes: 83 additions & 6 deletions packages/app-lib/src/util/io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use eyre::{Context, ContextCompat, Result, eyre};
use std::{
fs::Metadata,
io::{ErrorKind, Write},
path::Path,
};
Expand Down Expand Up @@ -55,6 +56,35 @@
})
}

pub async fn read_symlink_metadata(
path: impl AsRef<std::path::Path>,
) -> Result<std::fs::Metadata, IOError> {
let path = path.as_ref();

tokio::fs::symlink_metadata(path)
.await
.map_err(|e| IOError::IOPathError {
source: e,
path: path.to_string_lossy().to_string(),
})
}

pub fn check_is_symlink(metadata: &Metadata) -> bool {
#[cfg(windows)]
{
use std::os::windows::fs::MetadataExt;

const FILE_ATTRIBUTE_REPARSE_POINT: u32 = 0x0400;

metadata.file_attributes() & FILE_ATTRIBUTE_REPARSE_POINT != 0
}

#[cfg(not(windows))]
{
metadata.file_type().is_symlink()
}
}

pub async fn read_dir(
path: impl AsRef<std::path::Path>,
) -> Result<tokio::fs::ReadDir, IOError> {
Expand Down Expand Up @@ -88,19 +118,66 @@
.map_err(|e| IOError::IOPathError {
source: e,
path: path.to_string_lossy().to_string(),
})

Check warning on line 121 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

Diff in /home/runner/work/code/code/packages/app-lib/src/util/io.rs
}


pub async fn remove_dir_all(
path: impl AsRef<std::path::Path>,
) -> Result<(), IOError> {
let path = path.as_ref();
tokio::fs::remove_dir_all(path)
remove_dir_all_inner(path.as_ref()).await
}

async fn remove_link(
path: &std::path::Path,
_metadata: &std::fs::Metadata,
) -> Result<(), IOError> {
remove_file(path).await
}

Check warning on line 136 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

Diff in /home/runner/work/code/code/packages/app-lib/src/util/io.rs

#[async_recursion::async_recursion]
async fn remove_dir_all_inner(
path: &std::path::Path,
) -> Result<(), IOError> {
let metadata = read_symlink_metadata(path)
.await
.map_err(|e| IOError::IOPathError {
source: e,
path: path.to_string_lossy().to_string(),
})
.wrap_err_with(|| eyre!("reading metadata for {path:?}"))?;

Check failure on line 144 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

Check failure on line 144 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

if check_is_symlink(&metadata) {
return remove_link(path, &metadata).await;
}

let mut dir = read_dir(path)
.await
.wrap_err_with(|| eyre!("reading directory {path:?}"))?;

Check failure on line 152 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

Check failure on line 152 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

while let Some(entry) = dir
.next_entry()
.await
.wrap_err_with(|| eyre!("reading directory entry in {path:?}"))?

Check failure on line 157 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

Check failure on line 157 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`
{
let entry_path = entry.path();

let entry_metadata = read_symlink_metadata(&entry_path)
.await
.wrap_err_with(|| eyre!("reading metadata for {entry_path:?}"))?;

Check failure on line 163 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

Check failure on line 163 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

if check_is_symlink(&entry_metadata) {
remove_link(&entry_path, &entry_metadata).await?;
} else if entry_metadata.is_dir() {
remove_dir_all_inner(&entry_path).await?;
} else {
remove_file(&entry_path)
.await
.wrap_err_with(|| eyre!("removing file {entry_path:?}"))?;

Check failure on line 172 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`
}
}

remove_dir(path)
.await
.wrap_err_with(|| eyre!("removing directory {path:?}"))?;

Check failure on line 178 in packages/app-lib/src/util/io.rs

View workflow job for this annotation

GitHub Actions / Lint and Test

`?` couldn't convert the error to `util::io::IOError`

Ok(())
}

/// Reads a text file to a string, automatically detecting its encoding and
Expand Down
Loading