Merge pull request #86 from OsuSync/fix-bugs

Fix bugs

Author: Deliay

Sync/Plugins/PluginManager.cs

@@ -355,6 +355,10 @@ internal int LoadPlugins()
                         allList.Add(it);
                     }
                 }
+                catch (FileNotFoundException e)
+                {
+                    CheckUnknownDependency(e.FileName.Substring(0, e.FileName.IndexOf(",") - 1));
+                }
                 catch (Exception e)
                 {
                     //Not up to date
@@ -386,16 +390,25 @@ private List<Type> layerLoader(IList<Type> asmList)
             {
                 try
                 {
-                    var deps = it.GetCustomAttributes<SyncPluginDependency>();
+                    var hardDeps = it.GetCustomAttributes<SyncPluginDependency>();
 
-                    foreach (var item in deps)
+                    foreach (var item in hardDeps)
                     {
                         var target = allList.Select(p => p.GetCustomAttribute<SyncPluginID>())?.FirstOrDefault(p => p?.GUID == item.GUID);
                         if (item.Require && target == null) CheckGUIDUpdate(item);
                         if (item.Version == null) continue;
                         if (!CompareVersion(item.Version, target.Version)) CheckGUIDUpdate(item);
                     }
 
+                    var softDeps = it.GetCustomAttributes<SyncSoftRequirePlugin>();
+                    foreach (var item in softDeps)
+                    {
+                        foreach (var dep in item.RequirePluguins)
+                        {
+                            if (!allList.Any(p => p.Name.Contains(dep) || dep.Contains(p.Name))) CheckUnknownDependency(dep);
+                        }
+                    }
+
                     if (LateLoad(it))
                     {
 #if (DEBUG)
@@ -538,6 +551,19 @@ public static bool CompareVersion(string a, string b)
             return converter(null);
         }
 
+        private void CheckUnknownDependency(string name)
+        {
+            if (Updater.update.InstallByKeyword(name, false))
+            {
+                SyncHost.Instance.ForceRestartSync();
+                throw new SyncPluginOutdateException($"Need restart application to update {name}");
+            }
+            else
+            {
+                throw new SyncMissingPluginException($"Can't install dependency plugin: {name}");
+            }
+        }
+
         private void CheckGUIDUpdate(SyncPluginDependency item)
         {
             if (Updater.update.InternalUpdate(item.GUID, true))
@@ -634,4 +660,4 @@ public class SyncPluginDependency : Attribute
 
         public SyncPluginDependency(string guid) => GUID = guid;
     }
-}
+}

Sync/Tools/Builtin/PluginCommand.cs

@@ -112,10 +112,11 @@ private bool AskAgreeUpdate(UpdateData data)
         public bool ShouldDownloadUpdate(UpdateData update_data, string current_file_path, bool no_ask)
         {
             //todo : version compare
+            if (!File.Exists(current_file_path)) { return true; }
 
             var current_file_hash = MD5HashFile(current_file_path).ToLower();
 
-            return ((!File.Exists(current_file_path) || current_file_hash != update_data.latestHash) && AskAgreeUpdate(update_data));
+            return (current_file_hash != update_data.latestHash) && AskAgreeUpdate(update_data);
         }
 
         internal bool InternalUpdate(string plugin_guid, bool no_ask)
@@ -144,7 +145,7 @@ internal bool InternalUpdate(string plugin_guid, bool no_ask)
             }
             catch (Exception e)
             {
-                IO.CurrentIO.WriteColor(string.Format(LANG_UPDATE_ERROR, e.TargetSite.Name, e.Message), ConsoleColor.Red);
+                IO.CurrentIO.WriteColor(string.Format(LANG_UPDATE_ERROR, e.TargetSite.Name, e.Message), ConsoleColor.Yellow);
             }
 
             return false;
@@ -211,6 +212,20 @@ private bool Search(string keyword)
             return false;
         }
 
+        internal bool InstallByKeyword(string keyword, bool requireRestart = true)
+        {
+            if (Serializer<UpdateData[]>($"http://sync.mcbaka.com/api/Update/search/{keyword}") is UpdateData[] datas)
+            {
+                if (datas.Length == 0 || InternalUpdate(datas[0].guid, true))
+                {
+                    if (requireRestart) RequireRestart(LANG_INSTALL_DONE);
+                    return true;
+                }
+                else return false;
+            }
+            return false;
+        }
+
         private bool Install(string guid)
         {
             if (InternalUpdate(guid, true))
@@ -220,16 +235,7 @@ private bool Install(string guid)
             }
             else
             {
-                if (Serializer<UpdateData[]>($"http://sync.mcbaka.com/api/Update/search/{guid}") is UpdateData[] datas)
-                {
-                    if (datas.Length == 0 || InternalUpdate(datas[0].guid, true))
-                    {
-                        RequireRestart(LANG_INSTALL_DONE);
-                        return true;
-                    }
-                    else return false;
-                }
-                return false;
+                return InstallByKeyword(guid);
             }
         }
 
@@ -443,4 +449,4 @@ private bool DownloadSingleFile(string dlUrl, string path, string name)
             }
         }
     }
-}
+}