From ea48f5d14e366a17152272281e218dde3e9b8bbb Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Fri, 11 Jul 2025 08:36:00 +0100 Subject: [PATCH] Avoid an artificial error scenario --- src/database/mod.rs | 10 +--------- src/metadata/plugin_metadata.rs | 7 +++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/database/mod.rs b/src/database/mod.rs index 8e6ca4b2..2f54cc6f 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -117,15 +117,7 @@ impl Database { let mut doc = MetadataDocument::default(); for plugin in self.masterlist.plugins_iter() { - let Ok(mut minimal_plugin) = PluginMetadata::new(plugin.name()) else { - // This should never happen because the regex plugin name from - // an existing PluginMetadata object should be valid. - logging::error!( - "Unexpectedly encountered a regex error trying to create a PluginMetadata object with the name {}", - plugin.name() - ); - continue; - }; + let mut minimal_plugin = PluginMetadata::with_same_name(plugin); minimal_plugin.set_tags(plugin.tags().to_vec()); minimal_plugin.set_dirty_info(plugin.dirty_info().to_vec()); diff --git a/src/metadata/plugin_metadata.rs b/src/metadata/plugin_metadata.rs index 02f57bc3..ddf68724 100644 --- a/src/metadata/plugin_metadata.rs +++ b/src/metadata/plugin_metadata.rs @@ -45,6 +45,13 @@ impl PluginMetadata { }) } + pub(crate) fn with_same_name(metadata: &PluginMetadata) -> Self { + Self { + name: metadata.name.clone(), + ..Default::default() + } + } + /// Get the plugin name. pub fn name(&self) -> &str { self.name.as_str()