Skip to content

Fix parsing project from browser url #330

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

Merged
merged 1 commit into from
Apr 2, 2025
Merged

Fix parsing project from browser url #330

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
24 changes: 14 additions & 10 deletions WakaTime/Helpers/MonitoringManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,25 +378,29 @@ class MonitoringManager {
}
}

struct Pattern {
var expression: String
var group: Int
}

static func project(from url: String) -> String? {
let patterns = [
"github.com/([^/]+/[^/]+)/?.*$",
"gitlab.com/([^/]+/[^/]+)/?.*$",
"bitbucket.org/([^/]+/[^/]+)/?.*$",
"app.circleci.com/.*/?(github|bitbucket|gitlab)/([^/]+/[^/]+)/?.*$",
"app.travis-ci.com/(github|bitbucket|gitlab)/([^/]+/[^/]+)/?.*$",
"app.travis-ci.org/(github|bitbucket|gitlab)/([^/]+/[^/]+)/?.*$"
let patterns: [Pattern] = [
Pattern(expression: "github.com/[^/]+/([^/]+)/?.*$", group: 1),
Pattern(expression: "gitlab.com/[^/]+/([^/]+)/?.*$", group: 1),
Pattern(expression: "bitbucket.org/[^/]+/([^/]+)/?.*$", group: 1),
Pattern(expression: "app.circleci.com/.*/?(github|bitbucket|gitlab)/[^/]+/([^/]+)/?.*$", group: 2),
Pattern(expression: "app.travis-ci.com/(github|bitbucket|gitlab)/[^/]+/([^/]+)/?.*$", group: 2),
Pattern(expression: "app.travis-ci.org/(github|bitbucket|gitlab)/[^/]+/([^/]+)/?.*$", group: 2)
]

for pattern in patterns {
do {
let regex = try NSRegularExpression(pattern: pattern)
let regex = try NSRegularExpression(pattern: pattern.expression)
let nsrange = NSRange(url.startIndex..<url.endIndex, in: url)
if let match = regex.firstMatch(in: url, options: [], range: nsrange) {
// Adjusted to capture the right group based on the pattern.
// The group index might be 2 if the pattern includes a platform prefix before the project name.
let groupIndex = pattern.contains("(github|bitbucket|gitlab)") ? 2 : 1
let range = match.range(at: groupIndex)
let range = match.range(at: pattern.group)

if range.location != NSNotFound, let range = Range(range, in: url) {
return String(url[range])
Expand Down