Merge pull request #180 from wakatime/bugfix/strip-whitespace-from-us…

…er-agent Strip whitespace from plugin name and version
wakatime · Nov 29, 2023 · cd4df92 · cd4df92
2 parents b7a0879 + a8f97e5
commit cd4df92
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/WakaTime/Helpers/AppInfo.swift b/WakaTime/Helpers/AppInfo.swift
@@ -20,6 +20,11 @@ class AppInfo {
         return getAppName(bundleId: bundleId)
     }
 
+    static func getAppNameForHeartbeat(_ app: NSRunningApplication) -> String? {
+        guard let appName = getAppName(app) else { return nil }
+        return appName.filter { !$0.isWhitespace }
+    }
+
     static func getIcon(file path: String) -> NSImage? {
         guard
             FileManager.default.fileExists(atPath: path)

diff --git a/WakaTime/WakaTime.swift b/WakaTime/WakaTime.swift
@@ -106,7 +106,7 @@ class WakaTime: HeartbeatEventHandler {
         guard MonitoringManager.isAppMonitored(app) else { return }
 
         guard
-            let appName = AppInfo.getAppName(app),
+            let appName = AppInfo.getAppNameForHeartbeat(app),
             let appVersion = watcher.getAppVersion(app)
         else { return }
 

diff --git a/WakaTime/Watcher.swift b/WakaTime/Watcher.swift
@@ -90,8 +90,7 @@ class Watcher: NSObject {
             let bundle = Bundle(url: url)
         else { return }
 
-        let version = "\(bundle.version)-\(bundle.build)"
-        appVersions[id] = version
+        appVersions[id] = "\(bundle.version)-\(bundle.build)".filter { !$0.isWhitespace }
     }
 
     public func getAppVersion(_ app: NSRunningApplication) -> String? {