Merge pull request #44 from VeriorPies/Develop

Develop

Images/.gitignore

@@ -0,0 +1 @@
+*.meta

ParrelSync/Editor/AssetModBlock/EditorQuit.cs

@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
+using UnityEditor;
 namespace ParrelSync
 {
     [InitializeOnLoad]

ParrelSync/Editor/AssetModBlock/ParrelSyncAssetModificationProcessor.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 namespace ParrelSync
 {

ParrelSync/Editor/ClonesManager.cs

@@ -1,10 +1,8 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using UnityEngine;
 using UnityEditor;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.IO;
 using Debug = UnityEngine.Debug;
 
@@ -101,11 +99,19 @@ public static Project CreateCloneFromPath(string sourceProjectPath)
             Debug.Log("Start cloning project, original project: " + sourceProject + ", clone project: " + cloneProject);
 
             ClonesManager.CreateProjectFolder(cloneProject);
-            ClonesManager.CopyLibraryFolder(sourceProject, cloneProject);
 
+            //Copy Folders           
+            Debug.Log("Library copy: " + cloneProject.libraryPath);
+            ClonesManager.CopyDirectoryWithProgressBar(sourceProject.libraryPath, cloneProject.libraryPath,
+                "Cloning Project Library '" + sourceProject.name + "'. ");
+            Debug.Log("Packages copy: " + cloneProject.libraryPath);
+            ClonesManager.CopyDirectoryWithProgressBar(sourceProject.packagesPath, cloneProject.packagesPath,
+              "Cloning Project Packages '" + sourceProject.name + "'. ");
+
+
+            //Link Folders
             ClonesManager.LinkFolders(sourceProject.assetPath, cloneProject.assetPath);
             ClonesManager.LinkFolders(sourceProject.projectSettingsPath, cloneProject.projectSettingsPath);
-            ClonesManager.LinkFolders(sourceProject.packagesPath, cloneProject.packagesPath);
             ClonesManager.LinkFolders(sourceProject.autoBuildPath, cloneProject.autoBuildPath);
             ClonesManager.LinkFolders(sourceProject.localPackages, cloneProject.localPackages);
 
@@ -280,6 +286,7 @@ public static void CreateProjectFolder(Project project)
         /// </summary>
         /// <param name="sourceProject"></param>
         /// <param name="destinationProject"></param>
+        [System.Obsolete]
         public static void CopyLibraryFolder(Project sourceProject, Project destinationProject)
         {
             if (Directory.Exists(destinationProject.libraryPath))
@@ -322,7 +329,7 @@ private static void CreateLinkLinux(string sourcePath, string destinationPath)
         {
             sourcePath = sourcePath.Replace(" ", "\\ ");
             destinationPath = destinationPath.Replace(" ", "\\ ");
-            var command = $"ln -s {sourcePath} {destinationPath}";
+            var command = string.Format("ln -s {0} {1}", sourcePath, destinationPath);           
 
             Debug.Log("Linux Symlink " + command);
 

ParrelSync/Editor/ClonesManagerWindow.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using System.IO;
 

ParrelSync/Editor/ExternalLinks.cs

@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-namespace ParrelSync
+namespace ParrelSync
 {
     public class ExternalLinks 
     {

ParrelSync/Editor/FileUtilities.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using UnityEngine;
 
 namespace ParrelSync

ParrelSync/Editor/NonCore/AskFeedbackDialog.cs

@@ -1,7 +1,5 @@
 namespace ParrelSync.NonCore
 {
-    using System.Collections;
-    using System.Collections.Generic;
     using UnityEditor;
     using UnityEngine;
 

ParrelSync/Editor/NonCore/OtherMenuItem.cs

@@ -1,7 +1,5 @@
 namespace ParrelSync.NonCore
 {
-    using System.Collections;
-    using System.Collections.Generic;
     using UnityEditor;
     using UnityEngine;
 

ParrelSync/Editor/Preferences.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 
 namespace ParrelSync

ParrelSync/Editor/Project.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace ParrelSync

ParrelSync/Editor/UpdateChecker.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 namespace ParrelSync.Update
@@ -11,7 +9,7 @@ namespace ParrelSync.Update
     public class UpdateChecker
     {
         //const string LocalVersionFilePath = "Assets/ParrelSync/VERSION.txt";
-        public const string LocalVersion = "1.4.2";
+        public const string LocalVersion = "1.5.0";
         [MenuItem("ParrelSync/Check for update", priority = 20)]
         static void CheckForUpdate()
         {

ParrelSync/Editor/ValidateCopiedFoldersIntegrity.cs

@@ -0,0 +1,73 @@
+namespace ParrelSync.NonCore
+{
+    using UnityEditor;
+    using UnityEngine;
+    using System;
+    using System.Text;
+    using System.Security.Cryptography;
+    using System.IO;
+    using System.Linq;
+
+    [InitializeOnLoad]
+    public class ValidateCopiedFoldersIntegrity
+    {
+        const string SessionStateKey = "ValidateCopiedFoldersIntegrity_Init";
+        /// <summary>
+        /// Called once on editor startup.
+        /// Validate copied folders integrity in clone project
+        /// </summary>
+        static ValidateCopiedFoldersIntegrity()
+        {
+            if (!SessionState.GetBool(SessionStateKey, false))
+            {
+                SessionState.SetBool(SessionStateKey, true);
+                if (!ClonesManager.IsClone()) { return; }
+
+                ValidateFolder("Packages");
+            }
+        }
+
+        static void ValidateFolder(string folderName)
+        {
+            var currentProjectPath = Path.Combine(ClonesManager.GetCurrentProjectPath(), folderName);
+            var currentFolderHash = CreateMd5ForFolder(currentProjectPath);
+
+            var originalProjectPath = Path.Combine(ClonesManager.GetOriginalProjectPath(), folderName);
+            var originalFolderHash = CreateMd5ForFolder(originalProjectPath);
+
+            if (currentFolderHash != originalFolderHash)
+            {
+                Debug.Log("ParrelSync: Detected '" + folderName + "' folder changes in the original project. Updating...");
+                FileUtil.ReplaceDirectory(originalProjectPath, currentProjectPath);
+            }
+        }
+
+        static string CreateMd5ForFolder(string path)
+        {
+            // assuming you want to include nested folders
+            var files = Directory.GetFiles(path, "*.*", SearchOption.AllDirectories)
+                                 .OrderBy(p => p).ToList();
+
+            MD5 md5 = MD5.Create();
+
+            for (int i = 0; i < files.Count; i++)
+            {
+                string file = files[i];
+
+                // hash path
+                string relativePath = file.Substring(path.Length + 1);
+                byte[] pathBytes = Encoding.UTF8.GetBytes(relativePath.ToLower());
+                md5.TransformBlock(pathBytes, 0, pathBytes.Length, pathBytes, 0);
+
+                // hash contents
+                byte[] contentBytes = File.ReadAllBytes(file);
+                if (i == files.Count - 1)
+                    md5.TransformFinalBlock(contentBytes, 0, contentBytes.Length);
+                else
+                    md5.TransformBlock(contentBytes, 0, contentBytes.Length, contentBytes, 0);
+            }
+
+            return BitConverter.ToString(md5.Hash).Replace("-", "").ToLower();
+        }
+    }
+}

ParrelSync/package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.veriorpies.parrelsync",
     "displayName": "ParrelSync",
-    "version": "1.4.2",
+    "version": "1.5.0",
     "unity": "2018.4",
     "description": "ParrelSync is a Unity editor extension that allows users to test multiplayer gameplay without building the project by having another Unity editor window opened and mirror the changes from the original project.",
     "license": "MIT",

README.md

@@ -47,11 +47,10 @@ to the `Packages/manifest.json` file
 
 
 ## Supported Platform
-Currently, ParrelSync supports Windows and macOS editors.  
-For Linux support, please download the [latest 1.4.2 beta release](https://github.com/VeriorPies/ParrelSync/releases/tag/1.4.2).  
+Currently, ParrelSync supports Windows, macOS and Linux editors.  
 
 ParrelSync has been tested with the following Unity version. However, it should also work with other versions as well.
-* *2020.1.2f1*
+* *2020.3.1f1*
 * *2019.3.0f6*
 * *2018.4.22f1*
 

VERSION.txt

@@ -1 +1 @@
-1.4.2
+1.5.0