Merge pull request #55 from wakatime/bugfix/exclude-windows-explorer

Bug Fixes
wakatime · Oct 18, 2024 · 1aef135 · 1aef135
2 parents b712fa7 + c927c6e
commit 1aef135
Show file tree

Hide file tree

Showing 11 changed files with 1,158 additions and 1,070 deletions.
diff --git a/electron/electron-env.d.ts b/electron/electron-env.d.ts
@@ -44,6 +44,7 @@ interface Window {
       monitor: boolean,
     ) => void;
     getAppVersion: () => string;
+    getPlatform: () => NodeJS.Platform;
     getAllApps: () => import("./utils/validators").AppData[];
     getOpenApps: () => Promise<import("./utils/validators").AppData[]>;
     getAllAvailableApps: () => Promise<import("./utils/validators").AppData[]>;

diff --git a/electron/helpers/apps-manager.ts b/electron/helpers/apps-manager.ts
@@ -1,13 +1,13 @@
-import { LogLevel, Logging } from "../utils/logging";
+import fs from "node:fs";
+import path from "node:path";
+import { z } from "zod";
 
 import type { AppData } from "../utils/validators";
+import { getWakatimeAppDataFolderPath } from "../utils";
+import { Logging, LogLevel } from "../utils/logging";
 import { appDataSchema } from "../utils/validators";
 import { excludeAppsList } from "../watchers/apps";
-import fs from "node:fs";
 import { getApps } from "./installed-apps";
-import { getWakatimeAppDataFolderPath } from "../utils";
-import path from "node:path";
-import { z } from "zod";
 
 const wakatimeAppsSchema = z.object({
   installedApps: z.array(appDataSchema),
@@ -72,8 +72,12 @@ export class AppsManager {
 
   async loadApps() {
     const { installedApps, extraApps } = this.getCachedApps();
-    this.installedApps = installedApps;
-    this.extraApps = validateExtraApps(extraApps);
+    this.installedApps = installedApps.filter(
+      (app) => !AppsManager.isExcludedApp(app),
+    );
+    this.extraApps = validateExtraApps(extraApps).filter(
+      (app) => !AppsManager.isExcludedApp(app),
+    );
     this.installedApps = await getApps();
     this.saveCache();
     return [...this.installedApps, ...this.extraApps];

diff --git a/electron/helpers/installed-apps/index.ts b/electron/helpers/installed-apps/index.ts
@@ -1,4 +1,5 @@
 import { AppData } from "../../utils/validators";
+import { AppsManager } from "../apps-manager";
 import { getInstalledApps as getInstalledAppsMac } from "./mac";
 import { getInstalledApps as getInstalledAppsWindows } from "./windows";
 
@@ -11,5 +12,5 @@ export async function getApps(): Promise<AppData[]> {
     apps = await getInstalledAppsMac();
   }
 
-  return apps;
+  return apps.filter((app) => !AppsManager.isExcludedApp(app));
 }
diff --git a/electron/main.ts b/electron/main.ts
@@ -48,14 +48,18 @@ autoUpdater.autoInstallOnAppQuit = true;
 autoUpdater.autoRunAppAfterInstall = false;
 
 autoUpdater.on("checking-for-update", () => {
-  "Checking for update";
+  Logging.instance().log("Checking for update");
 });
-autoUpdater.on("update-available", async () => {
-  Logging.instance().log("Update available");
+autoUpdater.on("update-available", async (res) => {
+  Logging.instance().log(
+    `Update available. Version: ${res.version}, Files: ${res.files.map((file) => file.url).join(", ")}`,
+  );
   await autoUpdater.downloadUpdate();
 });
-autoUpdater.on("update-downloaded", () => {
-  Logging.instance().log("Update Downloaded");
+autoUpdater.on("update-downloaded", (res) => {
+  Logging.instance().log(
+    `Update Downloaded. Downloaded file: ${res.downloadedFile}, Version: ${res.version}, `,
+  );
 });
 autoUpdater.on("update-not-available", () => {
   Logging.instance().log("Update not available");
@@ -347,6 +351,10 @@ ipcMain.on(IpcKeys.getAppVersion, (event) => {
   event.returnValue = app.getVersion();
 });
 
+ipcMain.on(IpcKeys.getPlatform, (event) => {
+  event.returnValue = process.platform;
+});
+
 ipcMain.on(IpcKeys.isMonitored, (event, path) => {
   event.returnValue = MonitoringManager.isMonitored(path);
 });

diff --git a/electron/preload.ts b/electron/preload.ts
@@ -55,6 +55,9 @@ contextBridge.exposeInMainWorld("ipcRenderer", {
   getAppVersion() {
     return ipcRenderer.sendSync(IpcKeys.getAppVersion);
   },
+  getPlatform() {
+    return ipcRenderer.sendSync(IpcKeys.getPlatform);
+  },
   autoUpdateEnabled() {
     return ipcRenderer.sendSync(IpcKeys.autoUpdateEnabled);
   },

diff --git a/electron/utils/constants.ts b/electron/utils/constants.ts
@@ -2,6 +2,7 @@ export const IpcKeys = {
   getAllApps: "get_all_apps",
   getAllAvailableApps: "get_all_available_apps",
   getAppVersion: "get_app_version",
+  getPlatform: "get_platform",
   getSetting: "get_setting",
   setSetting: "set_setting",
   isMonitored: "is_monitored",

diff --git a/electron/watchers/wakatime.ts b/electron/watchers/wakatime.ts
@@ -198,13 +198,16 @@ export class Wakatime {
 
   public async fetchToday() {
     if (!PropertiesManager.showCodeTimeInStatusBar) {
+      // tray.setTitle is only available on darwin/macOS
       this.tray?.setTitle("");
+      this.tray?.setToolTip("Wakatime");
       return;
     }
 
     const time = Date.now() / 1000;
     if (this.lastCodeTimeFetched + 120 > time) {
       this.tray?.setTitle(` ${this.lastCodeTimeText}`);
+      this.tray?.setToolTip(` ${this.lastCodeTimeText}`);
       return;
     }
 
@@ -232,6 +235,7 @@ export class Wakatime {
       }
       this.lastCodeTimeText = output;
       this.tray?.setTitle(` ${output}`);
+      this.tray?.setToolTip(` ${output}`);
     } catch (error) {
       Logging.instance().log(
         `Failed to fetch code time: ${error}`,