self merge

updater/package.json

@@ -47,9 +47,11 @@
   "dependencies": {
     "@octokit/core": "^4.0.5",
     "decompress-zip": "^0.3.3",
+    "dir-compare": "^4.0.0",
     "electron-dl": "^3.3.1",
     "electron-squirrel-startup": "^1.0.0",
-    "js-yaml": "^4.1.0"
+    "js-yaml": "^4.1.0",
+    "node-abi": "^3.28.0"
   },
   "devDependencies": {
     "@electron-forge/cli": "^6.0.0-beta.66",

updater/src/index.html

@@ -17,12 +17,16 @@
     <input type="text" id="dirBox" name="name" size="80" readonly>
     <progress id="progressbar" max="100" value="0"></progress>
 
+<<<<<<< HEAD
 
     <button id="update">Check for update</button>
 
     <select name="Dropme Down" id="gng"></select>
     <button id="getFiles">Get Files</button>
     <select name="Dropme Down #2" id="files"></select>
+=======
+    <button id="git">Do Git Operations</button>    
+>>>>>>> 2a8f20c2d57676c3963cd61f7bbc3740a707c725
 
     <script src="./renderer.js"></script>
   </body>

updater/src/renderer.js

@@ -237,4 +237,49 @@ async function streamWithProgress(length, reader, writer, progressCallback) {
             }
         }
     }
+}
+
+
+
+// Git Operations
+
+// Vars for git
+const options = { compareSize: true, compareContent: true, compareFileAsync: true };
+const path1 = 'E:\\git\\v1';
+const path2 = 'E:\\git\\v2';
+
+let gitBtn = document.getElementById('git');
+gitBtn.addEventListener('click', (e) => {
+    git();
+});
+
+const git = async() => {
+    const res = dircompare.compareSync(path1, path2, options);
+    console.log(res.differencesFiles); // Number check :)
+    print(res);
+}
+
+function print(result) {
+    //console.log('Directories are %s', result.same ? 'identical' : 'different')
+
+    //console.log('Statistics - equal entries: %s, distinct entries: %s, left only entries: %s, right only entries: %s, differences: %s', result.equal, result.distinct, result.left, result.right, result.differences)
+
+    let oldFolder, newFolder, other;
+    result.diffSet.forEach(function(dif) {
+        if (dif.state !== "equal") {
+            console.log('Difference - name1: %s, type1: %s, name2: %s, type2: %s, state: %s',
+                dif.name1, dif.type1, dif.name2, dif.type2, dif.state);
+            if (dif.state === "right") {
+                newFolder += dif.name2 + "\n";
+            } else if (dif.state === "left") {
+                oldFolder += dif.name1 + "\n";
+            } else {
+                other += dif.name1 + "\n";
+            }
+        }
+    });
+
+    console.log(newFolder);
+    console.log(oldFolder);
+    console.log(other);
 }