get_version_from_cache_path

src/dfx-core/src/config/cache.rs

@@ -2,13 +2,13 @@
 use crate::config::directories::project_dirs;
 use crate::error::cache::{
     DeleteCacheError, EnsureCacheVersionsDirError, GetBinaryCommandPathError, GetCacheRootError,
-    IsCacheInstalledError, ListCacheVersionsError,
+    GetVersionFromCachePathError, IsCacheInstalledError, ListCacheVersionsError,
 };
 #[cfg(not(windows))]
 use crate::foundation::get_user_home;
 use crate::fs::composite::ensure_dir_exists;
 use semver::Version;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 pub trait Cache {
     fn version_str(&self) -> String;
@@ -50,6 +50,21 @@ pub fn get_cache_path_for_version(v: &str) -> Result<PathBuf, GetCacheRootError>
     Ok(p)
 }
 
+pub fn get_version_from_cache_path(
+    cache_path: &Path,
+) -> Result<Version, GetVersionFromCachePathError> {
+    let version = cache_path
+        .file_name()
+        .ok_or(GetVersionFromCachePathError::NoCachePathFilename(
+            cache_path.to_path_buf(),
+        ))?
+        .to_str()
+        .ok_or(GetVersionFromCachePathError::CachePathFilenameNotUtf8(
+            cache_path.to_path_buf(),
+        ))?;
+    Ok(Version::parse(version)?)
+}
+
 /// Return the binary cache root. It constructs it if not present
 /// already.
 pub fn ensure_cache_versions_dir() -> Result<PathBuf, EnsureCacheVersionsDirError> {

src/dfx-core/src/error/cache.rs

@@ -5,6 +5,7 @@ use crate::error::fs::{
 };
 use crate::error::get_current_exe::GetCurrentExeError;
 use crate::error::get_user_home::GetUserHomeError;
+use std::path::PathBuf;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -34,6 +35,18 @@ pub enum EnsureCacheVersionsDirError {
     GetCacheRoot(#[from] GetCacheRootError),
 }
 
+#[derive(Error, Debug)]
+pub enum GetVersionFromCachePathError {
+    #[error("no filename in cache path '{0}'")]
+    NoCachePathFilename(PathBuf),
+
+    #[error("filename in cache path '{0}' is not valid UTF-8")]
+    CachePathFilenameNotUtf8(PathBuf),
+
+    #[error("cannot parse version from cache path filename")]
+    ParseVersion(#[from] semver::Error),
+}
+
 #[derive(Error, Debug)]
 pub enum GetCacheRootError {
     #[error(transparent)]

src/dfx-core/src/error/interface.rs

@@ -1,17 +1,11 @@
+use crate::error::cache::GetVersionFromCachePathError;
 use crate::error::extension::NewExtensionManagerError;
-use std::path::PathBuf;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum NewExtensionManagerFromCachePathError {
-    #[error("no filename in cache path '{0}'")]
-    NoCachePathFilename(PathBuf),
-
-    #[error("filename in cache path '{0}' is not valid UTF-8")]
-    CachePathFilenameNotUtf8(PathBuf),
-
-    #[error("cannot parse version from cache path filename")]
-    ParseVersion(#[from] semver::Error),
+    #[error(transparent)]
+    GetVersionFromCachePath(#[from] GetVersionFromCachePathError),
 
     #[error(transparent)]
     NewExtensionManager(#[from] NewExtensionManagerError),

src/dfx-core/src/interface/builder.rs

@@ -1,3 +1,4 @@
+use crate::config::cache::get_version_from_cache_path;
 use crate::error::extension::NewExtensionManagerError;
 use crate::error::interface::NewExtensionManagerFromCachePathError;
 use crate::extension::manager::ExtensionManager;
@@ -100,20 +101,7 @@ impl DfxInterfaceBuilder {
         self,
         cache_path: &Path,
     ) -> Result<Self, NewExtensionManagerFromCachePathError> {
-        let version = {
-            let version = cache_path
-                .file_name()
-                .ok_or(NewExtensionManagerFromCachePathError::NoCachePathFilename(
-                    cache_path.to_path_buf(),
-                ))?
-                .to_str()
-                .ok_or(
-                    NewExtensionManagerFromCachePathError::CachePathFilenameNotUtf8(
-                        cache_path.to_path_buf(),
-                    ),
-                )?;
-            Version::parse(version)?
-        };
+        let version = get_version_from_cache_path(cache_path)?;
 
         Ok(self.with_extension_manager(version)?)
     }