lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

window: Use portal to open files in other apps

Browse source 
Calling `xdg-open` is the wrong thing to do, and has
flaky reliability. What we want is to use the portal
directly with the exact behavior we want.

When using the portal we can't just pass the uri -
we need to own a file descriptor.
This commit is contained in:
Christopher Davis 2021-12-29 17:43:58 -08:00
parent 56a47fb447
commit a12e7eed43
2 changed files with 74 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/window.rs
View file

@ -25,6 +25,9 @@ use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk::CompositeTemplate;
use ashpd::desktop::open_uri;
use ashpd::WindowIdentifier;
use crate::config;
use crate::util;
use crate::widgets::LpImageView;
@ -198,7 +201,7 @@ mod imp {
glib::wrapper! {
pub struct LpWindow(ObjectSubclass<imp::LpWindow>)
@extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, adw::ApplicationWindow,
@implements gio::ActionMap, gio::ActionGroup;
@implements gio::ActionMap, gio::ActionGroup, gtk::Native;
}
impl LpWindow {
@ -263,12 +266,22 @@ impl LpWindow {
fn open_with(&self) {
let imp = self.imp();
let ctx = glib::MainContext::default();
if let Some(uri) = imp.image_view.uri() {
std::process::Command::new("xdg-open")
.arg(uri)
.output()
.unwrap();
if let Some(file) = imp
.image_view
.uri()
.map(|u| u.trim_start_matches("file://").to_string())
.map(|u| std::fs::File::open(u).ok())
.flatten()
{
ctx.spawn_local(clone!(@weak self as win => async move {
if let Err(e) =
open_uri::open_file(&WindowIdentifier::from_native(&win).await, &file, true, true).await
{
log::error!("Could not open image in external program: {}", e);
}
}));
} else {
log::error!("No URI for current image.")
}