改一波

Cargo.toml

@@ -19,6 +19,7 @@ tokio = { version = "1.35.1", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = "0.8.8"
+apache-avro = "0.16.0"
 
 md-5 = "0.10.6"
 sha1 = "0.10.6"

src/cluster.rs

@@ -1,7 +1,22 @@
+use crate::utils::avro_data_to_file_list;
 use crate::config::{ClusterByoc, Config};
 use crate::PROTOCOL_VERSION;
 
 use reqwest::{Client, StatusCode};
+use serde::Deserialize;
+use zstd::stream::decode_all;
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct SyncFile {
+    pub path: String,
+    pub hash: String,
+    pub size: i64,
+}
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct SyncFileList {
+    pub files: Vec<SyncFile>,
+}
 
 pub struct Cluster {
     pub config: Config,
@@ -40,7 +55,7 @@ impl Cluster {
     ///     files: FileListSchema.fromBuffer(Buffer.from(decompressed)),
     ///   }
     /// }
-    pub async fn get_file_list(&self) {
+    pub async fn get_file_list(&self) -> Vec<SyncFile> {
         // server: https://openbmclapi.bangbang93.com
         // path: /openbmclapi/files
         let url = format!(
@@ -57,22 +72,26 @@ impl Cluster {
             .basic_auth(username, Some(password))
             .timeout(std::time::Duration::from_secs(60))
             .send()
-            .await
-            .unwrap();
+            .await;
+        if res.is_err() {
+            panic!("get file list error: {:?}", res.err());
+        }
+        let res = res.unwrap();
         match res.status() {
             StatusCode::OK => {
                 let body = res.bytes().await.unwrap();
-                println!("get file list body! len: {}", body.len());
                 let cur = std::io::Cursor::new(body);
-                let data = zstd::decode_all(cur);
-                match data {
-                    Ok(data) => {
-                        println!("file list decompressed! len: {}", data.len());
-                    }
-                    Err(e) => {
-                        panic!("file list decompress faild e:{:?}", e)
-                    }
+                let raw_data = decode_all(cur);
+                if raw_data.is_err() {
+                    panic!("decompress file list error: {:?}", raw_data.err());
                 }
+                let raw_data = raw_data.unwrap();
+                let file_list = avro_data_to_file_list(raw_data);
+                if file_list.is_err() {
+                    panic!("parse file list error: {:?}", file_list.err());
+                }
+                let file_list = file_list.unwrap();
+                file_list
             }
             _ => {
                 panic!("error status: {:?}", res.status());
@@ -85,7 +104,6 @@ impl Cluster {
 mod tests {
     use super::*;
 
-    use serde::Deserialize;
     #[derive(Deserialize)]
     struct TestConfig {
         pub cluster_port: u32,

src/utils.rs

@@ -1,6 +1,12 @@
+use crate::cluster::{SyncFile, SyncFileList};
+
+use std::io::Cursor;
+
 use md5::{Digest, Md5};
 use sha1::Sha1;
 use std::path::PathBuf;
+use apache_avro::{from_value, from_avro_datum};
+
 
 /// import {join} from 'path'
 ///
@@ -46,6 +52,40 @@ pub fn validate_file(buffer: &[u8], check_sum: &str) -> bool {
     }
 }
 
+
+/// BYD avro 格式的文件列表
+pub const SYNC_FILE_LIST_SCHEMA: &str = r#"
+{
+    "type": "array",
+    "items": {
+      "type": "record",
+        "name": "fileinfo",
+      "fields": [
+        {"name": "path", "type": "string"},
+        {"name": "hash", "type": "string"},
+        {"name": "size", "type": "long"}
+      ]
+    }
+}
+"#;
+
+/// 用来将 BYD avro 格式的数据转换成文件列表
+pub fn avro_data_to_file_list(data: Vec<u8>) -> apache_avro::AvroResult<Vec<SyncFile>> {
+    let chema = apache_avro::Schema::parse_str(SYNC_FILE_LIST_SCHEMA).unwrap();
+    let mut cur = Cursor::new(data);
+    let reader = from_avro_datum(&chema, &mut cur, Some(&chema));
+    if reader.is_err() {
+        return Err(reader.err().unwrap());
+    }
+    let files = from_value::<SyncFileList>(&reader.unwrap());
+    if files.is_err() {
+        // return Err(files.err().unwrap());
+        panic!("parse file list error: {:?}", files.err());
+    }
+    let files = files.unwrap();
+    Ok(files.files)
+}
+
 #[test]
 fn test_hash_to_filename() {
     assert_eq!(