kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #283 from v1ack/master

Browse Source 
Support self-hosted GitLab, get GitLab repo name from subgroups
This commit is contained in:
Alan Hamlett
2024-10-09 08:10:06 +02:00
committed by GitHub
parent 0b0d61c53c 87e57c0056
commit 77d0963d93
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/sites.ts
View File

@@ -94,11 +94,13 @@ const GitHub: HeartbeatParser = (url: string) => {
}; };
const GitLab: HeartbeatParser = (url: string) => { const GitLab: HeartbeatParser = (url: string) => {
const match = url.match(/(?<=gitlab\.com\/[^/]+\/)([^/?#]+)/); const match = url.match(/([^/]+)(?:\/-\/|\/?$)/);
if (!match) return; if (!match) return;
const urlRepo = match[1];
const repoName = document.querySelector('body')?.getAttribute('data-project-full-path'); const repoName = document.querySelector('body')?.getAttribute('data-project-full-path');
if (!repoName || repoName.split('/')[1] !== match[0]) { const isValidPath = repoName?.split('/').pop() === urlRepo;
if (!isValidPath) {
return { return {
language: '<<LAST_LANGUAGE>>', language: '<<LAST_LANGUAGE>>',
}; };
@@ -106,7 +108,7 @@ const GitLab: HeartbeatParser = (url: string) => {
return { return {
language: '<<LAST_LANGUAGE>>', language: '<<LAST_LANGUAGE>>',
project: match[0], project: urlRepo,
}; };
}; };
@@ -368,7 +370,7 @@ const SITES: Record<KnownSite, SiteParser> = {
}, },
gitlab: { gitlab: {
parser: GitLab, parser: GitLab,
urls: [/^https?:\/\/(.+\.)?gitlab.com\//], urls: [/^https?:\/\/(.+\.)?gitlab.[\w.]+\//],
}, },
googlemeet: { googlemeet: {
parser: GoogleMeet, parser: GoogleMeet,