modify guess algorithm to use latest OC version if there have been no

config.plist format changes

Author: rusty-bits

Cargo.lock

@@ -2,7 +2,7 @@
 authors = ["rusty-bits <[email protected]>"]
 edition = "2021"
 name = "octool"
-version = "0.4.4"
+version = "0.4.5"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Cargo.toml

@@ -428,18 +428,20 @@ pub fn validate_plist(
 /// run through vec of "config_differences" from tool_config_files/octool_config.json
 /// if the current config.plist being worked on contains the field in the vec then
 /// it is most likely to be the correct version of OpenCore
-pub fn guess_version(resources: &Resources) -> String {
+pub fn guess_version(resources: &Resources) -> (String, bool) {
     let mut found = vec![Found::new()];
     let config_differences: Vec<(String, String, String, String)> =
         serde_json::from_value(resources.config_differences["config_differences"].clone()).unwrap();
 
+    let mut first_diff = true;
     for (sec, sub, search, ver) in config_differences {
         find(&search, &resources.config_plist, &mut found);
         for result in &found {
             if result.keys.contains(&sec) && result.keys.contains(&sub) {
-                return ver.to_owned();
+                return (ver.to_owned(), first_diff);
             }
         }
+        first_diff = false;
     }
-    "".to_string()
+    ("".to_string(), false)
 }

src/init.rs

@@ -26,7 +26,7 @@ use crate::edit::read_key;
 use crate::init::{guess_version, Manifest, Settings};
 use crate::res::Resources;
 
-const OCTOOL_VERSION: &str = &"v0.4.4 2022-07-17";
+const OCTOOL_VERSION: &str = &"v0.4.5 2022-07-22";
 
 fn process(
     config_plist: &mut PathBuf,
@@ -864,7 +864,18 @@ fn main() {
         resources.config_plist = plist::Value::from_file(&config_file)
             .expect(format!("Didn't find valid plist at {:?}", config_file).as_str());
         if &setup.oc_build_version == "latest" {
-            setup.oc_build_version = guess_version(&resources);
+            let first_diff;
+            (setup.oc_build_version, first_diff) = guess_version(&resources);
+            //use the latest version of OpenCore as a guess if there have been no changes to the
+            //config.plist, this makes the assumption that the user wants to keep the OpenCore
+            //version current, they can always use a Manifest or manually use an older version
+            if first_diff {
+                setup.oc_build_version = resources.dortania["OpenCorePkg"]["versions"][0]
+                    ["version"]
+                    .as_str()
+                    .unwrap()
+                    .to_owned();
+            }
             if &setup.oc_build_version == "" {
                 // set to version befoce ocvalidate, maybe do something better in the future
                 setup.oc_build_version = "0.5.9".to_string();

src/main.rs

@@ -1,7 +1,7 @@
 {
   "config_differences": [
     [
-      "Kernel", "Quirks", "ForceAquantiaEthernet", "0.8.2"
+      "Kernel", "Quirks", "ForceAquantiaEthernet", "0.8.0"
     ],
     [
       "Misc", "Debug", "LogModules", "0.7.9"

tool_config_files/config_differences.json

@@ -1,5 +1,5 @@
 {
-  "octool_version": "v0.4.4 2022-07-17",
+  "octool_version": "v0.4.5 2022-07-22",
   "octool_releases_url": "https://github.com/rusty-bits/octool/releases",
   "octool_latest_config_url": "https://raw.githubusercontent.com/rusty-bits/octool/main/tool_config_files/octool_config.json",
   "octool_latest_dyn_res_list_url": "https://raw.githubusercontent.com/rusty-bits/octool/main/tool_config_files/dyn_res_list.zip",
@@ -32,7 +32,7 @@
   "reset_res_versions": true,
 
   "//comm_clob_local": "replace local res list with updated list when octool is run",
-  "clobber_local_dyn_res_list": true,
+  "clobber_local_dyn_res_list": false,
 
   "//comm_build": "set use of either 'X64' or 'IA32' build architecture",
   "build_architecture": "X64",