Merge pull request #602 from pbor/async-initable

gio: add AsyncInitable

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

gio/Gir.toml

@@ -307,6 +307,23 @@ status = "generate"
         name = "name"
         string_type = "os_string"
 
+[[object]]
+name = "Gio.AsyncInitable"
+status = "generate"
+    [[object.function]]
+    name = "init_async"
+    # Can be called only once
+    unsafe = true
+    [[object.function]]
+    name = "new_async"
+    manual = true
+    [[object.function]]
+    name = "new_valist_async"
+    ignore = true
+    [[object.function]]
+    name = "newv_async"
+    ignore = true
+
 [[object]]
 name = "Gio.BufferedInputStream"
 status = "generate"

gio/src/async_initable.rs

@@ -0,0 +1,93 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+use crate::traits::AsyncInitableExt;
+use crate::AsyncInitable;
+use crate::Cancellable;
+use glib::object::IsA;
+use glib::object::IsClass;
+use glib::value::ToValue;
+use glib::{Cast, Object, StaticType, Type};
+use std::boxed::Box as Box_;
+use std::pin::Pin;
+
+impl AsyncInitable {
+    #[doc(alias = "g_async_initable_new_async")]
+    pub fn new_async<
+        O: Sized + IsClass + IsA<Object> + IsA<AsyncInitable>,
+        P: IsA<Cancellable>,
+        Q: FnOnce(Result<O, glib::Error>) + 'static,
+    >(
+        properties: &[(&str, &dyn ToValue)],
+        io_priority: glib::Priority,
+        cancellable: Option<&P>,
+        callback: Q,
+    ) {
+        let obj = Object::new::<O>(properties).unwrap();
+        unsafe {
+            obj.init_async(
+                io_priority,
+                cancellable,
+                glib::clone!(@strong obj => move |res| callback(res.map(|_| obj))),
+            );
+        }
+    }
+
+    #[doc(alias = "g_async_initable_new_async")]
+    pub fn new_future<O: Sized + IsClass + IsA<Object> + IsA<AsyncInitable>>(
+        properties: &[(&str, &dyn ToValue)],
+        io_priority: glib::Priority,
+    ) -> Pin<Box_<dyn std::future::Future<Output = Result<O, glib::Error>> + 'static>> {
+        Box_::pin(crate::GioFuture::new(
+            &Object::new::<O>(properties).unwrap(),
+            move |obj, cancellable, send| unsafe {
+                obj.init_async(
+                    io_priority,
+                    Some(cancellable),
+                    glib::clone!(@strong obj => move |res| {
+                        send.resolve(res.map(|_| obj));
+                    }),
+                );
+            },
+        ))
+    }
+
+    #[doc(alias = "g_async_initable_new_async")]
+    pub fn with_type<P: IsA<Cancellable>, Q: FnOnce(Result<Object, glib::Error>) + 'static>(
+        type_: Type,
+        properties: &[(&str, &dyn ToValue)],
+        io_priority: glib::Priority,
+        cancellable: Option<&P>,
+        callback: Q,
+    ) {
+        assert!(type_.is_a(AsyncInitable::static_type()));
+        let obj = Object::with_type(type_, properties).unwrap();
+        unsafe {
+            obj.unsafe_cast_ref::<Self>().init_async(
+                io_priority,
+                cancellable,
+                glib::clone!(@strong obj => move |res| callback(res.map(|_| obj))),
+            )
+        };
+    }
+
+    #[doc(alias = "g_async_initable_new_async")]
+    pub fn with_type_future(
+        type_: Type,
+        properties: &[(&str, &dyn ToValue)],
+        io_priority: glib::Priority,
+    ) -> Pin<Box_<dyn std::future::Future<Output = Result<Object, glib::Error>> + 'static>> {
+        assert!(type_.is_a(AsyncInitable::static_type()));
+        Box_::pin(crate::GioFuture::new(
+            &Object::with_type(type_, properties).unwrap(),
+            move |obj, cancellable, send| unsafe {
+                obj.unsafe_cast_ref::<Self>().init_async(
+                    io_priority,
+                    Some(cancellable),
+                    glib::clone!(@strong obj => move |res| {
+                        send.resolve(res.map(|_| obj));
+                    }),
+                );
+            },
+        ))
+    }
+}

gio/src/auto/async_initable.rs

@@ -0,0 +1,107 @@
+// This file was generated by gir (https://github.com/gtk-rs/gir)
+// from gir-files (https://github.com/gtk-rs/gir-files)
+// DO NOT EDIT
+
+use crate::AsyncResult;
+use crate::Cancellable;
+use glib::object::IsA;
+use glib::translate::*;
+use std::boxed::Box as Box_;
+use std::fmt;
+use std::pin::Pin;
+use std::ptr;
+
+glib::wrapper! {
+    #[doc(alias = "GAsyncInitable")]
+    pub struct AsyncInitable(Interface<ffi::GAsyncInitable, ffi::GAsyncInitableIface>);
+
+    match fn {
+        type_ => || ffi::g_async_initable_get_type(),
+    }
+}
+
+impl AsyncInitable {
+    pub const NONE: Option<&'static AsyncInitable> = None;
+}
+
+pub trait AsyncInitableExt: 'static {
+    #[doc(alias = "g_async_initable_init_async")]
+    unsafe fn init_async<P: FnOnce(Result<(), glib::Error>) + 'static>(
+        &self,
+        io_priority: glib::Priority,
+        cancellable: Option<&impl IsA<Cancellable>>,
+        callback: P,
+    );
+
+    unsafe fn init_future(
+        &self,
+        io_priority: glib::Priority,
+    ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>>;
+}
+
+impl<O: IsA<AsyncInitable>> AsyncInitableExt for O {
+    unsafe fn init_async<P: FnOnce(Result<(), glib::Error>) + 'static>(
+        &self,
+        io_priority: glib::Priority,
+        cancellable: Option<&impl IsA<Cancellable>>,
+        callback: P,
+    ) {
+        let main_context = glib::MainContext::ref_thread_default();
+        let is_main_context_owner = main_context.is_owner();
+        let has_acquired_main_context = (!is_main_context_owner)
+            .then(|| main_context.acquire().ok())
+            .flatten();
+        assert!(
+            is_main_context_owner || has_acquired_main_context.is_some(),
+            "Async operations only allowed if the thread is owning the MainContext"
+        );
+
+        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+            Box_::new(glib::thread_guard::ThreadGuard::new(callback));
+        unsafe extern "C" fn init_async_trampoline<P: FnOnce(Result<(), glib::Error>) + 'static>(
+            _source_object: *mut glib::gobject_ffi::GObject,
+            res: *mut crate::ffi::GAsyncResult,
+            user_data: glib::ffi::gpointer,
+        ) {
+            let mut error = ptr::null_mut();
+            let _ = ffi::g_async_initable_init_finish(_source_object as *mut _, res, &mut error);
+            let result = if error.is_null() {
+                Ok(())
+            } else {
+                Err(from_glib_full(error))
+            };
+            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+                Box_::from_raw(user_data as *mut _);
+            let callback: P = callback.into_inner();
+            callback(result);
+        }
+        let callback = init_async_trampoline::<P>;
+        ffi::g_async_initable_init_async(
+            self.as_ref().to_glib_none().0,
+            io_priority.into_glib(),
+            cancellable.map(|p| p.as_ref()).to_glib_none().0,
+            Some(callback),
+            Box_::into_raw(user_data) as *mut _,
+        );
+    }
+
+    unsafe fn init_future(
+        &self,
+        io_priority: glib::Priority,
+    ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
+        Box_::pin(crate::GioFuture::new(
+            self,
+            move |obj, cancellable, send| {
+                obj.init_async(io_priority, Some(cancellable), move |res| {
+                    send.resolve(res);
+                });
+            },
+        ))
+    }
+}
+
+impl fmt::Display for AsyncInitable {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str("AsyncInitable")
+    }
+}

gio/src/auto/dbus_connection.rs

@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::AsyncInitable;
 use crate::AsyncResult;
 use crate::Cancellable;
 use crate::Credentials;
@@ -31,7 +32,7 @@ use std::ptr;
 
 glib::wrapper! {
     #[doc(alias = "GDBusConnection")]
-    pub struct DBusConnection(Object<ffi::GDBusConnection>) @implements Initable;
+    pub struct DBusConnection(Object<ffi::GDBusConnection>) @implements AsyncInitable, Initable;
 
     match fn {
         type_ => || ffi::g_dbus_connection_get_type(),

gio/src/auto/dbus_proxy.rs

@@ -2,6 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+use crate::AsyncInitable;
 use crate::AsyncResult;
 use crate::BusType;
 use crate::Cancellable;
@@ -29,7 +30,7 @@ use std::ptr;
 
 glib::wrapper! {
     #[doc(alias = "GDBusProxy")]
-    pub struct DBusProxy(Object<ffi::GDBusProxy, ffi::GDBusProxyClass>) @implements DBusInterface, Initable;
+    pub struct DBusProxy(Object<ffi::GDBusProxy, ffi::GDBusProxyClass>) @implements AsyncInitable, DBusInterface, Initable;
 
     match fn {
         type_ => || ffi::g_dbus_proxy_get_type(),

gio/src/auto/mod.rs

@@ -26,6 +26,9 @@ pub use self::application::Application;
 mod application_command_line;
 pub use self::application_command_line::ApplicationCommandLine;
 
+mod async_initable;
+pub use self::async_initable::AsyncInitable;
+
 mod async_result;
 pub use self::async_result::AsyncResult;
 
@@ -687,6 +690,7 @@ pub mod traits {
     pub use super::app_launch_context::AppLaunchContextExt;
     pub use super::application::ApplicationExt;
     pub use super::application_command_line::ApplicationCommandLineExt;
+    pub use super::async_initable::AsyncInitableExt;
     pub use super::async_result::AsyncResultExt;
     pub use super::buffered_input_stream::BufferedInputStreamExt;
     pub use super::buffered_output_stream::BufferedOutputStreamExt;

gio/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

gio/src/lib.rs

@@ -14,6 +14,7 @@ pub use glib;
 
 mod app_info;
 mod application;
+mod async_initable;
 mod cancellable;
 mod converter;
 mod data_input_stream;

gio/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

glib/gobject-sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

glib/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

glib/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

graphene/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

graphene/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

pango/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

pango/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

pangocairo/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)

pangocairo/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e0d8d8d645b1)
+Generated by gir (https://github.com/gtk-rs/gir @ a4ffdd5a1de1)
 from gir-files (https://github.com/gtk-rs/gir-files @ 951202c4b7fd)