Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v3.9.0 #178

Merged
merged 6 commits into from
Nov 29, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adding chrome and arc browser
jfcrockett committed Nov 29, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 82271d6d3fc7d6c54a4733a381ce51e134493e66
110 changes: 61 additions & 49 deletions WakaTime/Extensions/AXUIElementExtension.swift
Original file line number Diff line number Diff line change
@@ -39,55 +39,67 @@ extension AXUIElement {

func title(for app: MonitoredApp) -> String? {
switch app {
case .figma:
guard
let title = extractPrefix(rawTitle, separator: " – "),
title != "Figma",
title != "Drafts"
else { return nil }

return title
case .postman:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Postman"
else { return nil }

return title
case .warp:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Warp"
else { return nil }
return title
case .slack:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Slack"
else { return nil }
return title
case .safari:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Safari"
else { return nil }
return title
case .imessage:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "iMessage"
else { return nil }
return title
case .canva:
guard
let title = extractPrefix(rawTitle, separator: " - ", minCount: 2),
title != "Canva",
title != "Home"
else { return nil }

return title
case .xcode:
return nil
case .figma:
guard
let title = extractPrefix(rawTitle, separator: " – "),
title != "Figma",
title != "Drafts"
else { return nil }

return title
case .postman:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Postman"
else { return nil }

return title
case .warp:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Warp"
else { return nil }
return title
case .slack:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Slack"
else { return nil }
return title
case .safari:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Safari"
else { return nil }
return title
case .imessage:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "iMessage"
else { return nil }
return title
case .canva:
guard
let title = extractPrefix(rawTitle, separator: " - ", minCount: 2),
title != "Canva",
title != "Home"
else { return nil }

return title
case .xcode:
return nil
case .chrome:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Chrome"
else { return nil }
return title
case .arcbrowser:
guard
let title = extractPrefix(rawTitle, separator: " - ", fullTitle: true),
title != "Arc"
else { return nil }
return title
}
}

5 changes: 4 additions & 1 deletion WakaTime/Extensions/NSRunningApplicationExtension.swift
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@ enum MonitoredApp: String, CaseIterable {
case slack = "com.tinyspeck.slackmacgap"
case safari = "com.apple.Safari"
case imessage = "com.apple.MobileSMS"
case chrome = "com.google.Chrome"
case arcbrowser = "company.thebrowser.Browser"

init?(from bundleId: String) {
if let app = MonitoredApp(rawValue: bundleId) {
@@ -25,7 +27,8 @@ enum MonitoredApp: String, CaseIterable {
static let electronAppIds = [MonitoredApp.postman.rawValue, MonitoredApp.figma.rawValue,
MonitoredApp.canva.rawValue, MonitoredApp.warp.rawValue,
MonitoredApp.slack.rawValue, MonitoredApp.safari.rawValue,
MonitoredApp.imessage.rawValue]
MonitoredApp.imessage.rawValue, MonitoredApp.chrome.rawValue,
MonitoredApp.arcbrowser.rawValue]
}

extension NSRunningApplication {
16 changes: 13 additions & 3 deletions WakaTime/Helpers/MonitoringManager.swift
Original file line number Diff line number Diff line change
@@ -70,17 +70,27 @@ class MonitoringManager {
return HeartbeatData(
entity: title,
language: "Slack Activity",
category: .coding)
category: .communicating)
case .safari:
return HeartbeatData(
entity: title,
language: "Safari Activity",
category: .coding)
category: .browsing)
case .chrome:
return HeartbeatData(
entity: title,
language: "Chrome Activity",
category: .browsing)
case .arcbrowser:
return HeartbeatData(
entity: title,
language: "Arc Browser Activity",
category: .browsing)
case .imessage:
return HeartbeatData(
entity: title,
language: "iMessage Activity",
category: .coding)
category: .communicating)
case .canva:
return HeartbeatData(
entity: title,