Browse Source

plugins: place socket in XDG_RUNTIME_DIR, not CWD

Closes #78
jmap-eventsource
Manos Pitsidianakis 1 year ago
parent
commit
a187cee1d3
Signed by untrusted user: epilys GPG Key ID: 73627C2F690DF710
  1. 23
      src/plugins.rs

23
src/plugins.rs

@ -25,6 +25,7 @@ use melib::error::{MeliError, Result};
use std::collections::HashMap;
use std::io::Write;
use std::os::unix::net::{UnixListener, UnixStream};
use std::path::PathBuf;
use std::process::Stdio;
use uuid::Uuid;
@ -73,9 +74,24 @@ pub struct PluginManager {
listener: UnixListener,
}
fn socket_path() -> PathBuf {
xdg::BaseDirectories::new()
.and_then(|base_dirs| {
base_dirs
.place_runtime_file("meli-plugins")
.or_else(|_| base_dirs.place_cache_file("meli-plugins"))
.or_else(|_| {
let mut p = base_dirs.get_cache_home();
p.push("meli-plugins");
Ok(p)
})
})
.unwrap_or_else(|_| PathBuf::from("."))
}
impl Drop for PluginManager {
fn drop(&mut self) {
let _ = std::fs::remove_file("./soworkfile");
let _ = std::fs::remove_file(&socket_path());
for (k, c) in self.instances.iter_mut() {
if let Err(err) = debug!(c.kill()) {
eprintln!(
@ -91,8 +107,9 @@ impl Drop for PluginManager {
impl PluginManager {
pub fn new() -> Self {
let _ = std::fs::remove_file("./soworkfile");
let listener = UnixListener::bind("./soworkfile").unwrap();
let socket_path = socket_path();
let _ = std::fs::remove_file(&socket_path);
let listener = UnixListener::bind(&socket_path).unwrap();
/*
debug!("bound");
// accept connections and process them, spawning a new thread for each one

Loading…
Cancel
Save