Bug fixes

Author: Tetrabyte

package-lock.json

@@ -3,8 +3,8 @@
     <Alerts/>
     <Sidebar/>
     <div class="topbar">
-      <WindowsButtons v-if="isWindows"/>
-      <TrafficLights v-else/>
+      <TrafficLights v-if="isMac()"/>
+      <WindowsButtons v-else/>
     </div>
     <div id="app">
       <Panel/>
@@ -64,7 +64,7 @@ export default {
       let uid = uuid.v4().replace(/-/g, "");
       request.open(
         "GET",
-        `https://jamiepine.com/cachemonkey?uuid=${uid}&version=${remote.app.getVersion()}`
+        `https://jamiepine.com/cachemonkeystats?uuid=${uid}&version=${remote.app.getVersion()}`
       );
       request.send();
     } catch (error) {}
@@ -129,7 +129,7 @@ export default {
         this.fileIndex = JSON.parse(localStorage.getItem("fileIndex"));
         this.dumpScanComplete = true;
         this.evaluateFileIndex();
-        this.initWatchers();
+        // this.initWatchers();
       } else {
         this.scanDump();
       }
@@ -154,7 +154,7 @@ export default {
       // this.scanAll();
     },
     dirScanComplete() {
-      this.initWatchers();
+      // this.initWatchers();
     },
     currentTask() {
       if (this.watcherRunning) {
@@ -164,27 +164,22 @@ export default {
   },
   methods: {
     initWatchers() {
-      if (this.watcherRunning) return;
-      setTimeout(() => (this.watchBlocker = false), 15000);
-      if (process.env.NODE_ENV !== "development")
-        for (let dir of this.watchDirectories) {
-          const watcher = chokidar.watch(dir.dir, { persistent: true });
-          this.watcherRunning = true;
-          watcher.on("add", async path => {
-            if (
-              !this.watchBlocker &&
-              !this.processing &&
-              this.dumpScanComplete
-            ) {
-              console.log("File", path, "has been added");
-              let arr = path.split("/");
-              await this.processItem(dir.dir, path, arr[arr.length - 1]);
-              this.fileIndex = Object.assign({}, this.fileIndex);
-              this.currentTask = "Waiting for changes...";
-            }
-          });
-          this.currentTask = "Waiting for changes...";
-        }
+      // if (this.watcherRunning) return;
+      // console.log("init watchers");
+      // for (let dir of this.watchDirectories) {
+      //   const watcher = chokidar.watch(dir.dir, { persistent: true });
+      //   this.watcherRunning = true;
+      //   watcher.on("add", async path => {
+      //     if (!this.watchBlocker && !this.processing && this.dumpScanComplete) {
+      //       console.log("File", path, "has been added");
+      //       let arr = path.split("/");
+      //       await this.processItem(dir.dir, path, arr[arr.length - 1]);
+      //       this.fileIndex = Object.assign({}, this.fileIndex);
+      //       this.currentTask = "Waiting for changes...";
+      //     }
+      //   });
+      //   this.currentTask = "Waiting for changes...";
+      // }
     },
     evaluateFileIndex() {
       for (let i of Object.keys(this.fileIndex)) {
@@ -247,7 +242,7 @@ export default {
           this.dumpScanComplete = true;
           this.processing = false;
           this.currentTask = `Ready.`;
-          this.initWatchers();
+          // this.initWatchers();
           resolve();
         } catch (e) {
           this.processing = false;
@@ -260,7 +255,7 @@ export default {
       for (let directory of this.watchDirectories) {
         await this.scanDirectory(directory);
       }
-      this.initWatchers();
+      // this.initWatchers();
       this.dirScanComplete = true;
     },
     scanDirectory(directory) {
@@ -285,7 +280,7 @@ export default {
         this.processing = false;
         this.totalAnalysed = 0;
         this.currentTask = "Scan complete";
-        this.initWatchers();
+        // this.initWatchers();
         this.fileIndex = Object.assign({}, this.fileIndex);
         resolve();
       });
@@ -400,12 +395,12 @@ export default {
 
       // append to body
       document.body.appendChild(style);
+    },
+    isMac() {
+      return os.platform() === "darwin";
     }
   },
   computed: {
-    isWindows() {
-      return !!os.platform() === "win32";
-    },
     ...mapGetters(["getTheme", "getThemeName"]),
     processing: {
       get() {

src/renderer/App.vue

@@ -206,7 +206,7 @@ export default {
   margin: 20px;
   display: flex;
   flex-direction: column;
-  max-width: 360px;
+  max-width: 336px;
   /* overflow: hidden; */
 }
 </style>

src/renderer/components/FileView.vue

@@ -48,13 +48,19 @@
       <!-- <button @click="$store.dispatch('toggleDark')">Toggle theme</button> -->
       <button v-if="!processing" class="coolbtn margin-vertical" @click="$parent.scanAll">Scan Cache</button>
       <button v-else class="coolbtn margin-vertical" @click="processing = false">Abort Tasks</button>
+      <!-- <button
+        v-if="!$parent.watcherRunning"
+        class="coolbtn margin-vertical"
+        @click="initWatch "
+      >Watch For Updates</button>
+      <button v-else class="coolbtn margin-vertical" @click="killWatch">Kill Watcher</button>-->
       <br>
 
       <div v-if="foundFiletypes.length > 0" style="opacity:0.3;">Filetypes Discovered</div>
-      <div class="flex">
+      <div style="width:230px;" class="flex">
         <div
           class="coolbtn margin-right"
-          style="    max-width: 260px;"
+          style="padding: 10px; max-width: 260px;margin-bottom:7px;"
           v-for="(i, index) of foundFiletypes"
           :key="index"
           :class="{'filtered': currentFilter === i}"
@@ -170,7 +176,17 @@ export default {
     }, 30000);
   },
   methods: {
+    initWatch() {
+      this.$parent.watchBlocker = false;
+      this.$parent.initWatchers();
+    },
+    killWatch() {
+      this.$parent.watchBlocker = true;
+      this.$parent.watcherRunning = false;
+    },
     reload() {
+      this.fileIndex = {};
+      localStorage.clear();
       remote.app.reloadApp();
     },
     click(item) {

src/renderer/components/LandingPage.vue

@@ -1,7 +1,7 @@
 
 
 <template>
-  <div class="buttons">
+  <div :class="{'dark-buttons': $store.getters.getThemeName === 'light'}" class="buttons">
     <div @click="minimize" class="button minimize">
       <svg name="TitleBarMinimize" width="12" height="12" viewBox="0 0 12 12">
         <rect fill="#ffffff" width="10" height="1" x="1" y="6"></rect>
@@ -55,19 +55,32 @@ export default {
   display: flex;
   flex-direction: row;
   /* width: 73px; */
+  -webkit-app-region: no-drag;
   min-width: 73px;
   justify-content: center;
   position: absolute;
   right: 0;
   cursor: pointer;
   z-index: 100px;
 }
+.dark-buttons .button {
+  &:hover {
+    background: rgb(192, 192, 192);
+  }
+  &.close:hover {
+    background: #e41414dc;
+  }
+
+  svg {
+    filter: invert(100%);
+  }
+}
 .button {
-  padding: 6px 10px;
+  padding: 4px 12px;
   cursor: pointer;
   /* width: 33%; */
   &:hover {
-    background: #00000027;
+    background: var(--boxLight);
   }
   &.close:hover {
     background: #e41414dc;