From ba21137da7bc3b71c2d23c93e1cfd7d19d2804c9 Mon Sep 17 00:00:00 2001
From: Imran Remtulla <contact@imranr.dev>
Date: Mon, 27 Jan 2025 20:14:11 -0500
Subject: [PATCH] Fix error when GitLab repo is in a subgroup (#2079)

---
 lib/app_sources/github.dart |  2 +-
 lib/app_sources/gitlab.dart | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/app_sources/github.dart b/lib/app_sources/github.dart
index 810ef91..ab246e6 100644
--- a/lib/app_sources/github.dart
+++ b/lib/app_sources/github.dart
@@ -501,7 +501,7 @@ class GitHub extends AppSource {
   AppNames getAppNames(String standardUrl) {
     String temp = standardUrl.substring(standardUrl.indexOf('://') + 3);
     List<String> names = temp.substring(temp.indexOf('/') + 1).split('/');
-    return AppNames(names[0], names[1]);
+    return AppNames(names[0], names.sublist(1).join('/'));
   }
 
   Future<Map<String, List<String>>> searchCommon(
diff --git a/lib/app_sources/gitlab.dart b/lib/app_sources/gitlab.dart
index e8404a4..b47e891 100644
--- a/lib/app_sources/gitlab.dart
+++ b/lib/app_sources/gitlab.dart
@@ -54,7 +54,7 @@ class GitLab extends AppSource {
   @override
   String sourceSpecificStandardizeURL(String url, {bool forSelection = false}) {
     RegExp standardUrlRegEx = RegExp(
-        '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+/[^/]+',
+        '^https?://(www\\.)?${getSourceRegex(hosts)}/[^/]+(/[^/]+){1,20}',
         caseSensitive: false);
     RegExpMatch? match = standardUrlRegEx.firstMatch(url);
     if (match == null) {
@@ -126,6 +126,8 @@ class GitLab extends AppSource {
   ) async {
     // Prepare request params
     var names = GitHub().getAppNames(standardUrl);
+    String projectUriComponent =
+        '${Uri.encodeComponent(names.author)}%2F${Uri.encodeComponent(names.name)}';
     String? PAT = await getPATIfAny(hostChanged ? additionalSettings : {});
     String optionalAuth = (PAT != null) ? 'private_token=$PAT' : '';
 
@@ -133,7 +135,7 @@ class GitLab extends AppSource {
 
     // Get project ID
     Response res0 = await sourceRequest(
-        'https://${hosts[0]}/api/v4/projects/${names.author}%2F${names.name}?$optionalAuth',
+        'https://${hosts[0]}/api/v4/projects/$projectUriComponent?$optionalAuth',
         additionalSettings);
     if (res0.statusCode != 200) {
       throw getObtainiumHttpError(res0);
@@ -145,7 +147,7 @@ class GitLab extends AppSource {
 
     // Request data from REST API
     Response res = await sourceRequest(
-        'https://${hosts[0]}/api/v4/projects/${names.author}%2F${names.name}/${trackOnly ? 'repository/tags' : 'releases'}?$optionalAuth',
+        'https://${hosts[0]}/api/v4/projects/$projectUriComponent/${trackOnly ? 'repository/tags' : 'releases'}?$optionalAuth',
         additionalSettings);
     if (res.statusCode != 200) {
       throw getObtainiumHttpError(res);
@@ -180,7 +182,7 @@ class GitLab extends AppSource {
       return APKDetails(
           e['tag_name'] ?? e['name'],
           getApkUrlsFromUrls(apkUrlsSet.toList()),
-          GitHub().getAppNames(standardUrl),
+          AppNames(names.author, names.name.split('/').last),
           releaseDate: releaseDate);
     });
     if (apkDetailsList.isEmpty) {