From 710e337d88c38e39baf368e23864e5e9631eec93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20=C5=A0?= Date: Sat, 20 Jan 2024 19:45:26 +0100 Subject: [PATCH] Add option to open apps automatically when they are installed (closes #447) --- extension/src/_locales/en/messages.json | 8 ++++++++ extension/src/sites/install.html | 4 ++++ extension/src/sites/install.js | 6 +++++- native/src/connector/process.rs | 11 ++++++++--- native/src/connector/request.rs | 4 ++++ native/src/console/app.rs | 16 ++++++++++------ native/src/console/site.rs | 13 +++++++++++++ 7 files changed, 52 insertions(+), 10 deletions(-) diff --git a/extension/src/_locales/en/messages.json b/extension/src/_locales/en/messages.json index 3006a631..b151a0f3 100644 --- a/extension/src/_locales/en/messages.json +++ b/extension/src/_locales/en/messages.json @@ -667,6 +667,14 @@ "message": "Disable only if you cannot install this web app with the manifest enabled", "description": "The tooltip for the use manifest checkbox on the web app installation page" }, + "installPageLaunchNowLabel": { + "message": "Launch web app when the installation finishes", + "description": "The label for the launch now checkbox on the web app installation page" + }, + "installPageLaunchNowTooltip": { + "message": "Enable if you want this web app to be launched automatically after the installation", + "description": "The tooltip for the launch now checkbox on the web app installation page" + }, "installPageContentScriptError": { "message": "Failed to access the content script.", "description": "A message that says the extension was not able to access the content script" diff --git a/extension/src/sites/install.html b/extension/src/sites/install.html index 666327dc..03409142 100644 --- a/extension/src/sites/install.html +++ b/extension/src/sites/install.html @@ -59,6 +59,10 @@ +
+ + +
diff --git a/extension/src/sites/install.js b/extension/src/sites/install.js index 386cb3c6..cc62067e 100644 --- a/extension/src/sites/install.js +++ b/extension/src/sites/install.js @@ -331,6 +331,9 @@ async function initializeForm () { // Force disable manifest if the checkbox is not checked if (!document.getElementById('web-app-use-manifest').checked) manifestExists = false + // Handle whether the web app should be launched after the installation + const launchNow = document.getElementById('web-app-launch-now').checked || false + // Get simple site data const startUrl = document.getElementById('web-app-start-url').value || null const iconUrl = document.getElementById('web-app-icon-url').value || null @@ -389,7 +392,8 @@ async function initializeForm () { name, description, categories, - keywords + keywords, + launch_now: launchNow } }) diff --git a/native/src/connector/process.rs b/native/src/connector/process.rs index 992887d3..dfa9e724 100644 --- a/native/src/connector/process.rs +++ b/native/src/connector/process.rs @@ -108,9 +108,13 @@ impl Process for GetSiteList { impl Process for LaunchSite { fn process(&self, _connection: &Connection) -> Result { - cfg_if! { - if #[cfg(platform_macos)] { let command = SiteLaunchCommand { id: self.id, url: self.url.to_owned(), protocol: None, arguments: vec![], direct_launch: false }; } - else { let command = SiteLaunchCommand { id: self.id, url: self.url.to_owned(), protocol: None, arguments: vec![] }; } + let command = SiteLaunchCommand { + id: self.id, + url: self.url.to_owned(), + protocol: None, + arguments: vec![], + #[cfg(platform_macos)] + direct_launch: false, }; command.run()?; @@ -132,6 +136,7 @@ impl Process for InstallSite { keywords: self.keywords.to_owned(), launch_on_login: Some(self.launch_on_login), launch_on_browser: Some(self.launch_on_browser), + launch_now: self.launch_now, system_integration: true, client: self.client.to_owned().into(), }; diff --git a/native/src/connector/request.rs b/native/src/connector/request.rs index b41133e8..b32cf4e7 100644 --- a/native/src/connector/request.rs +++ b/native/src/connector/request.rs @@ -275,6 +275,10 @@ pub struct InstallSite { #[serde(default)] pub launch_on_browser: bool, + /// Whether the web app should be launch when the installation finishes. + #[serde(default)] + pub launch_now: bool, + /// Contains a HTTP client configuration. #[serde(default)] pub client: HTTPClientConfig, diff --git a/native/src/console/app.rs b/native/src/console/app.rs index f2a7f7d8..b706e56e 100644 --- a/native/src/console/app.rs +++ b/native/src/console/app.rs @@ -100,19 +100,23 @@ pub struct SiteInstallCommand { #[clap(long)] pub keywords: Option>, - /// Set the web app to launch on the system login. + /// Set the web app to launch on the system login #[clap(long)] pub launch_on_login: Option, - /// Set the web app to launch on the browser launch. + /// Set the web app to launch on the browser launch #[clap(long)] pub launch_on_browser: Option, + /// Launch this web app when the installation finishes + #[clap(long)] + pub launch_now: bool, + /// Disable system integration #[clap(long = "no-system-integration", action = ArgAction::SetFalse)] pub system_integration: bool, - /// Configuration of the HTTP client. + /// Configuration of the HTTP client #[clap(flatten)] pub client: HTTPClientConfig, } @@ -188,7 +192,7 @@ pub struct SiteUpdateCommand { #[clap(long = "no-system-integration", action = ArgAction::SetFalse)] pub system_integration: bool, - /// Configuration of the HTTP client. + /// Configuration of the HTTP client #[clap(flatten)] pub client: HTTPClientConfig, } @@ -283,11 +287,11 @@ pub struct HTTPClientConfig { #[clap(long, value_hint = clap::ValueHint::FilePath)] pub tls_root_certificates_pem: Option>, - /// Dangerous: Allow client to client accept invalid certs + /// Dangerous: Allow client to accept invalid certs #[clap(long)] pub tls_danger_accept_invalid_certs: bool, - /// Dangerous: Allow client to client accept invalid hostnames + /// Dangerous: Allow client to accept invalid hostnames #[clap(long)] pub tls_danger_accept_invalid_hostnames: bool, } diff --git a/native/src/console/site.rs b/native/src/console/site.rs index dcb91e2c..9990952e 100644 --- a/native/src/console/site.rs +++ b/native/src/console/site.rs @@ -204,6 +204,19 @@ impl SiteInstallCommand { storage.write(&dirs)?; info!("Web app installed: {}", ulid); + + if self.launch_now { + let command = SiteLaunchCommand { + id: ulid, + url: vec![], + protocol: None, + arguments: vec![], + #[cfg(platform_macos)] + direct_launch: false, + }; + command.run()?; + } + Ok(ulid) } }