fixed formatting

pull/502/head
Matthias 2 years ago
parent 8440daaedd
commit 65037e7dcf
No known key found for this signature in database
GPG Key ID: BE1CE37C49DC0244

@ -10,7 +10,6 @@ mod platform_impl;
#[path = "platform_impl/macos.rs"]
mod platform_impl;
mod semver_compat;
pub(crate) type SingleInstanceCallback<R> =

@ -2,7 +2,7 @@
use std::sync::Arc;
use crate::{SingleInstanceCallback, semver_compat::semver_compat_string};
use crate::{semver_compat::semver_compat_string, SingleInstanceCallback};
use tauri::{
plugin::{self, TauriPlugin},
AppHandle, Config, Manager, RunEvent, Runtime,
@ -88,7 +88,13 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
pub fn destroy<R: Runtime, M: Manager<R>>(manager: &M) {
if let Some(connection) = manager.try_state::<ConnectionHandle>() {
let dbus_name = format!("org.{}.SingleInstance", dbus_id(manager.config(), manager.app_handle().package_info().version.clone()));
let dbus_name = format!(
"org.{}.SingleInstance",
dbus_id(
manager.config(),
manager.app_handle().package_info().version.clone()
)
);
let _ = connection.0.release_name(dbus_name);
}
}

@ -1,6 +1,6 @@
#![cfg(target_os = "windows")]
use crate::{SingleInstanceCallback, semver_compat::semver_compat_string};
use crate::{semver_compat::semver_compat_string, SingleInstanceCallback};
use std::ffi::CStr;
use tauri::{
plugin::{self, TauriPlugin},

@ -1,16 +1,15 @@
/// Takes a version and spits out a String with trailing .x, thus only considering the digits
/// Takes a version and spits out a String with trailing _x, thus only considering the digits
/// relevant regarding semver compatibility
pub fn semver_compat_string(version: semver::Version) -> String {
if version.pre.is_empty() == false { // for pre-release always treat each version separately
return version.to_string().replace(['.', '-'], "_")
}
match version.major {
0 => {
match version.minor {
0 => format!("0_0_{}", version.patch),
_ => format!("0_{}_x", version.minor),
}
},
_ => format!("{}_x_x", version.major)
}
}
// for pre-release always treat each version separately
if !version.pre.is_empty() {
return version.to_string().replace(['.', '-'], "_");
}
match version.major {
0 => match version.minor {
0 => format!("0_0_{}", version.patch),
_ => format!("0_{}_x", version.minor),
},
_ => format!("{}_x_x", version.major),
}
}

Loading…
Cancel
Save