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.

Sign up for GitHub

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

Jump to bottom

Fix only tracking domain part of browser url #243

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Fix only tracking domain part of browser url #243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions WakaTime/Extensions/AXUIElementExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,9 @@ extension AXUIElement {
FilterManager.filterBrowsedSites(url)
else { return nil }

// TODO: return only domain part depending on user setting
return url
guard PropertiesManager.domainPreference == .domain else { return url }

return domainFromUrl(url)
}

return title(for: monitoredApp)
Expand Down Expand Up @@ -320,6 +321,13 @@ extension AXUIElement {
return nil
}

func domainFromUrl(_ url: String) -> String? {
guard let host = URL(string: url)?.host else { return nil }
let domain = host.replacingOccurrences(of: "^www.", with: "", options: .regularExpression)
guard let port = URL(string: url)?.port else { return domain }
return "\(domain):\(port)"
}

// Traverses the element's subtree (breadth-first) until visitor() returns false or traversal is completed
func traverseDown(visitor: (AXUIElement) -> Bool) {
var queue: [AXUIElement] = [self]
Expand Down
Loading