This commit is contained in:
1 parent
ead5d96b78
commit
5efbe048eb
8 files changed
+18
-17
No files matched your search
@@ -4,10 +4,10 @@ use chrono::NaiveDate;
|
|||||||
use dashmap::DashMap;
|
use dashmap::DashMap;
|
||||||
use path_util::SafeRelativeUtf8UnixPathBuf;
|
use path_util::SafeRelativeUtf8UnixPathBuf;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use tauri::Manager;
|
|
||||||
use tauri_plugin_opener::OpenerExt;
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
use tauri::Manager;
|
||||||
|
use tauri_plugin_opener::OpenerExt;
|
||||||
use theseus::data::{
|
use theseus::data::{
|
||||||
AppliedContentSetPatch, ContentItem, Dependency,
|
AppliedContentSetPatch, ContentItem, Dependency,
|
||||||
EditInstance as CoreEditInstance, InstanceInstallCandidate,
|
EditInstance as CoreEditInstance, InstanceInstallCandidate,
|
||||||
@@ -1673,4 +1673,4 @@ pub async fn instance_open_screenshot<R: tauri::Runtime>(
|
|||||||
.reveal_item_in_dir(path)
|
.reveal_item_in_dir(path)
|
||||||
.map_err(|e| std::io::Error::other(e.to_string()))?;
|
.map_err(|e| std::io::Error::other(e.to_string()))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -72,13 +72,6 @@ pub use self::run::{
|
|||||||
GcLaunchIntent, GcLaunchReport, QuickPlayType, kill, run,
|
GcLaunchIntent, GcLaunchReport, QuickPlayType, kill, run,
|
||||||
run_with_extra_launch_args, run_with_extra_launch_args_with_gc,
|
run_with_extra_launch_args, run_with_extra_launch_args_with_gc,
|
||||||
};
|
};
|
||||||
pub use self::upgrade::{
|
|
||||||
dismiss_instance_post_upgrade_notice, execute_instance_upgrade,
|
|
||||||
get_instance_post_upgrade_notice, get_instance_upgrade_plan,
|
|
||||||
plan_instance_upgrade, reset_instance_upgrade_resolution,
|
|
||||||
resolve_custom_instance_upgrade_solution, select_instance_upgrade_solution,
|
|
||||||
update_instance_upgrade_resolution, update_instance_upgrade_resolutions,
|
|
||||||
};
|
|
||||||
pub use self::screenshot_groups::{
|
pub use self::screenshot_groups::{
|
||||||
ScreenshotGroup, ScreenshotGroupImport, ScreenshotGroupMembershipUpdate,
|
ScreenshotGroup, ScreenshotGroupImport, ScreenshotGroupMembershipUpdate,
|
||||||
create_screenshot_group, delete_screenshot_group, import_screenshot_groups,
|
create_screenshot_group, delete_screenshot_group, import_screenshot_groups,
|
||||||
@@ -92,4 +85,11 @@ pub use self::screenshots::{
|
|||||||
list_all_screenshots, list_screenshots, list_synced_screenshots,
|
list_all_screenshots, list_screenshots, list_synced_screenshots,
|
||||||
move_screenshots, save_edited_screenshot,
|
move_screenshots, save_edited_screenshot,
|
||||||
};
|
};
|
||||||
|
pub use self::upgrade::{
|
||||||
|
dismiss_instance_post_upgrade_notice, execute_instance_upgrade,
|
||||||
|
get_instance_post_upgrade_notice, get_instance_upgrade_plan,
|
||||||
|
plan_instance_upgrade, reset_instance_upgrade_resolution,
|
||||||
|
resolve_custom_instance_upgrade_solution, select_instance_upgrade_solution,
|
||||||
|
update_instance_upgrade_resolution, update_instance_upgrade_resolutions,
|
||||||
|
};
|
||||||
pub use crate::state::{DailyPlaytime, DailyPlaytimeEntry};
|
pub use crate::state::{DailyPlaytime, DailyPlaytimeEntry};
|
||||||
@@ -270,7 +270,8 @@ fn normalize_membership_updates(
|
|||||||
return Ok(updates);
|
return Ok(updates);
|
||||||
}
|
}
|
||||||
Err(crate::ErrorKind::InputError(
|
Err(crate::ErrorKind::InputError(
|
||||||
"Screenshot membership update contains duplicate screenshots".to_string(),
|
"Screenshot membership update contains duplicate screenshots"
|
||||||
|
.to_string(),
|
||||||
)
|
)
|
||||||
.into())
|
.into())
|
||||||
}
|
}
|
||||||
@@ -345,4 +346,4 @@ async fn emit_screenshot_updates(
|
|||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,4 +7,4 @@ pub use self::operations::{
|
|||||||
list_all_screenshots, list_screenshots, list_synced_screenshots,
|
list_all_screenshots, list_screenshots, list_synced_screenshots,
|
||||||
move_screenshots, save_edited_screenshot,
|
move_screenshots, save_edited_screenshot,
|
||||||
};
|
};
|
||||||
pub(crate) use self::reconciliation::reconcile_screenshots;
|
pub(crate) use self::reconciliation::reconcile_screenshots;
|
||||||
@@ -647,4 +647,4 @@ fn unique_archive_folder(
|
|||||||
}
|
}
|
||||||
|
|
||||||
unreachable!()
|
unreachable!()
|
||||||
}
|
}
|
||||||
@@ -299,4 +299,4 @@ pub(super) async fn reconcile_source_screenshots(
|
|||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
sort_screenshots(&mut screenshots);
|
sort_screenshots(&mut screenshots);
|
||||||
Ok(screenshots)
|
Ok(screenshots)
|
||||||
}
|
}
|
||||||
@@ -2,4 +2,4 @@ pub(crate) mod config_sync_rows;
|
|||||||
pub(crate) mod content_rows;
|
pub(crate) mod content_rows;
|
||||||
pub(crate) mod instance_rows;
|
pub(crate) mod instance_rows;
|
||||||
pub(crate) mod loader_component_rows;
|
pub(crate) mod loader_component_rows;
|
||||||
pub(crate) mod screenshot_rows;
|
pub(crate) mod screenshot_rows;
|
||||||
@@ -233,4 +233,4 @@ pub(crate) async fn list_groups(
|
|||||||
)
|
)
|
||||||
.fetch_all(pool)
|
.fetch_all(pool)
|
||||||
.await?)
|
.await?)
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user