Extract to function cargo_manifest_and_lock

Author: Legend-Master

crates/tauri-cli/src/helpers/cargo_manifest.rs

@@ -10,6 +10,8 @@ use std::{
   path::{Path, PathBuf},
 };
 
+use crate::interface::rust::get_workspace_dir;
+
 #[derive(Clone, Deserialize)]
 pub struct CargoLockPackage {
   pub name: String,
@@ -49,6 +51,18 @@ pub struct CargoManifest {
   pub dependencies: HashMap<String, CargoManifestDependency>,
 }
 
+pub fn cargo_manifest_and_lock(tauri_dir: &Path) -> (Option<CargoManifest>, Option<CargoLock>) {
+  let manifest: Option<CargoManifest> = fs::read_to_string(tauri_dir.join("Cargo.toml"))
+    .ok()
+    .and_then(|manifest_contents| toml::from_str(&manifest_contents).ok());
+
+  let lock: Option<CargoLock> = get_workspace_dir()
+    .ok()
+    .and_then(|p| fs::read_to_string(p.join("Cargo.lock")).ok())
+    .and_then(|s| toml::from_str(&s).ok());
+
+  (manifest, lock)
+}
 #[derive(Default)]
 pub struct CrateVersion {
   pub version: Option<String>,

crates/tauri-cli/src/info/packages_rust.rs

@@ -3,32 +3,18 @@
 // SPDX-License-Identifier: MIT
 
 use super::{ActionResult, SectionItem};
-use crate::{
-  helpers::cargo_manifest::{
-    crate_latest_version, crate_version, CargoLock, CargoManifest, CrateVersion,
-  },
-  interface::rust::get_workspace_dir,
+use crate::helpers::cargo_manifest::{
+  cargo_manifest_and_lock, crate_latest_version, crate_version, CrateVersion,
 };
 use colored::Colorize;
-use std::fs::read_to_string;
 use std::path::{Path, PathBuf};
 
 pub fn items(frontend_dir: Option<&PathBuf>, tauri_dir: Option<&Path>) -> Vec<SectionItem> {
   let mut items = Vec::new();
 
   if tauri_dir.is_some() || frontend_dir.is_some() {
     if let Some(tauri_dir) = tauri_dir {
-      let manifest: Option<CargoManifest> =
-        if let Ok(manifest_contents) = read_to_string(tauri_dir.join("Cargo.toml")) {
-          toml::from_str(&manifest_contents).ok()
-        } else {
-          None
-        };
-      let lock: Option<CargoLock> = get_workspace_dir()
-        .ok()
-        .and_then(|p| read_to_string(p.join("Cargo.lock")).ok())
-        .and_then(|s| toml::from_str(&s).ok());
-
+      let (manifest, lock) = cargo_manifest_and_lock(tauri_dir);
       for dep in ["tauri", "tauri-build", "wry", "tao"] {
         let crate_version = crate_version(tauri_dir, manifest.as_ref(), lock.as_ref(), dep);
         let item = rust_section_item(dep, crate_version);

crates/tauri-cli/src/info/plugins.rs

@@ -4,17 +4,14 @@
 
 use std::{
   collections::HashMap,
-  fs, iter,
+  iter,
   path::{Path, PathBuf},
 };
 
-use crate::{
-  helpers::{
-    self,
-    cargo_manifest::{crate_version, CargoLock, CargoManifest},
-    npm::PackageManager,
-  },
-  interface::rust::get_workspace_dir,
+use crate::helpers::{
+  self,
+  cargo_manifest::{cargo_manifest_and_lock, crate_version},
+  npm::PackageManager,
 };
 
 use super::{packages_nodejs, packages_rust, SectionItem};
@@ -48,18 +45,6 @@ pub fn installed_tauri_packages(
   tauri_dir: &Path,
   package_manager: PackageManager,
 ) -> InstalledPackages {
-  let manifest: Option<CargoManifest> =
-    if let Ok(manifest_contents) = fs::read_to_string(tauri_dir.join("Cargo.toml")) {
-      toml::from_str(&manifest_contents).ok()
-    } else {
-      None
-    };
-
-  let lock: Option<CargoLock> = get_workspace_dir()
-    .ok()
-    .and_then(|p| fs::read_to_string(p.join("Cargo.lock")).ok())
-    .and_then(|s| toml::from_str(&s).ok());
-
   let know_plugins = helpers::plugins::known_plugins();
   let crate_names: Vec<String> = iter::once("tauri".to_owned())
     .chain(
@@ -76,6 +61,8 @@ pub fn installed_tauri_packages(
     )
     .collect();
 
+  let (manifest, lock) = cargo_manifest_and_lock(tauri_dir);
+
   let mut rust_plugins: HashMap<String, semver::Version> = crate_names
     .iter()
     .filter_map(|crate_name| {
@@ -121,17 +108,7 @@ pub fn items(
 
   if tauri_dir.is_some() || frontend_dir.is_some() {
     if let Some(tauri_dir) = tauri_dir {
-      let manifest: Option<CargoManifest> =
-        if let Ok(manifest_contents) = fs::read_to_string(tauri_dir.join("Cargo.toml")) {
-          toml::from_str(&manifest_contents).ok()
-        } else {
-          None
-        };
-
-      let lock: Option<CargoLock> = get_workspace_dir()
-        .ok()
-        .and_then(|p| fs::read_to_string(p.join("Cargo.lock")).ok())
-        .and_then(|s| toml::from_str(&s).ok());
+      let (manifest, lock) = cargo_manifest_and_lock(tauri_dir);
 
       for p in helpers::plugins::known_plugins().keys() {
         let dep = format!("tauri-plugin-{p}");