Fix bug with download plugins via config with special version

Author: TOwInOK

settings.toml

@@ -1,8 +1,11 @@
 [core]
 provider = "paper"
-version = "1.20.6"
+version = "1.20.1"
 
 [plugins]
 [plugins.simple-voice-chat]
 [plugins.chunky]
 [plugins.discordsrv]
+
+[additions]
+# log_level = ""

src/errors/error.rs

@@ -98,7 +98,7 @@ macro_rules! not_found_build_error {
 macro_rules! not_found_version_error {
     ($arg:tt) => {
         Err(Error::NotFound(format!(
-            "No one version ->{:#?}<- find",
+            "No one version ->{:?}<- find",
             $arg
         )))
     };

src/main.rs

@@ -19,9 +19,7 @@ use settings::Settings;
 use tokio::sync::{Mutex, RwLock};
 
 static DICTIONARY: Lazy<MessageDictionary> = Lazy::new(|| MessageDictionary::get_dict().unwrap());
-
 static MPB: Lazy<Arc<MultiProgress>> = Lazy::new(|| Arc::new(MultiProgress::new()));
-
 static SETTINGS: Lazy<Arc<RwLock<Settings>>> = Lazy::new(|| load_settings().unwrap());
 static LOCK: Lazy<Arc<Mutex<Lock>>> = Lazy::new(|| load_lock().unwrap());
 

src/manager/download.rs

@@ -22,7 +22,10 @@ pub async fn download(key: Arc<CancellationToken>) -> Result<()> {
         '_core_scope: {
             tokio::spawn(async move {
                 let settings = SETTINGS.read().await;
-                settings.core().download().await
+                settings.core().download().await.map_err(|e| {
+                    error!("Core scope error {:#?}", &e);
+                    e
+                })
             });
         }
         '_plugins_scope: {

src/manager/mod.rs

@@ -27,7 +27,7 @@ use tr::load::Load;
 
 pub async fn run() -> Result<()> {
     let logger = pretty_env_logger::formatted_builder()
-        .filter_level(log::LevelFilter::Info)
+        .filter_level(log::LevelFilter::Debug)
         .build();
 
     '_plugin_folder_scope: {

src/settings/extensions/plugin.rs

@@ -33,8 +33,8 @@ impl Plugin {
         &self.source
     }
 
-    pub fn version(&self) -> Option<&String> {
-        self.version.as_ref()
+    pub fn version(&self) -> Option<&str> {
+        self.version.as_deref()
     }
 
     pub fn channel(&self) -> &Channels {

src/settings/extensions/plugins.rs

@@ -48,13 +48,25 @@ impl Plugins {
             debug!("check meta: {}", &name);
             // Check meta
             if let Some(plugin_meta) = LOCK.lock().await.plugins().get(name) {
-                let local_build = plugin_meta.build();
-                // Need to download?
-                if *local_build == build && !plugin.force_update() || plugin.freeze() {
-                    debug!("Does't need to update: {}", &name);
+                let lock_build = plugin_meta.build();
+                if let Some(version) = plugin.version() {
+                    if version != build || version != lock_build {
+                        debug!(
+                            "{} version in config -> {}, in lock {}, in api {}",
+                            name, version, lock_build, build
+                        );
+                        link_list.push((link, hash, version.to_owned(), name.to_owned(), pb));
+                        continue;
+                    }
+                } else if lock_build == build && (!plugin.force_update() || plugin.freeze()) {
+                    debug!(
+                        "Does't need to update: {} | {} = {}",
+                        &name, &lock_build, &build
+                    );
                     pb.set_message(DICTIONARY.downloader().doest_need_to_update());
                     pb.finish_and_clear();
                     continue;
+                    // Need to download?
                 }
             }
             debug!("add link to list: {}", &name);