简化包安装代码，不再支持git url依赖

Packages/com.etetet.init/Editor/GitDependencyResolver/DependencyResolver.cs

@@ -18,15 +18,19 @@ namespace Hibzz.DependencyResolver
     public class DependencyResolver
     {
         //[MenuItem("ET/MoveToPackage")]
-        static void MoveToPackage()
+        static void MoveToPackage(string package, string version)
         {
-            Process process = ProcessHelper.PowerShell($"-NoExit -ExecutionPolicy Bypass -File ./Packages/com.etetet.init/MoveToPackages.ps1", waitExit: true);
+            string dir = Path.Combine("Library/PackageCache", $"{package}@{version}");
+            if (!Directory.Exists(dir))
+            {
+                return;
+            }
+        
+            Debug.Log($"move package: {package}@{version}");
+            Process process = ProcessHelper.PowerShell($"-NoExit -ExecutionPolicy Bypass -File ./Packages/com.etetet.init/MoveToPackages.ps1 {package} {version}", waitExit: true);
             Debug.Log(process.StandardOutput.ReadToEnd());
-            AssetDatabase.Refresh();
         }
         
-        static AddAndRemoveRequest packageInstallationRequest;
-
         static DependencyResolver()
         {
             Events.registeredPackages += OnPackagesRegistered;
@@ -35,7 +39,7 @@ namespace Hibzz.DependencyResolver
         // Invoked when the package manager completes registering new packages
         static void OnPackagesRegistered(PackageRegistrationEventArgs packageRegistrationInfo)
         {
-            if (packageRegistrationInfo.added.Count == 0)
+            if (packageRegistrationInfo.added.Count == 0 && packageRegistrationInfo.changedFrom.Count == 0)
             {
                 return;
             }
@@ -45,183 +49,48 @@ namespace Hibzz.DependencyResolver
             // loop through all of the added packages and get their git
             // dependencies and add it to the list that contains all the
             // dependencies that need to be installed
-            Dictionary<string, string> dependencies = new();
-            List<PackageInfo> installedPackages = PackageInfo.GetAllRegisteredPackages().ToList();
             foreach (var package in packageRegistrationInfo.added)
             {
                 if (!package.name.StartsWith("cn.etetet."))
                 {
                     continue;
                 }
-                
-                // get the dependencies of the added package
-                if (!GetDependencies(package, out PackageGit packageDependencies))
-                {
-                    continue;
-                }
-                
-                foreach (var gitDependency in packageDependencies.GitDependencies)
-                {
-                    if (IsInCollection(gitDependency.Key, installedPackages))
-                    {
-                        continue;
-                    }
-                    dependencies[gitDependency.Key] = gitDependency.Value;
-                }
+                MoveToPackage(package.name, package.version);
             }
-
-            // Install the dependencies
-            InstallDependencies(dependencies);
-        }
-
-        /// <summary>
-        /// Request a list of git dependencies in the package
-        /// </summary>
-        /// <param name="packageInfo">The package to get the git dependencies from</param>
-        /// <param name="dependencies">The retrieved list of git dependencies </param>
-        /// <returns>Was the request successful?</returns>
-        static bool GetDependencies(PackageInfo packageInfo, out PackageGit dependencies)
-        {
-            string packageJsonPath = $"{packageInfo.resolvedPath}/packagegit.json";
-
-            if (!File.Exists(packageJsonPath))
-            {
-                throw new Exception($"package already move to packages dir, please refresh your unity project!  RepairDependencies retry please! {packageInfo.name} {packageJsonPath}");
-            }
-            
-            dependencies = PackageGitHelper.Load(packageJsonPath);
             
-            if (dependencies.GitDependencies is null || dependencies.GitDependencies.Count == 0)
-            {
-                return false;
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Is the given dependency url found in the given collection
-        /// </summary>
-        /// <param name="dependency">The url the dependency to check for</param>
-        /// <param name="collection">The collection to look through</param>
-        /// <returns></returns>
-        static bool IsInCollection(string dependency, List<PackageInfo> collection)
-        {
-            // when package collection given is null, it's inferred that the dependency is not in the collection
-            if (collection == null)
-            {
-                return false;
-            }
-
-            // check if any of the installed package has the dependency
-            foreach (var package in collection)
+            foreach (var package in packageRegistrationInfo.changedFrom)
             {
-                // the package id for a package installed with git is `package_name@package_giturl`
-                // get the repo url by performing some string manipulation on the package id
-                //string repourl = package.packageId.Substring(package.packageId.IndexOf('@') + 1);
-
-                // Found!
-                if (package.name == dependency)
+                if (!package.name.StartsWith("cn.etetet."))
                 {
-                    return true;
+                    continue;
                 }
-            }
-
-            // the dependency wasn't found in the package collection
-            return false;
-        }
-
-        /// <summary>
-        /// Install all the given dependencies
-        /// </summary>
-        static void InstallDependencies(Dictionary<string, string> dependencies)
-        {
-            if (dependencies.Count == 0)
-            {
-                MoveToPackage();
-                
-                Debug.Log($"git Dependencies are all installed");
-                return;
-            }
-            
-            // before installing the packages, make sure that user knows what
-            // the dependencies to install are... additionally, check if the
-            // application is being run on batch mode so that we can skip the
-            // installation dialog
-            Debug.Log($"The following dependencies are required:\n{string.Join("\n", dependencies.Keys)}");
-
-            // the user pressed install, perform the actual installation
-            // (or the application was in batch mode)
-            packageInstallationRequest = Client.AddAndRemove(dependencies.Values.ToArray());
-
-            // show the progress bar till the installation is complete
-            EditorUtility.DisplayProgressBar("Dependency Resolver", "Preparing installation of dependencies...", 0);
-            EditorApplication.update += DisplayProgress;
-        }
-
-
-        /// <summary>
-        /// Shows a progress bar till the AddAndRemoveRequest is completed
-        /// </summary>
-        static void DisplayProgress()
-        {
-            if (!packageInstallationRequest.IsCompleted)
-            {
-                return;
+                MoveToPackage(package.name, package.version);
             }
             
-            EditorUtility.ClearProgressBar();
-            EditorApplication.update -= DisplayProgress;
+            AssetDatabase.Refresh();
         }
         
         [MenuItem("ET/Init/RepairDependencies")]
         static void RepairDependencies()
         {
-            MoveToPackage();
-            
-            Dictionary<string, string> dependencies = new();
-            List<PackageInfo> installedPackages = PackageInfo.GetAllRegisteredPackages().ToList();
-            
-            foreach (var package in installedPackages)
+            foreach (var directory in Directory.GetDirectories("Library/PackageCache", "cn.etetet.*"))
             {
-                if (!package.name.StartsWith("cn.etetet."))
-                {
-                    continue;
-                }
-                
-                if (!GetDependencies(package, out PackageGit packageDependencies))
+                string baseName = Path.GetFileName(directory);
+                if (!baseName.StartsWith("cn.etetet."))
                 {
                     continue;
                 }
                 
-                foreach (var gitDependency in packageDependencies.GitDependencies)
-                {
-                    if (IsInCollection(gitDependency.Key, installedPackages))
-                    {
-                        continue;
-                    }
-                    
-                    if (dependencies.TryGetValue(gitDependency.Key, out string findV))
-                    {
-                        if (findV != gitDependency.Value)
-                        {
-                            Debug.Log($"package dup {gitDependency.Key} but git url diff: {findV} {gitDependency.Value}");
-                        }
-                        
-                        continue;
-                    }
-                    
-                    Debug.Log($"Dependency not found: {gitDependency.Key}");
-                    dependencies.Add(gitDependency.Key, gitDependency.Value);
-                }
-            }
+                string[] ss = baseName.Split("@");
+                string packageName = ss[0];
+                string version = ss[1];
 
-            if (dependencies.Count == 0)
-            {
-                Debug.Log($"git Dependencies are all installed");
-                return;
+                MoveToPackage(packageName, version);
             }
             
-            InstallDependencies(dependencies);
+            AssetDatabase.Refresh();
+            
+            Debug.Log($"repaire package finish");
         }
     }
 }

Packages/com.etetet.init/MoveToPackages.ps1

@@ -1,19 +1,9 @@
-foreach($dir in Get-ChildItem "Library/PackageCache")
-{
-    if (!($dir -is [System.IO.DirectoryInfo]))
-    {
-        continue
-    }
+param($packageName, $version)
 
-    if ($dir.Name.StartsWith("cn.etetet"))
-    {
-        $baseName = $dir.Name.Substring(0, $dir.Name.indexOf("@"))
-        
-        $t = $dir.Name
-        Write-Host "move Library/PackageCache/$t to Packages/$baseName"
-        Move-Item "Library/PackageCache/$t" "Packages/$baseName"
-    }  
-}
+Write-Host $packageName, $version
 
-Write-Host "move finish!"
+$from = "Library/PackageCache/$packageName@" + $version
+Move-Item $from "Packages/$packageName"
+
+Write-Host "move finish!" $packageName $version
 #Read-Host -Prompt "Press Enter to exit"