Skip to content

fix(config): fix plugin file path generation and parsing bugs #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RWDai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(config): fix plugin file path generation and parsing bugs #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions crates/config/src/service/fs/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ where
// collect plugin
if let Ok(mut plugin_dir) = tokio::fs::read_dir(self.plugin_dir()).await.inspect_err(|e| tracing::debug!("fail to read plugin dir {e}")) {
while let Some(entry) = plugin_dir.next_entry().await? {
let Ok(file_name) = entry.file_name().into_string() else {
let path = entry.path();
let Some(file_stem) = path.file_stem().and_then(OsStr::to_str) else {
continue;
};
let plugin_id = PluginInstanceId::from_file_stem(&file_name);
let spec: serde_json::Value = self.format.de(&tokio::fs::read(entry.path()).await?)?;
let plugin_id = PluginInstanceId::from_file_stem(file_stem);
let spec: serde_json::Value = self.format.de(&tokio::fs::read(&path).await?)?;
config.plugins.insert(plugin_id, spec);
}
};
Expand Down Expand Up @@ -224,7 +225,8 @@ where

pub fn plugin_path(&self, id: &PluginInstanceId) -> PathBuf {
let file_stem = id.as_file_stem();
self.plugin_dir().join(file_stem).with_extension(self.format.extension())
let ext = self.format.extension().to_str().unwrap_or("json");
self.plugin_dir().join(format!("{}.{}", file_stem, ext))
}
pub fn extract_gateway_name_from_route_dir(&self, path: &Path) -> Option<String> {
if path.extension()? == OsStr::from_bytes(ROUTE_DIR.as_bytes()) {
Expand Down
Loading