diff --git a/app/renderer/public/index.html b/app/renderer/public/index.html index 8136b01b..ba247e3f 100644 --- a/app/renderer/public/index.html +++ b/app/renderer/public/index.html @@ -3,7 +3,7 @@ - + Pomatez diff --git a/app/tauri/Cargo.lock b/app/tauri/Cargo.lock index 74cf8600..b928414f 100644 --- a/app/tauri/Cargo.lock +++ b/app/tauri/Cargo.lock @@ -1230,6 +1230,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -1854,9 +1864,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.139" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -2257,6 +2267,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + [[package]] name = "os_pipe" version = "1.1.4" @@ -2580,6 +2601,7 @@ dependencies = [ "tauri-plugin-autostart", "tauri-plugin-global-shortcut", "tauri-plugin-notification", + "tauri-plugin-os", "tauri-plugin-shell", "tauri-plugin-updater", "tauri-plugin-window", @@ -3326,6 +3348,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -3589,6 +3620,23 @@ dependencies = [ "url", ] +[[package]] +name = "tauri-plugin-os" +version = "2.0.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53683d9ae8cde48d3f1ff988aeecb49c7bb8352c2bc5f74052c0fe0d667935f" +dependencies = [ + "gethostname", + "log", + "os_info", + "serde", + "serde_json", + "serialize-to-javascript", + "sys-locale", + "tauri", + "thiserror", +] + [[package]] name = "tauri-plugin-shell" version = "2.0.0-alpha.4" diff --git a/app/tauri/Cargo.toml b/app/tauri/Cargo.toml index 7a01ef97..1906f6ae 100644 --- a/app/tauri/Cargo.toml +++ b/app/tauri/Cargo.toml @@ -32,6 +32,7 @@ lazy_static = "1.4.0" base64 = { version = "0.21.4", features = [] } tauri-plugin-notification = "2.0.0-alpha.5" tauri-plugin-shell = "2.0.0-alpha.4" +tauri-plugin-os = "2.0.0-alpha.4" # This one is for toying with global hotkeys from the browser mostly # We can use https://github.com/tauri-apps/global-hotkey directly tbh diff --git a/app/tauri/gen/apple/pomatez.xcodeproj/project.pbxproj b/app/tauri/gen/apple/pomatez.xcodeproj/project.pbxproj index fe92c835..c1bb383e 100644 --- a/app/tauri/gen/apple/pomatez.xcodeproj/project.pbxproj +++ b/app/tauri/gen/apple/pomatez.xcodeproj/project.pbxproj @@ -22,15 +22,18 @@ /* Begin PBXFileReference section */ 3D7D53A9230BB5602199B74A /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; }; + 3E2BA8BAEDA3D642B9581B7F /* mod.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = mod.rs; sourceTree = ""; }; 3F1BEDBB190142CAFC748FEC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 3FAA3B6C73D09A559E849A0B /* libpomatez.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpomatez.a; sourceTree = ""; }; - 5847E0A483E1D4416F0A93D8 /* global_shortcuts.rs */ = {isa = PBXFileReference; lastKnownFileType = file; path = global_shortcuts.rs; sourceTree = ""; }; 5BCC6085DA3BAAD6F0D2724E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 5E54572C28EC544931F1901B /* updater.rs */ = {isa = PBXFileReference; lastKnownFileType = file; path = updater.rs; sourceTree = ""; }; + 7A7B70953EE83C0E30F1234B /* updater.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = updater.rs; sourceTree = ""; }; 7B0BF6C26872684E733BA37D /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; + 88637405736E11552059F10A /* lib.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = lib.rs; sourceTree = ""; }; + 8A01864D0058CD628A91EC7E /* commands.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = commands.rs; sourceTree = ""; }; 8FEF8906163FB03D4B833A4B /* bindings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bindings.h; sourceTree = ""; }; + 98547F8A80545AE1F33E47A5 /* global_shortcuts.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = global_shortcuts.rs; sourceTree = ""; }; 9D8D5B5BFA81B2CA2F94B120 /* main.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = main.rs; sourceTree = ""; }; - 9E73DDB0E61619020B6916BE /* commands.rs */ = {isa = PBXFileReference; lastKnownFileType = file; path = commands.rs; sourceTree = ""; }; + AA4EC421DFFBECC293613197 /* system_tray.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = system_tray.rs; sourceTree = ""; }; B1FCAA4D6A85DA8C08666168 /* pomatez_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = pomatez_iOS.entitlements; sourceTree = ""; }; B478B8146852093869DBAB06 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; D69D650EBB8987E11DA3AD9A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -39,7 +42,6 @@ EC80E0387671021C43156452 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; F0B951715D36C8F3EF902710 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; F517A08ACB3C99339208ECEC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - FE1746F712051F16E9E8CC8F /* system_tray.rs */ = {isa = PBXFileReference; lastKnownFileType = file; path = system_tray.rs; sourceTree = ""; }; FF594C8B7B838F5DC8253895 /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; /* End PBXFileReference section */ @@ -94,14 +96,24 @@ name = Products; sourceTree = ""; }; + 88952291D5AF12E4722235DF /* desktop */ = { + isa = PBXGroup; + children = ( + 8A01864D0058CD628A91EC7E /* commands.rs */, + 98547F8A80545AE1F33E47A5 /* global_shortcuts.rs */, + 3E2BA8BAEDA3D642B9581B7F /* mod.rs */, + AA4EC421DFFBECC293613197 /* system_tray.rs */, + 7A7B70953EE83C0E30F1234B /* updater.rs */, + ); + path = desktop; + sourceTree = ""; + }; 9FAADF5648F0DDF5E03B9387 /* src */ = { isa = PBXGroup; children = ( - 9E73DDB0E61619020B6916BE /* commands.rs */, - 5847E0A483E1D4416F0A93D8 /* global_shortcuts.rs */, + 88637405736E11552059F10A /* lib.rs */, 9D8D5B5BFA81B2CA2F94B120 /* main.rs */, - FE1746F712051F16E9E8CC8F /* system_tray.rs */, - 5E54572C28EC544931F1901B /* updater.rs */, + 88952291D5AF12E4722235DF /* desktop */, ); name = src; path = ../../src; @@ -327,8 +339,6 @@ "\".\"", ); INFOPLIST_FILE = pomatez_iOS/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Pomatez; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -443,8 +453,6 @@ "\".\"", ); INFOPLIST_FILE = pomatez_iOS/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Pomatez; - INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/app/tauri/src/lib.rs b/app/tauri/src/lib.rs index 853417bb..58ccf5bc 100644 --- a/app/tauri/src/lib.rs +++ b/app/tauri/src/lib.rs @@ -45,7 +45,8 @@ pub fn run() { let app = app.plugin(tauri_plugin_window::init()) .plugin(tauri_plugin_shell::init()) - .plugin(tauri_plugin_notification::init()); + .plugin(tauri_plugin_notification::init()) + .plugin(tauri_plugin_os::init()); #[cfg(desktop)] let mut app = app;