Cleanup: 代码整理

chenjiandongx · Mar 19, 2022 · aeedbf8 · aeedbf8
1 parent e31fb81
commit aeedbf8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 34 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -1,10 +1,7 @@
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use serde_yaml::Value;
-use std::{
-    fs::File,
-    path::{Path, PathBuf},
-};
+use std::fs::File;
 
 #[derive(Debug, Clone, Default, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -44,9 +41,7 @@ impl Author {
 #[derive(Debug, Clone, Default, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Database {
-    pub table_name: String,
-    pub base_dir: String,
-    pub source: String,
+    pub path: String,
     pub files: Option<Vec<String>>,
     pub repos: Option<Vec<Repository>>,
 }
@@ -69,16 +64,6 @@ impl Database {
     }
 }
 
-impl Database {
-    pub fn location(&self, ext: String) -> PathBuf {
-        Path::new(self.base_dir.as_str()).join(format!(
-            "{}.{}",
-            self.table_name.clone(),
-            ext.as_str()
-        ))
-    }
-}
-
 #[derive(Debug, Clone, Default, Deserialize)]
 pub struct FetchAction {
     pub github: Option<Vec<Github>>,
@@ -87,7 +72,7 @@ pub struct FetchAction {
 #[derive(Debug, Clone, Default, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Github {
-    pub base_dir: String,
+    pub clone_dir: String,
     pub destination: String,
     pub token: String,
     pub exclude_orgs: Option<Vec<String>>,

diff --git a/src/fetcher.rs b/src/fetcher.rs
@@ -141,7 +141,7 @@ impl GithubRepoFetcher {
                         name: name.clone(),
                         branch: Some(repo.default_branch),
                         remote: Some(repo.clone_url),
-                        path: Path::new(&config.base_dir.clone())
+                        path: Path::new(&config.clone_dir)
                             .join(Path::new(&name))
                             .to_str()
                             .unwrap()

diff --git a/src/record.rs b/src/record.rs
@@ -41,7 +41,6 @@ fn datetime_rfc339(datetime: &str) -> String {
 /// 定义 Record 序列化接口
 #[async_trait]
 pub trait RecordSerializer {
-    fn extension(&self) -> String;
     async fn serialize(&self, config: CreateAction) -> Result<()>;
 }
 
@@ -50,7 +49,6 @@ static FLUSH_SIZE: usize = 500;
 
 async fn persist_records<T: 'static + Gitter + Clone>(
     gitter: T,
-    ext: String,
     database: Database,
     author_mappings: Vec<AuthorMapping>,
 ) -> Result<()> {
@@ -140,7 +138,7 @@ async fn persist_records<T: 'static + Gitter + Clone>(
     }
 
     let rev = tokio::spawn(async move {
-        let mut wtr = csv::Writer::from_path(database.location(ext)).unwrap();
+        let mut wtr = csv::Writer::from_path(database.path).unwrap();
         let mut n: usize = 0;
 
         while let Some(record) = rx.recv().await {
@@ -187,26 +185,16 @@ impl<T> CsvSerializer<T> {
 
 #[async_trait]
 impl<T: 'static + Gitter + Clone> RecordSerializer for CsvSerializer<T> {
-    fn extension(&self) -> String {
-        String::from("csv")
-    }
-
     async fn serialize(&self, config: CreateAction) -> Result<()> {
         let mut handles = vec![];
         for database in config.databases {
             let gitter = self.gitter.clone();
-            let extension = self.extension();
             let database = database.clone();
             let author_mappings = config.author_mappings.clone();
 
             let handle = tokio::spawn(async move {
-                let r = persist_records(
-                    gitter,
-                    extension,
-                    database,
-                    author_mappings.unwrap_or_default(),
-                )
-                .await;
+                let r =
+                    persist_records(gitter, database, author_mappings.unwrap_or_default()).await;
                 if let Err(e) = r {
                     error!("Failed to persist records, error: {}", e);
                     exit(1)