feat: replace filters with filtered_query_params (dragonflyoss#233)

Signed-off-by: Gaius <gaius.qi@gmail.com>

Cargo.toml

@@ -56,7 +56,7 @@ local-ip-address = "0.5.3"
 rocksdb = "0.21.0"
 num_cpus = "1.0"
 chrono = { version = "0.4.26", features = ["serde"] }
-dragonfly-api = "2.0.84"
+dragonfly-api = "2.0.85"
 sysinfo = "0.29.6"
 sha2 = "0.10"
 hex = "0.4"

src/bin/dfget/main.rs

@@ -121,11 +121,11 @@ struct Args {
     header: Option<Vec<String>>,
 
     #[arg(
-        long = "filter",
+        long = "filtered-query-param",
         required = false,
-        help = "Filter the query parameters of the downloaded URL. If the download URL is the same, it will be scheduled as the same task, e.g. --filter='signature' --filter='timeout'"
+        help = "Filter the query parameters of the downloaded URL. If the download URL is the same, it will be scheduled as the same task, e.g. --filtered-query-param='signature' --filtered-query-param='timeout'"
     )]
-    filters: Option<Vec<String>>,
+    filtered_query_params: Option<Vec<String>>,
 
     #[arg(
         long = "disable-back-to-source",
@@ -242,7 +242,7 @@ async fn main() -> Result<(), anyhow::Error> {
                 tag: Some(args.tag),
                 application: Some(args.application),
                 priority: args.priority,
-                filters: args.filters.unwrap_or_default(),
+                filtered_query_params: args.filtered_query_params.unwrap_or_default(),
                 request_header: header_vec_to_hashmap(args.header.unwrap_or_default())?,
                 piece_length: args.piece_length,
                 output_path: Some(args.output.into_os_string().into_string().unwrap()),

src/grpc/dfdaemon_download.rs

@@ -164,7 +164,7 @@ impl DfdaemonDownload for DfdaemonDownloadServerHandler {
                 download.tag.as_deref(),
                 download.application.as_deref(),
                 download.piece_length,
-                download.filters.clone(),
+                download.filtered_query_params.clone(),
             )
             .map_err(|e| {
                 error!("generate task id: {}", e);

src/proxy/mod.rs

@@ -274,7 +274,10 @@ fn make_download_task_request(
             tag: header::get_tag(&header),
             application: header::get_application(&header),
             priority: header::get_priority(&header),
-            filters: header::get_filtered_query_params(&header, rule.filtered_query_params),
+            filtered_query_params: header::get_filtered_query_params(
+                &header,
+                rule.filtered_query_params,
+            ),
             request_header: headermap_to_hashmap(&header),
             piece_length: header::get_piece_length(&header),
             output_path: None,

src/utils/id_generator.rs

@@ -60,13 +60,13 @@ impl IDGenerator {
         tag: Option<&str>,
         application: Option<&str>,
         piece_length: u64,
-        filters: Vec<String>,
+        filtered_query_params: Vec<String>,
     ) -> Result<String> {
         // Filter the query parameters.
         let url = Url::parse(url)?;
         let query = url
             .query_pairs()
-            .filter(|(k, _)| filters.contains(&k.to_string()));
+            .filter(|(k, _)| filtered_query_params.contains(&k.to_string()));
         let mut artifact_url = url.clone();
         artifact_url.query_pairs_mut().clear().extend_pairs(query);