fix: save image metadata (#7)

* fix: clyppy

* fix: create image metadata directory

* build: bump version

Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["easymikey <[email protected]>"]
 edition = "2021"
 name = "lxc-tool"
-version = "0.1.0"
+version = "0.1.1"
 
 [profile.release]
 lto = true

src/config.rs

@@ -77,10 +77,7 @@ impl Iterator for ImageFilterIntoIterator {
         ];
 
         let result = match image_filter_slice.get(self.index) {
-            Some((key, value)) => match value {
-                Some(value) => (key.to_string(), value.to_string()),
-                None => return None,
-            },
+            Some((key, Some(value))) => (key.to_string(), value.to_string()),
             _ => return None,
         };
 

src/repodata/lxc_image_download.rs

@@ -1,7 +1,6 @@
 use anyhow::{anyhow, Result};
 use futures_util::StreamExt;
 use indicatif::{ProgressBar, ProgressStyle};
-use reqwest;
 use slog_scope::info;
 use std::{cmp::min, io::Write};
 use tempfile::{Builder, NamedTempFile};

src/repodata/lxc_image_metadata.rs

@@ -60,7 +60,7 @@ impl FilterBy for Vec<LXCImageMetadata> {
         image_filters: Vec<ImageFilter>,
     ) -> Result<Vec<(LXCImageMetadata, Option<PathBuf>)>> {
         let filtered_containers: Vec<_> = self
-            .into_iter()
+            .iter()
             .flat_map(|lxc_container_metadata| {
                 image_filters
                     .iter()
@@ -82,7 +82,7 @@ impl FilterBy for Vec<LXCImageMetadata> {
             })
             .collect();
 
-        if filtered_containers.len() != 0 {
+        if !filtered_containers.is_empty() {
             Ok(filtered_containers)
         } else {
             bail!("Filter LXC images failed. Filter images error. Images is equal 0.")

src/repodata/lxc_image_metadata_collection.rs

@@ -21,7 +21,7 @@ impl LXCImageMetadataCollection {
             .text()
             .await?
             .lines()
-            .filter_map(|line| Some(LXCImageMetadata::of_metadata(line)))
+            .map(LXCImageMetadata::of_metadata)
             .collect::<Result<Vec<_>>>()?;
 
         info!("Download LXC images metadata from '{}' done.", self.url);

src/repodata/lxc_image_metadata_save.rs

@@ -5,7 +5,7 @@ use nix::unistd;
 use pwd::Passwd;
 use slog_scope::info;
 use std::{
-    fs::{copy, File},
+    fs::{self, File},
     io::Write,
     path::PathBuf,
     time::Duration,
@@ -20,6 +20,13 @@ pub fn save_image_metadata(
     info!("Save LXC image metadata started.");
 
     let image_metadata_path = root_dir.join(&metadata_path);
+
+    if let Some(parent_dir_path) = &image_metadata_path.parent() {
+        if !parent_dir_path.exists() {
+            fs::create_dir_all(parent_dir_path)?;
+        }
+    }
+
     let mut file = File::create(&image_metadata_path)?;
 
     image_entries.sort_by(|a, b| a.0.name.cmp(&b.0.name).reverse());
@@ -51,7 +58,7 @@ pub fn save_image_metadata(
 
     let copy_image_metadata_path = image_metadata_path.with_extension("7");
 
-    copy(&image_metadata_path, &copy_image_metadata_path)?;
+    fs::copy(&image_metadata_path, &copy_image_metadata_path)?;
 
     match Passwd::from_name(&username)? {
         Some(passwd) => {

src/repodata/lxc_image_patch.rs

@@ -30,7 +30,7 @@ pub fn patch_image(
         );
     }
 
-    let mut child = Command::new(&path_to_script)
+    let mut child = Command::new(path_to_script)
         .args(["-path", tempfile])
         .args(["-d", &metadata.dist])
         .args(["-r", &metadata.release])

src/repodata/mod.rs

@@ -39,20 +39,21 @@ pub async fn download_images(config: config::Config) -> Result<()> {
             continue;
         }
 
-        fs::create_dir_all(&image_dir_path)?;
+        fs::create_dir_all(image_dir_path)?;
 
         for image_file in &config.repodata.image_files {
+            let image_dir = lxc_image_metadata.path.to_str().ok_or_else(|| {
+                anyhow!(
+                    "Download LXC image failed. Convert path to string error. Path: {:?}",
+                    lxc_image_metadata.path
+                )
+            })?;
             let download_url = config
                 .repodata
                 .target_url
                 .origin
-                .join(&lxc_image_metadata.path.to_str().ok_or_else(|| {
-                    anyhow!(
-                        "Download LXC image failed. Convert path to string error. Path: {:?}",
-                        lxc_image_metadata.path
-                    )
-                })?)?
-                .join(&image_file)?;
+                .join(image_dir)?
+                .join(image_file)?;
             let tempfile = download_image(download_url).await?;
 
             if image_file == "rootfs.tar.xz" {
@@ -70,7 +71,7 @@ pub async fn download_images(config: config::Config) -> Result<()> {
             tempfile.as_file().metadata()?.permissions().set_mode(0o644);
         }
 
-        fs::rename(&image_tempdir_path, &image_dir_path)?;
+        fs::rename(&image_tempdir_path, image_dir_path)?;
         image_dir_path.metadata()?.permissions().set_mode(0o755);
     }