CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-05-11 12:37:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use bundle identifier in dbus path and name (#10)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2022-09-06 08:30:33 -03:00
committed by GitHub
parent ca63208b6b
commit bb0374d0e9
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform_impl/linux.rs
+15 -8
View File
@@ -2,9 +2,8 @@
use crate::SingleInstanceCallback;
use tauri::{
AppHandle,
plugin::{self, TauriPlugin},
Manager, RunEvent, Runtime,
AppHandle, Manager, RunEvent, Runtime,
};
use zbus::{
blocking::{Connection, ConnectionBuilder},
@@ -19,22 +18,31 @@ struct SingleInstanceDBus<R: Runtime> {
}
#[dbus_interface(name = "org.SingleInstance.DBus")]
impl<R:Runtime> SingleInstanceDBus<R> {
impl<R: Runtime> SingleInstanceDBus<R> {
fn execute_callback(&mut self, argv: Vec<String>, cwd: String) {
(self.callback)(&self.app_handle, argv, cwd);
}
}
fn dbus_id<R: Runtime>(app: &AppHandle<R>) -> String {
app.config()
.tauri
.bundle
.identifier
.replace('.', "_")
.replace('-', "_")
}
pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
plugin::Builder::new("single-instance")
.setup(|app| {
let app_name = app.package_info().name.clone();
let id = dbus_id(app);
let single_instance_dbus = SingleInstanceDBus {
callback: f,
app_handle: app.clone(),
};
let dbus_name = format!("org.{}.SingleInstance", app_name);
let dbus_path = format!("/org/{}/SingleInstance", app_name);
let dbus_name = format!("org.{}.SingleInstance", id);
let dbus_path = format!("/org/{}/SingleInstance", id);
match ConnectionBuilder::session()
.unwrap()
@@ -73,8 +81,7 @@ pub fn init<R: Runtime>(f: Box<SingleInstanceCallback<R>>) -> TauriPlugin<R> {
.on_event(|app, event| {
if let RunEvent::Exit = event {
if let Some(connection) = app.try_state::<ConnectionHandle>() {
let app_name = app.package_info().name.clone();
let dbus_name = format!("org.{}.SingleInstance", app_name);
let dbus_name = format!("org.{}.SingleInstance", dbus_id(app));
let _ = connection.0.release_name(dbus_name);
}
}