Update to relm 0.24 and disable video autoplay

Author: antoyo

Cargo.lock

@@ -8,36 +8,36 @@ repository = "https://github.com/antoyo/titanium"
 version = "0.1.1"
 
 [dependencies]
-cairo-rs = "^0.15.0"
-gdk = "^0.15.0"
-gio = "^0.15.0"
-glib = "^0.15.0"
-gtk = "^0.15.0"
+cairo-rs = "^0.16.0"
+gdk = "^0.16.0"
+gio = "^0.16.0"
+glib = "^0.16.0"
+gtk = "^0.16.0"
 gumdrop = "0.4"
 log = "0.4"
 log-panics = "2"
-mg = "0.15"
+mg = "0.16"
 mg-settings = "^0.4.0"
 mg-settings-macros = "^0.4.0"
 number_prefix = "^0.2"
 open = "^1.1"
 password-store = "^0.4.0"
 percent-encoding = "^1.0.0"
-relm =  "0.23"
-relm-derive = "0.23"
+relm =  "0.24.1"
+relm-derive = "0.24"
 rusqlite = "0.27"
 simplelog = "0.5"
 syslog = "4"
 tempfile = "3"
 url = "^1.2"
-webkit2gtk = "^0.18.0"
+webkit2gtk = "^1.0.0"
 xdg = "^2.0"
 zip = "0.3"
 
 # TODO: remove since https://github.com/gtk-rs/gio/issues/99 is fixed.
-gio-sys = "^0.15.0"
-glib-sys = "^0.15.0"
-gobject-sys = "^0.15.0"
+gio-sys = "^0.16.0"
+glib-sys = "^0.16.0"
+gobject-sys = "^0.16.0"
 
 [dependencies.titanium-common]
 path = "titanium-common"
@@ -50,5 +50,5 @@ libxdo = "0.6"
 default = [
     "cairo-rs/png",
     "log-panics/with-backtrace",
-    "webkit2gtk/v2_28",
+    "webkit2gtk/v2_30",
 ]

Cargo.toml

@@ -20,6 +20,12 @@
  */
 
 /*
+ * FIXME: search not working (e.g. results not focused into view) in
+ * https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/791/diffs?view=parallel (search for
+ * babl_format).
+ * Could it be due to using an old webkit2gtk?
+ * It is not due to my web extension.
+ *
  * TODO: add cosmetic filter support in adblocker: https://github.com/dudik/blockit
  * (doc: https://github.com/brave/adblock-rust/issues/152#issuecomment-771259069)
  * (that probably requires a MutationObserver: https://github.com/brave/adblock-rust/issues/152#issuecomment-771046487)
@@ -435,15 +441,15 @@ mod webview;
 
 use std::env::args;
 
-use gio::{prelude::ApplicationExtManual, File, traits::{ApplicationExt, FileExt}};
+use gio::{prelude::ApplicationExtManual, File, traits::{ApplicationExt, FileExt}, ApplicationHoldGuard};
 use gtk::Application;
 use gumdrop::Options;
 use log::Level::Error;
-use relm::{EventStream, Relm, Update, UpdateNew, execute, Component};
+use relm::{EventStream, Relm, Update, UpdateNew, execute};
 use simplelog::{Config, LevelFilter, TermLogger};
 use syslog::Facility;
 
-use app::{App, APP_NAME};
+use app::APP_NAME;
 use message_server::{create_message_server, MessageServer, Msg::{NewApp, ReleaseApp}, Privacy};
 
 const INVALID_UTF8_ERROR: &str = "invalid utf-8 string";
@@ -503,12 +509,14 @@ struct RelmApp {
 
 struct Model {
     application: Application,
+    app_hold_guard: Option<ApplicationHoldGuard>,
     message_server: Option<EventStream<<MessageServer as Update>::Msg>>,
 }
 
 #[derive(Msg)]
 enum Msg {
     Activate,
+    AppHoldGuard(ApplicationHoldGuard),
     Open(Vec<File>),
 }
 
@@ -520,21 +528,24 @@ impl Update for RelmApp {
     fn model(_: &Relm<Self>, application: Self::ModelParam) -> Model {
         Model {
             application,
+            app_hold_guard: None,
             message_server: None,
         }
     }
 
     fn subscriptions(&mut self, relm: &Relm<Self>) {
+        let stream = relm.stream().clone();
         connect!(self.model.application, connect_activate(app), relm, {
             // NOTE: we need to increase the refcount of app because we create the window
             // asynchronously.
-            app.hold();
+            stream.emit(Msg::AppHoldGuard(app.hold()));
             Msg::Activate
         });
+        let stream = relm.stream().clone();
         connect!(self.model.application, connect_open(app, files, _), relm, {
             // NOTE: we need to increase the refcount of app because we create the window
             // asynchronously.
-            app.hold();
+            stream.emit(Msg::AppHoldGuard(app.hold()));
             Msg::Open(files.to_vec())
         });
     }
@@ -548,10 +559,13 @@ impl Update for RelmApp {
                         message_server.stream().emit(ReleaseApp);
                     },
                     None => {
-                        self.model.message_server = Some(create_message_server(self.model.application.clone(), vec![], None));
+                        self.model.message_server = Some(create_message_server(self.model.application.clone(), self.model.app_hold_guard.take(), vec![], None));
                     },
                 }
             },
+            Msg::AppHoldGuard(app_hold_guard) => {
+                self.model.app_hold_guard = Some(app_hold_guard);
+            },
             Msg::Open(files) => {
                 match self.model.message_server {
                     Some(ref message_server) => {
@@ -570,7 +584,7 @@ impl Update for RelmApp {
                         let files = files.iter()
                             .map(|file| file.uri().to_string())
                             .collect();
-                        self.model.message_server = Some(create_message_server(self.model.application.clone(), files, None));
+                        self.model.message_server = Some(create_message_server(self.model.application.clone(), self.model.app_hold_guard.take(), files, None));
                     },
                 }
             },

src/main.rs

@@ -27,7 +27,7 @@ use std::io::{BufRead, BufReader};
 use std::io::{self, Write};
 use std::process;
 
-use gio::prelude::ApplicationExt;
+use gio::ApplicationHoldGuard;
 use gtk::Application;
 use gtk::traits::GtkApplicationExt;
 use gtk::{
@@ -65,6 +65,7 @@ pub struct MessageServer {
 pub struct Model {
     app_count: usize,
     application: Application,
+    app_hold_guard: Option<ApplicationHoldGuard>,
     config_dir: ConfigDir,
     /// This listener is used to prevent two instances of Titanium to run at the same time.
     private_web_context: WebContext,
@@ -86,10 +87,10 @@ pub enum Msg {
 
 impl Update for MessageServer {
     type Model = Model;
-    type ModelParam = (Application, Vec<String>, Option<String>);
+    type ModelParam = (Application, Option<ApplicationHoldGuard>, Vec<String>, Option<String>);
     type Msg = Msg;
 
-    fn model(relm: &Relm<Self>, (application, urls, config): (Application, Vec<String>, Option<String>)) -> Model {
+    fn model(relm: &Relm<Self>, (application, app_hold_guard, urls, config): (Application, Option<ApplicationHoldGuard>, Vec<String>, Option<String>)) -> Model {
         let config_dir = ConfigDir::new(&config).unwrap(); // TODO: remove unwrap().
         let (web_context, private_web_context) = WebView::initialize_web_extension(&config_dir);
         if urls.is_empty() {
@@ -105,6 +106,7 @@ impl Update for MessageServer {
         Model {
             app_count: 0,
             application,
+            app_hold_guard,
             config_dir,
             opened_urls: BTreeSet::new(),
             previous_opened_urls: BTreeSet::new(),
@@ -125,7 +127,7 @@ impl Update for MessageServer {
             NewApp(url, privacy) => self.add_app(url, privacy),
             // NOTE: we called hold() on the application in order to create the window
             // asynchronously. Now that it is created, we can call release().
-            ReleaseApp => self.model.application.release(),
+            ReleaseApp => { self.model.app_hold_guard.take(); },
             RemoveApp(url) => self.remove_app(url),
         }
     }
@@ -140,8 +142,8 @@ impl UpdateNew for MessageServer {
 }
 
 impl MessageServer {
-    pub fn new(application: Application, url: Vec<String>, config_dir: Option<String>) -> Result<EventStream<<Self as Update>::Msg>> {
-        Ok(execute::<MessageServer>((application, url, config_dir)))
+    pub fn new(application: Application, app_hold_guard: Option<ApplicationHoldGuard>, url: Vec<String>, config_dir: Option<String>) -> Result<EventStream<<Self as Update>::Msg>> {
+        Ok(execute::<MessageServer>((application, app_hold_guard, url, config_dir)))
     }
 
     fn add_app(&mut self, url: Option<String>, privacy: Privacy) {
@@ -218,8 +220,8 @@ impl MessageServer {
 
 /// Create a new message server.
 /// If it is not possible to create one, show the error and exit.
-pub fn create_message_server(application: Application, urls: Vec<String>, config_dir: Option<String>) -> EventStream<<MessageServer as Update>::Msg> {
-    match MessageServer::new(application, urls, config_dir) {
+pub fn create_message_server(application: Application, app_hold_guard: Option<ApplicationHoldGuard>, urls: Vec<String>, config_dir: Option<String>) -> EventStream<<MessageServer as Update>::Msg> {
+    match MessageServer::new(application, app_hold_guard, urls, config_dir) {
         Ok(message_server) => message_server,
         Err(error) => {
             let message = format!("cannot create the message server used to communicate with the web processes: {}",

src/message_server.rs

@@ -66,7 +66,7 @@ use webkit2gtk::{
     WebContextExt,
     WebInspector,
     WebInspectorExt,
-    WebViewExt,
+    WebViewExt, WebsitePolicies, AutoplayPolicy,
 };
 use webkit2gtk::NavigationType::{LinkClicked, Other};
 use webkit2gtk::PolicyDecisionType::{self, NavigationAction, Response};
@@ -182,7 +182,8 @@ impl Widget for WebView {
         #[name="view"]
         webkit2gtk::WebView({
             user_content_manager: UserContentManager::new(), // FIXME: seems to be deallocated.
-            web_context: self.model.context
+            web_context: self.model.context,
+            website_policies: WebsitePolicies::builder().autoplay(AutoplayPolicy::Deny).build(),
         }) {
             close => Close,
             vexpand: true,

src/webview/mod.rs

@@ -7,10 +7,8 @@ repository = "https://github.com/antoyo/titanium"
 version = "0.1.0"
 
 [dependencies]
-gio = "^0.15.0"
-glib = "^0.15.0"
+gio = "^0.16.0"
+glib = "^0.16.0"
 log = "^0.4.1"
-relm = "0.23"
-relm-derive = "0.23"
 rmp-serialize = "^0.8.0"
 rustc-serialize = "^0.3.24"