Add option to open apps automatically when they are installed (closes #…

…447)

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"

extension/src/sites/install.html

@@ -59,6 +59,10 @@
  <input class="form-check-input" type="checkbox" value="" id="web-app-use-manifest" checked>
  <label class="form-check-label" for="web-app-use-manifest" data-i18n="installPageUseManifestLabel" data-i18n-title="installPageUseManifestTooltip"></label>
  </div>
+ <div class="form-check">
+ <input class="form-check-input" type="checkbox" value="" id="web-app-launch-now">
+ <label class="form-check-label" for="web-app-launch-now" data-i18n="installPageLaunchNowLabel" data-i18n-title="installPageLaunchNowTooltip"></label>
+ </div>
  </form>
  </div>
  <div class="card-footer position-sticky bottom-0 py-2">

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
  }
  })
 

native/src/connector/process.rs

@@ -108,9 +108,13 @@ impl Process for GetSiteList {
 
 impl Process for LaunchSite {
  fn process(&self, _connection: &Connection) -> Result<ConnectorResponse> {
- 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(),
  };

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,

native/src/console/app.rs

@@ -100,19 +100,23 @@ pub struct SiteInstallCommand {
  #[clap(long)]
  pub keywords: Option<Vec<String>>,
 
- /// 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<bool>,
 
- /// 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<bool>,
 
+ /// 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<Vec<PathBuf>>,
 
- /// 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,
 }

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)
  }
 }