Merge pull request #49 from kyubuns/master

fix: #48 package-lock.json is not synchronized when build failed
VeriorPies · Jul 2, 2021 · 44b8322 · 44b8322
2 parents bb3d506 + 3b69099
commit 44b8322
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ParrelSync/Editor/ClonesManager.cs b/ParrelSync/Editor/ClonesManager.cs
@@ -157,6 +157,8 @@ public static void OpenProject(string projectPath)
                 return;
             }
 
+            ParrelSync.NonCore.ValidateCopiedFoldersIntegrity.ValidateFolder(projectPath, ClonesManager.GetOriginalProjectPath(), "Packages");
+
             string fileName = GetApplicationPath();
             string args = "-projectPath \"" + projectPath + "\"";
             Debug.Log("Opening project \"" + fileName + " " + args + "\"");

diff --git a/ParrelSync/Editor/ValidateCopiedFoldersIntegrity.cs b/ParrelSync/Editor/ValidateCopiedFoldersIntegrity.cs
@@ -23,16 +23,16 @@ static ValidateCopiedFoldersIntegrity()
                 SessionState.SetBool(SessionStateKey, true);
                 if (!ClonesManager.IsClone()) { return; }
 
-                ValidateFolder("Packages");
+                ValidateFolder(ClonesManager.GetCurrentProjectPath(), ClonesManager.GetOriginalProjectPath(), "Packages");
             }
         }
 
-        static void ValidateFolder(string folderName)
+        public static void ValidateFolder(string current, string original, string folderName)
         {
-            var currentProjectPath = Path.Combine(ClonesManager.GetCurrentProjectPath(), folderName);
+            var currentProjectPath = Path.Combine(current, folderName);
             var currentFolderHash = CreateMd5ForFolder(currentProjectPath);
 
-            var originalProjectPath = Path.Combine(ClonesManager.GetOriginalProjectPath(), folderName);
+            var originalProjectPath = Path.Combine(original, folderName);
             var originalFolderHash = CreateMd5ForFolder(originalProjectPath);
 
             if (currentFolderHash != originalFolderHash)