* fix: files.vue bugs before styling changes * feat: move files tab to shared layout structure * fix: qa * fix: qa * fix: bugs * fix: lint * fix: admonition cleanup with progress + actions * fix: cleanup * fix: modals * fix: admon title * fix: i18n standard * fix: lint + i18n pass * fix: remove transition * fix: type errors * feat: files tab in app * fix: qa * fix: backup item minmax * fix: use ContentPageHeader for server panel * fix: lint * fix: lint * fix: lint * feat: page leave safety * fix: lint * fix: cargo fmt fix * fix: blank in prod * fix: content card table stuff * Revert "fix: blank in prod" This reverts commit 74758fe185cf85a4a20355857f889cb091b97ace. * fix: import * feat: browse worlds/servers flow * fix: worlds tab parity with content tab * fix: perf bug + shader filter pill copy * feat: singleplayer filter * fix: ordering * fix: breadcrumbs * fix: lint * fix: qa * feat: store server proj id when adding to a non-linked instance * fix: lint * fix: i18n + qa * fix: conflict * qa: already installed modal + placeholders not server-specific * fix: qa * fix: add + edit server modals * fix: qa * fix: security * fix: devin flags * fix: lint * chore: change file to break build cache * fix: admon * fix: import path stuff * feat: qa * fix: fmt fmt idiot --------- Signed-off-by: Calum H. <calum@modrinth.com>
165 lines
4.9 KiB
Rust
165 lines
4.9 KiB
Rust
use crate::api::Result;
|
|
use async_zip::base::read::seek::ZipFileReader;
|
|
use serde::Serialize;
|
|
use std::io::Cursor;
|
|
use tauri::Runtime;
|
|
use tauri_plugin_dialog::DialogExt;
|
|
use theseus::profile::get_full_path;
|
|
|
|
pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
|
|
tauri::plugin::Builder::new("files")
|
|
.invoke_handler(tauri::generate_handler![
|
|
file_extract_zip,
|
|
file_save_as,
|
|
])
|
|
.build()
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
pub struct ExtractDryRunResult {
|
|
modpack_name: Option<String>,
|
|
conflicting_files: Vec<String>,
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn file_extract_zip(
|
|
instance_path: &str,
|
|
file_path: &str,
|
|
override_conflicts: bool,
|
|
dry_run: bool,
|
|
) -> Result<Option<ExtractDryRunResult>> {
|
|
let base = get_full_path(instance_path).await?;
|
|
let zip_path = base.join(file_path);
|
|
let canonical_zip = tokio::fs::canonicalize(&zip_path).await?;
|
|
let canonical_base = tokio::fs::canonicalize(&base).await?;
|
|
if !canonical_zip.starts_with(&canonical_base) {
|
|
return Err(theseus::Error::from(theseus::ErrorKind::OtherError(
|
|
"file_path escapes the instance directory".to_string(),
|
|
))
|
|
.into());
|
|
}
|
|
let extract_dir = zip_path
|
|
.parent()
|
|
.map(|p| p.to_path_buf())
|
|
.unwrap_or_else(|| base.clone());
|
|
|
|
let file_bytes = tokio::fs::read(&zip_path).await?;
|
|
let reader = Cursor::new(file_bytes);
|
|
|
|
let zip_reader = ZipFileReader::with_tokio(reader).await.map_err(|e| {
|
|
theseus::Error::from(theseus::ErrorKind::OtherError(format!(
|
|
"Failed to read zip file: {e}"
|
|
)))
|
|
})?;
|
|
|
|
let entries: Vec<(usize, String)> = zip_reader
|
|
.file()
|
|
.entries()
|
|
.iter()
|
|
.enumerate()
|
|
.filter_map(|(i, entry)| {
|
|
let name = entry.filename().as_str().ok()?.to_string();
|
|
if name.ends_with('/') {
|
|
None
|
|
} else {
|
|
Some((i, name))
|
|
}
|
|
})
|
|
.collect();
|
|
|
|
if dry_run {
|
|
let mut conflicting_files = Vec::new();
|
|
let canonical_extract = tokio::fs::canonicalize(&extract_dir).await?;
|
|
for (_, name) in &entries {
|
|
let target = extract_dir.join(name);
|
|
if let Some(parent) = target.parent() {
|
|
let normalized = parent
|
|
.canonicalize()
|
|
.unwrap_or_else(|_| extract_dir.join(parent));
|
|
if !normalized.starts_with(&canonical_extract) {
|
|
continue;
|
|
}
|
|
}
|
|
if target.exists() {
|
|
conflicting_files.push(name.clone());
|
|
}
|
|
}
|
|
return Ok(Some(ExtractDryRunResult {
|
|
modpack_name: None,
|
|
conflicting_files,
|
|
}));
|
|
}
|
|
|
|
let canonical_extract_dir = tokio::fs::canonicalize(&extract_dir).await?;
|
|
let mut zip_reader = zip_reader;
|
|
for (index, name) in &entries {
|
|
let target = extract_dir.join(name);
|
|
|
|
if !override_conflicts && target.exists() {
|
|
continue;
|
|
}
|
|
|
|
if let Some(parent) = target.parent() {
|
|
tokio::fs::create_dir_all(parent).await?;
|
|
let canonical_parent = tokio::fs::canonicalize(parent).await?;
|
|
if !canonical_parent.starts_with(&canonical_extract_dir) {
|
|
continue;
|
|
}
|
|
}
|
|
|
|
let mut file_bytes = Vec::new();
|
|
let mut entry_reader =
|
|
zip_reader.reader_with_entry(*index).await.map_err(|e| {
|
|
theseus::Error::from(theseus::ErrorKind::OtherError(format!(
|
|
"Failed to read zip entry: {e}"
|
|
)))
|
|
})?;
|
|
entry_reader
|
|
.read_to_end_checked(&mut file_bytes)
|
|
.await
|
|
.map_err(|e| {
|
|
theseus::Error::from(theseus::ErrorKind::OtherError(format!(
|
|
"Failed to extract zip entry: {e}"
|
|
)))
|
|
})?;
|
|
|
|
tokio::fs::write(&target, &file_bytes).await?;
|
|
}
|
|
|
|
Ok(None)
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn file_save_as<R: Runtime>(
|
|
app: tauri::AppHandle<R>,
|
|
instance_path: &str,
|
|
file_path: &str,
|
|
) -> Result<()> {
|
|
let base = get_full_path(instance_path).await?;
|
|
let source = base.join(file_path);
|
|
let file_name = source
|
|
.file_name()
|
|
.unwrap_or_default()
|
|
.to_string_lossy()
|
|
.to_string();
|
|
|
|
let (tx, rx) = tokio::sync::oneshot::channel();
|
|
app.dialog()
|
|
.file()
|
|
.set_file_name(&file_name)
|
|
.save_file(|path| {
|
|
let _ = tx.send(path);
|
|
});
|
|
|
|
if let Some(dest) = rx.await.unwrap_or(None) {
|
|
let dest_path = std::path::PathBuf::try_from(dest).map_err(|e| {
|
|
theseus::Error::from(theseus::ErrorKind::OtherError(format!(
|
|
"Invalid save path: {e}"
|
|
)))
|
|
})?;
|
|
tokio::fs::copy(&source, &dest_path).await?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|