diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2022-10-20 23:14:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 23:14:11 +0200 |
| commit | 5cc82fb80f5f91ed9d4a32a71e090a9a805ff2a9 (patch) | |
| tree | 431d14cb0983e78bb8ac870e3ad55088a4d2345e /src-tauri/src | |
| parent | 31f26c4dd4a92bb5826ad2af9ccb9808fca40e40 (diff) | |
| download | FlightCore-5cc82fb80f5f91ed9d4a32a71e090a9a805ff2a9.tar.gz FlightCore-5cc82fb80f5f91ed9d4a32a71e090a9a805ff2a9.zip | |
refactor: Various formatting and fixes (#23)
* refactor: Add error return type
* style: Auto-format
Only minor changes, did not take over all changes from auto-format.
* refactor: Rename function to get FC version number
To make it more clear which version number we're getting
(FlightCore vs Northstar)
Diffstat (limited to 'src-tauri/src')
| -rw-r--r-- | src-tauri/src/lib.rs | 2 | ||||
| -rw-r--r-- | src-tauri/src/main.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index b249d519..8a97a108 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -231,7 +231,7 @@ async fn do_install(nmod: &thermite::model::Mod, game_path: &std::path::Path) -> pub async fn install_northstar( game_path: &str, northstar_package_name: Option<String>, -) -> Result<String> { +) -> Result<String, String> { let northstar_package_name = match northstar_package_name { Some(northstar_package_name) => { if northstar_package_name.len() <= 1 { diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 411e75c9..4826ef52 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -73,7 +73,7 @@ fn main() { .invoke_handler(tauri::generate_handler![ force_panic, find_game_install_location_caller, - get_version_number, + get_flightcore_version_number, get_northstar_version_number_caller, check_is_northstar_outdated, verify_install_location, @@ -131,7 +131,7 @@ fn linux_checks() -> Result<(), String> { #[tauri::command] /// Returns the current version number as a string -fn get_version_number() -> String { +fn get_flightcore_version_number() -> String { let version = env!("CARGO_PKG_VERSION"); if cfg!(debug_assertions) { // Debugging enabled |