fixed zClean freezing at "Done loading" and md5 hash issue

z-edit · Jun 5, 2018 · 7bff393 · 7bff393
1 parent 5285181
commit 7bff393
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 38 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,8 +56,9 @@
     "font-awesome": "^4.7.0",
     "fs-jetpack": "^0.10.5",
     "marked": "^0.3.19",
-    "ui-router-extras": "^0.1.3",
-    "xelib": "github:matortheeternal/xelib"
+    "xelib": "github:matortheeternal/xelib",
+    "md5-file": "^4.0.0",
+    "ui-router-extras": "^0.1.3"
   },
   "devDependencies": {
     "chai": "^3.5.0",

diff --git a/src/javascripts/Directives/pluginLoader.js b/src/javascripts/Directives/pluginLoader.js
@@ -12,6 +12,10 @@ ngapp.controller('pluginLoaderController', function($rootScope, $scope, $timeout
     let appMode = `z${$rootScope.appMode.capitalize()}`;
     timerService.start('loader');
 
+    // initialization
+    $scope.loaded = false;
+    $scope.spinnerOpts = spinnerFactory.defaultOptions;
+
     // helper functions
     let logMessages = function() {
         let str = xelib.GetMessages();
@@ -28,6 +32,11 @@ ngapp.controller('pluginLoaderController', function($rootScope, $scope, $timeout
         logger.info(`Files loaded in ${secondsStr}`);
     };
 
+    let ignore = function(e) {
+        e.stopPropagation();
+        e.preventDefault();
+    };
+
     // scope functions
     $scope.checkIfLoaded = function() {
         logMessages();
@@ -43,9 +52,20 @@ ngapp.controller('pluginLoaderController', function($rootScope, $scope, $timeout
         }
     };
 
-    // initialization
-    $scope.loaded = false;
-    $scope.spinnerOpts = spinnerFactory.defaultOptions;
+    // event handlers
+    document.addEventListener('mousedown', ignore, true);
+    document.addEventListener('click', ignore, true);
+    document.addEventListener('mouseup', ignore, true);
+
+    $scope.$on('filesLoaded', function() {
+        $scope.loaded = true;
+        $timeout(() => {
+            logger.info('Allowing click events');
+            document.removeEventListener('mousedown', ignore, true);
+            document.removeEventListener('click', ignore, true);
+            document.removeEventListener('mouseup', ignore, true);
+        }, 500);
+    });
 
     $scope.checkIfLoaded();
     $scope.$emit('setTitle', `${appMode} - Loading Plugins`);

diff --git a/src/javascripts/Views/clean.js b/src/javascripts/Views/clean.js
@@ -131,17 +131,18 @@ ngapp.controller('cleanController', function ($rootScope, $scope, $timeout, $ele
     };
 
     $scope.getPlugins = function() {
-        $scope.plugins = xelib.GetElements().map(function(file) {
-            return {
-                handle: file,
-                filename: xelib.Name(file),
-                hash: xelib.MD5Hash(file),
-                status: 'Queued',
-                skip: false,
-                showContent: false
-            };
-        }).filter(function(plugin) {
-            return !$scope.ignorePlugin(plugin.filename);
+        let dataPath = xelib.GetGlobal('DataPath');
+        $scope.plugins = xelib.GetElements().map(file => ({
+            handle: file,
+            filename: xelib.Name(file),
+            status: 'Queued',
+            skip: false,
+            showContent: false
+        })).filter(plugin => {
+            if ($scope.ignorePlugin(plugin.filename)) return;
+            plugin.filePath = `${dataPath}\\${plugin.filename}`;
+            plugin.hash = md5File.sync(plugin.filePath);
+            return true;
         });
     };
 

diff --git a/src/javascripts/Views/edit.js b/src/javascripts/Views/edit.js
@@ -38,16 +38,6 @@ ngapp.controller('editController', function ($scope, $timeout, layoutService, ho
         return filterView;
     };
 
-    let ignore = function(e) {
-        e.stopPropagation();
-        e.preventDefault();
-    };
-
-    // event handlers
-    document.addEventListener('mousedown', ignore, true);
-    document.addEventListener('click', ignore, true);
-    document.addEventListener('mouseup', ignore, true);
-
     $scope.onViewportRender = function() {
         if (verbose) logger.info('Rendering viewport...');
     };
@@ -85,17 +75,6 @@ ngapp.controller('editController', function ($scope, $timeout, layoutService, ho
         layoutService.switchToView('log-view');
     });
 
-    $scope.$on('filesLoaded', function() {
-        if (verbose) logger.info('Rendering editView');
-        $scope.loaded = true;
-        $timeout(() => {
-            logger.info('Allowing click events');
-            document.removeEventListener('mousedown', ignore, true);
-            document.removeEventListener('click', ignore, true);
-            document.removeEventListener('mouseup', ignore, true);
-        }, 500);
-    });
-
     // handle hotkeys
     hotkeyService.buildOnKeyDown($scope, 'onKeyDown', 'editView');
 

diff --git a/src/javascripts/app.js b/src/javascripts/app.js
@@ -14,6 +14,7 @@ import logger from './helpers/logger.js';
 import buildModuleService from './helpers/moduleService';
 import './polyfills';
 import './color';
+window.md5File = require('md5-file');
 window.xelib = require('xelib').wrapper;
 
 // init logger