Add semver dependency to proper validation & ordering

Author: markcda

Cargo.toml

@@ -22,6 +22,7 @@ nix = { optional = true, version = "0.29", features = ["signal", "user"] }
 notify = "8.0"
 regex = "1.11"
 russh = { optional = true, version = "0.49" }
+semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = { git = "https://github.com/markcda/serde-yaml.git", tag = "0.9.36" }

src/entities/info.rs

@@ -117,18 +117,14 @@ impl Serialize for Info {
 
 static SHORT_NAME_VALIDATOR: LazyLock<Regex> = LazyLock::new(|| Regex::new("^[a-zA-Z_0-9-_]*$").unwrap());
 
-static VERSION_VALIDATOR: LazyLock<Regex> = LazyLock::new(|| {
-  Regex::new(r#"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"#).unwrap()
-});
-
 /// Validates the short name.
 pub fn validate_short_name(short_name: &str) -> bool {
   SHORT_NAME_VALIDATOR.is_match(short_name)
 }
 
 /// Validates the version.
 pub fn validate_version(version: &str) -> bool {
-  if !VERSION_VALIDATOR.is_match(version) {
+  if semver::Version::parse(version).is_err() {
     log(format!(
       "Version `{version}` is invalid! You should specify `SemVer 2.0` version."
     ));

src/storage.rs

@@ -1,16 +1,16 @@
 //! Storage module.
 
-use anyhow::bail;
+use anyhow::{Context, anyhow, bail};
 #[cfg(feature = "tui")]
 use colored::Colorize;
 use std::path::{Path, PathBuf};
 
-use crate::STORAGE_DIR;
 use crate::entities::info::ContentInfo;
 #[cfg(feature = "tui")]
 use crate::entities::info::ShortName;
 use crate::i18n;
 use crate::rw::copy_all;
+use crate::{STORAGE_DIR, hmap};
 
 /// Environment variable name.
 pub const CUSTOM_STORAGE_PATH: &str = "DEPLOYER_STORAGE_PATH";
@@ -116,12 +116,17 @@ pub fn use_from_storage(storage_dir: &Path, build_dir: &Path, content_info: &Con
     }
     copy_all(&content_path, &content_path, build_dir, &[""])?;
   } else {
-    let mut versions = vec![];
+    let mut versions = hmap!();
     for entry in std::fs::read_dir(&content_path)? {
       let entry = entry?;
-      let name = entry.file_name().to_str().unwrap().to_owned();
+      let name = entry.file_name().to_string_lossy().to_string();
       if name.starts_with(content_info.short_name()) {
-        versions.push(name);
+        let version = name
+          .split('@')
+          .next_back()
+          .ok_or(anyhow!("There is no version spec in folder name!"))?;
+        let version = semver::Version::parse(version).context("Can't parse version as SemVer!")?;
+        versions.insert(version, name);
       }
     }
     if versions.is_empty() {
@@ -132,7 +137,8 @@ pub fn use_from_storage(storage_dir: &Path, build_dir: &Path, content_info: &Con
         i18n::CONTENT_CONSIDER_ADD
       )
     }
-    let max = versions.iter().max().unwrap();
+    let max = versions.keys().max().ok_or(anyhow!("No version available!"))?;
+    let max = versions.get(max).ok_or(anyhow!("No version available!"))?;
 
     crate::rw::log(format!("Decided to choose `{max}` from `latest`."));
     content_path.push(max);