diff options
Diffstat (limited to 'karlcommon/src/lib.rs')
-rw-r--r-- | karlcommon/src/lib.rs | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/karlcommon/src/lib.rs b/karlcommon/src/lib.rs index bbe8b1e..e361423 100644 --- a/karlcommon/src/lib.rs +++ b/karlcommon/src/lib.rs @@ -2,21 +2,6 @@ pub mod protocol; pub use protocol::*; pub mod misc; -use std::{ - os::unix::prelude::MetadataExt, - path::{Path, PathBuf}, -}; - -pub fn socket_path() -> PathBuf { - std::env::var("XDG_RUNTIME_DIR") - .map(|p| Path::new(p.as_str()).to_path_buf()) - .unwrap_or_else(|_| Path::new("/run/user").join(format!("{}", getuid()))) - .join("karlender") -} -fn getuid() -> u32 { - std::fs::metadata("/proc/self").unwrap().uid() -} - #[macro_export] macro_rules! version { () => { @@ -28,6 +13,26 @@ macro_rules! version { ) }; } + pub fn own_version() -> String { format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")) } + +pub mod interfaces { + use std::net::{Ipv4Addr, SocketAddr}; + use std::os::unix::prelude::MetadataExt; + use std::path::{Path, PathBuf}; + + fn getuid() -> u32 { + std::fs::metadata("/proc/self").unwrap().uid() + } + pub fn unix_path() -> PathBuf { + std::env::var("XDG_RUNTIME_DIR") + .map(|p| Path::new(p.as_str()).to_path_buf()) + .unwrap_or_else(|_| Path::new("/run/user").join(format!("{}", getuid()))) + .join("karlender") + } + pub fn websocket_addr() -> SocketAddr { + SocketAddr::new(std::net::IpAddr::V4(Ipv4Addr::LOCALHOST), 18752) + } +} |