feat: add hostname and full_hostname meta plugins with error handling
Co-authored-by: aider (openai/andrew.openrouter.qwen.qwen3-coder) <aider@aider.chat>
This commit is contained in:
@@ -37,6 +37,8 @@ flate2 = { version = "1.0.27", features = ["zlib-ng-compat"] }
|
|||||||
regex = "1.9.5"
|
regex = "1.9.5"
|
||||||
nix = "0.26.2"
|
nix = "0.26.2"
|
||||||
sha2 = "0.10.0"
|
sha2 = "0.10.0"
|
||||||
|
local-ip-address = "0.5.5"
|
||||||
|
dns-lookup = "2.0.2"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3.3.0"
|
tempfile = "3.3.0"
|
||||||
|
|||||||
@@ -9,9 +9,11 @@ use enum_map::{Enum, EnumMap};
|
|||||||
|
|
||||||
pub mod program;
|
pub mod program;
|
||||||
pub mod digest;
|
pub mod digest;
|
||||||
|
pub mod basic;
|
||||||
|
|
||||||
use crate::meta_plugin::program::MetaPluginProgram;
|
use crate::meta_plugin::program::MetaPluginProgram;
|
||||||
use crate::meta_plugin::digest::{DigestSha256MetaPlugin, ReadTimeMetaPlugin, ReadRateMetaPlugin};
|
use crate::meta_plugin::digest::{DigestSha256MetaPlugin, ReadTimeMetaPlugin, ReadRateMetaPlugin};
|
||||||
|
use crate::meta_plugin::basic::{HostnameMetaPlugin, FullHostnameMetaPlugin};
|
||||||
|
|
||||||
#[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString, Enum)]
|
#[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString, Enum)]
|
||||||
#[strum(ascii_case_insensitive)]
|
#[strum(ascii_case_insensitive)]
|
||||||
@@ -21,6 +23,8 @@ pub enum MetaPluginType {
|
|||||||
DigestMd5,
|
DigestMd5,
|
||||||
ReadTime,
|
ReadTime,
|
||||||
ReadRate,
|
ReadRate,
|
||||||
|
Hostname,
|
||||||
|
FullHostname,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait MetaPlugin {
|
pub trait MetaPlugin {
|
||||||
@@ -54,6 +58,8 @@ lazy_static! {
|
|||||||
}
|
}
|
||||||
MetaPluginType::ReadTime => None,
|
MetaPluginType::ReadTime => None,
|
||||||
MetaPluginType::ReadRate => None,
|
MetaPluginType::ReadRate => None,
|
||||||
|
MetaPluginType::Hostname => None,
|
||||||
|
MetaPluginType::FullHostname => None,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,6 +70,8 @@ pub fn get_meta_plugin(meta_plugin_type: MetaPluginType) -> Box<dyn MetaPlugin>
|
|||||||
MetaPluginType::DigestMd5 => Box::new(MetaPluginProgram::new("md5sum", vec![], "digest_md5".to_string(), true)),
|
MetaPluginType::DigestMd5 => Box::new(MetaPluginProgram::new("md5sum", vec![], "digest_md5".to_string(), true)),
|
||||||
MetaPluginType::ReadTime => Box::new(ReadTimeMetaPlugin::new()),
|
MetaPluginType::ReadTime => Box::new(ReadTimeMetaPlugin::new()),
|
||||||
MetaPluginType::ReadRate => Box::new(ReadRateMetaPlugin::new()),
|
MetaPluginType::ReadRate => Box::new(ReadRateMetaPlugin::new()),
|
||||||
|
MetaPluginType::Hostname => Box::new(HostnameMetaPlugin::new()),
|
||||||
|
MetaPluginType::FullHostname => Box::new(FullHostnameMetaPlugin::new()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
110
src/meta_plugin/basic.rs
Normal file
110
src/meta_plugin/basic.rs
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
use anyhow::Result;
|
||||||
|
use gethostname::gethostname;
|
||||||
|
use std::io;
|
||||||
|
use std::io::Write;
|
||||||
|
use local_ip_address::local_ip;
|
||||||
|
use dns_lookup::lookup_addr;
|
||||||
|
|
||||||
|
use crate::meta_plugin::MetaPlugin;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default)]
|
||||||
|
pub struct HostnameMetaPlugin {
|
||||||
|
meta_name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HostnameMetaPlugin {
|
||||||
|
pub fn new() -> HostnameMetaPlugin {
|
||||||
|
HostnameMetaPlugin {
|
||||||
|
meta_name: "hostname".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MetaPlugin for HostnameMetaPlugin {
|
||||||
|
fn create(&self) -> Result<Box<dyn Write>> {
|
||||||
|
// For meta plugins, we don't actually create a writer since we're buffering data internally
|
||||||
|
Ok(Box::new(DummyWriter))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn finalize(&mut self) -> io::Result<String> {
|
||||||
|
match gethostname().into_string() {
|
||||||
|
Ok(hostname) => Ok(hostname),
|
||||||
|
Err(_) => Ok("unknown".to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update(&mut self, _data: &[u8]) {
|
||||||
|
// No update needed for hostname
|
||||||
|
}
|
||||||
|
|
||||||
|
fn meta_name(&mut self) -> String {
|
||||||
|
self.meta_name.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default)]
|
||||||
|
pub struct FullHostnameMetaPlugin {
|
||||||
|
meta_name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FullHostnameMetaPlugin {
|
||||||
|
pub fn new() -> FullHostnameMetaPlugin {
|
||||||
|
FullHostnameMetaPlugin {
|
||||||
|
meta_name: "full_hostname".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MetaPlugin for FullHostnameMetaPlugin {
|
||||||
|
fn create(&self) -> Result<Box<dyn Write>> {
|
||||||
|
// For meta plugins, we don't actually create a writer since we're buffering data internally
|
||||||
|
Ok(Box::new(DummyWriter))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn finalize(&mut self) -> io::Result<String> {
|
||||||
|
// Try to get the FQDN through reverse DNS lookup
|
||||||
|
match local_ip() {
|
||||||
|
Ok(my_local_ip) => {
|
||||||
|
match lookup_addr(&my_local_ip) {
|
||||||
|
Ok(hostname) => Ok(hostname),
|
||||||
|
Err(_) => {
|
||||||
|
// Fall back to regular hostname if reverse DNS fails
|
||||||
|
match gethostname().into_string() {
|
||||||
|
Ok(hostname) => Ok(hostname),
|
||||||
|
Err(_) => Ok("unknown".to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
// Fall back to regular hostname if we can't get local IP
|
||||||
|
match gethostname().into_string() {
|
||||||
|
Ok(hostname) => Ok(hostname),
|
||||||
|
Err(_) => Ok("unknown".to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn update(&mut self, _data: &[u8]) {
|
||||||
|
// No update needed for full hostname
|
||||||
|
}
|
||||||
|
|
||||||
|
fn meta_name(&mut self) -> String {
|
||||||
|
self.meta_name.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dummy writer that implements Write but doesn't do anything
|
||||||
|
// This is needed to satisfy the MetaPlugin trait requirements
|
||||||
|
struct DummyWriter;
|
||||||
|
|
||||||
|
impl Write for DummyWriter {
|
||||||
|
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
||||||
|
Ok(buf.len())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn flush(&mut self) -> io::Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -172,10 +172,16 @@ pub fn mode_save(
|
|||||||
for meta_plugin in meta_plugins.iter_mut() {
|
for meta_plugin in meta_plugins.iter_mut() {
|
||||||
let meta_name = meta_plugin.meta_name();
|
let meta_name = meta_plugin.meta_name();
|
||||||
|
|
||||||
// TODO: Add error handling instead of unwrap.
|
match meta_plugin.finalize() {
|
||||||
let meta_value = meta_plugin.finalize().unwrap();
|
Ok(meta_value) => {
|
||||||
|
if let Err(e) = store_item_meta_value(conn, item.clone(), meta_name, meta_value) {
|
||||||
store_item_meta_value(conn, item.clone(), meta_name, meta_value)?;
|
eprintln!("Warning: Failed to store meta value for {}: {}", meta_name, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
eprintln!("Warning: Failed to finalize meta plugin {}: {}", meta_name, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
db::update_item(conn, item.clone())?;
|
db::update_item(conn, item.clone())?;
|
||||||
|
|||||||
Reference in New Issue
Block a user