peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-10-21 02:03:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add 'sky22333/hubproxy' support for GitHub (#2513)

Browse Source
This commit is contained in:
Imran Remtulla
2025-09-21 12:16:58 -04:00
parent 225362d351
commit 08d9c4daaa
36 changed files with 201 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/app_sources/apkcombo.dart
View File

@@ -82,13 +82,13 @@ class APKCombo extends AppSource {
}
@override
Future<String> apkUrlPrefetchModifier(
String apkUrl,
Future<String> assetUrlPrefetchModifier(
String assetUrl,
String standardUrl,
Map<String, dynamic> additionalSettings,
) async {
var freshURLs = await getApkUrls(standardUrl, additionalSettings);
var path2Match = Uri.parse(apkUrl).path;
var path2Match = Uri.parse(assetUrl).path;
for (var url in freshURLs) {
if (Uri.parse(url.value).path == path2Match) {
return url.value;

90
lib/app_sources/github.dart
View File

@@ -45,6 +45,45 @@ class GitHub extends AppSource {
const SizedBox(height: 4),
],
),
GeneratedFormTextField(
'GHReqPrefix',
label: tr('GHReqPrefix'),
hint: 'gh-proxy.com',
required: false,
additionalValidators: [
(value) {
try {
if (Uri.parse(
'https://${value}/api.github.com',
).scheme.isNotEmpty) {
throw true;
}
} catch (e) {
return tr('invalidInput');
}
return null;
},
],
belowWidgets: [
const SizedBox(height: 4),
GestureDetector(
onTap: () {
launchUrlString(
'https://github.com/sky22333/hubproxy',
mode: LaunchMode.externalApplication,
);
},
child: Text(
tr('about'),
style: const TextStyle(
decoration: TextDecoration.underline,
fontSize: 12,
),
),
),
const SizedBox(height: 4),
],
),
];
additionalSourceAppSpecificSettingFormItems = [
@@ -270,6 +309,18 @@ class GitHub extends AppSource {
return null;
}
@override
Future<String> generalReqPrefetchModifier(
String reqUrl,
Map<String, dynamic> additionalSettings,
) async {
if ((additionalSettings['GHReqPrefix'] as String? ?? '').isNotEmpty) {
var uri = Uri.parse(reqUrl);
return 'https://${additionalSettings['GHReqPrefix']}/${uri.toString().substring('https://'.length)}';
}
return reqUrl;
}
Future<String> getAPIHost(Map<String, dynamic> additionalSettings) async =>
'https://api.${hosts[0]}';
@@ -289,6 +340,12 @@ class GitHub extends AppSource {
Map<String, dynamic> additionalSettings, {
Function(Response)? onHttpErrorCode,
}) async {
SettingsProvider settingsProvider = SettingsProvider();
await settingsProvider.initializeSettings();
var sourceConfigSettingValues = await getSourceConfigValues(
additionalSettings,
settingsProvider,
);
bool includePrereleases = additionalSettings['includePrereleases'] == true;
bool fallbackToOlderReleases =
additionalSettings['fallbackToOlderReleases'] == true;
@@ -344,6 +401,7 @@ class GitHub extends AppSource {
var url = !e['name'].toString().toLowerCase().endsWith('.apk')
? (e['browser_download_url'] ?? e['url'])
: (e['url'] ?? e['browser_download_url']);
url = undoGHProxyMod(url, sourceConfigSettingValues);
e['final_url'] = (e['name'] != null) && (url != null)
? MapEntry(e['name'] as String, url as String)
: const MapEntry('', '');
@@ -522,7 +580,10 @@ class GitHub extends AppSource {
allAssetUrls.add(
MapEntry(
(targetRelease['version'] ?? 'source') + '.tar.gz',
targetRelease['tarball_url'],
undoGHProxyMod(
targetRelease['tarball_url'],
sourceConfigSettingValues,
),
),
);
}
@@ -530,7 +591,10 @@ class GitHub extends AppSource {
allAssetUrls.add(
MapEntry(
(targetRelease['version'] ?? 'source') + '.zip',
targetRelease['zipball_url'],
undoGHProxyMod(
targetRelease['zipball_url'],
sourceConfigSettingValues,
),
),
);
}
@@ -652,12 +716,23 @@ class GitHub extends AppSource {
}
}
undoGHProxyMod(
String reqUrl,
Map<String, String> sourceConfigSettingValues,
) => reqUrl.replaceFirst(
'https://${sourceConfigSettingValues['GHReqPrefix']}/',
'',
);
@override
Future<Map<String, List<String>>> search(
String query, {
Map<String, dynamic> querySettings = const {},
}) async {
return searchCommon(
var sp = SettingsProvider();
await sp.initializeSettings();
var sourceConfigSettingValues = await getSourceConfigValues({}, sp);
var results = await searchCommon(
query,
'${await getAPIHost({})}/search/repositories?q=${Uri.encodeQueryComponent(query)}&per_page=100',
'items',
@@ -666,6 +741,15 @@ class GitHub extends AppSource {
},
querySettings: querySettings,
);
if ((sourceConfigSettingValues['GHReqPrefix'] ?? '').isNotEmpty) {
Map<String, List<String>> results2 = {};
results.forEach((k, v) {
results2[undoGHProxyMod(k, sourceConfigSettingValues)] = v;
});
return results2;
} else {
return results;
}
}
void rateLimitErrorCheck(Response res) {

6
lib/app_sources/gitlab.dart
View File

@@ -129,14 +129,14 @@ class GitLab extends AppSource {
}
@override
Future<String> apkUrlPrefetchModifier(
String apkUrl,
Future<String> assetUrlPrefetchModifier(
String assetUrl,
String standardUrl,
Map<String, dynamic> additionalSettings,
) async {
String? PAT = await getPATIfAny(hostChanged ? additionalSettings : {});
String optionalAuth = (PAT != null) ? 'private_token=$PAT' : '';
return '$apkUrl${(Uri.parse(apkUrl).query.isEmpty ? '?' : '&')}$optionalAuth';
return '$assetUrl${(Uri.parse(assetUrl).query.isEmpty ? '?' : '&')}$optionalAuth';
}
@override

6
lib/app_sources/uptodown.dart
View File

@@ -124,12 +124,12 @@ class Uptodown extends AppSource {
}
@override
Future<String> apkUrlPrefetchModifier(
String apkUrl,
Future<String> assetUrlPrefetchModifier(
String assetUrl,
String standardUrl,
Map<String, dynamic> additionalSettings,
) async {
var res = await sourceRequest(apkUrl, additionalSettings);
var res = await sourceRequest(assetUrl, additionalSettings);
if (res.statusCode != 200) {
throw getObtainiumHttpError(res);
}

15
lib/pages/settings.dart
View File

@@ -319,13 +319,24 @@ class _SettingsPageState extends State<SettingsPage> {
if (e.sourceConfigSettingFormItems.isNotEmpty) {
return GeneratedForm(
items: e.sourceConfigSettingFormItems.map((e) {
e.defaultValue = settingsProvider.getSettingString(e.key);
if (e is GeneratedFormSwitch) {
e.defaultValue = settingsProvider.getSettingBool(e.key);
} else {
e.defaultValue = settingsProvider.getSettingString(e.key);
}
return [e];
}).toList(),
onValueChanges: (values, valid, isBuilding) {
if (valid && !isBuilding) {
values.forEach((key, value) {
settingsProvider.setSettingString(key, value);
var formItem = e.sourceConfigSettingFormItems
.where((i) => i.key == key)
.firstOrNull;
if (formItem is GeneratedFormSwitch) {
settingsProvider.setSettingBool(key, value == true);
} else {
settingsProvider.setSettingString(key, value ?? '');
}
});
}
},

39
lib/providers/apps_provider.dart
View File

@@ -606,10 +606,20 @@ class AppsProvider with ChangeNotifier {
app.url,
overrideSource: app.overrideSource,
);
String downloadUrl = await source.apkUrlPrefetchModifier(
app.apkUrls[app.preferredApkIndex].value,
var additionalSettingsPlusSourceConfig = {
...app.additionalSettings,
...(await source.getSourceConfigValues(
app.additionalSettings,
settingsProvider,
)),
};
String downloadUrl = await source.assetUrlPrefetchModifier(
await source.generalReqPrefetchModifier(
app.apkUrls[app.preferredApkIndex].value,
additionalSettingsPlusSourceConfig,
),
app.url,
app.additionalSettings,
additionalSettingsPlusSourceConfig,
);
var notif = DownloadNotification(app.finalName, 100);
notificationsProvider?.cancel(notif.id);
@@ -1324,15 +1334,26 @@ class AppsProvider with ChangeNotifier {
evenIfSingleChoice: true,
);
if (tempFileUrl != null) {
var s = SourceProvider().getSource(
apps[id]!.app.url,
overrideSource: apps[id]!.app.overrideSource,
);
var additionalSettingsPlusSourceConfig = {
...apps[id]!.app.additionalSettings,
...(await s.getSourceConfigValues(
apps[id]!.app.additionalSettings,
settingsProvider,
)),
};
fileUrl = MapEntry(
tempFileUrl.key,
await (SourceProvider().getSource(
await s.assetUrlPrefetchModifier(
await s.generalReqPrefetchModifier(
tempFileUrl.value,
additionalSettingsPlusSourceConfig,
),
apps[id]!.app.url,
overrideSource: apps[id]!.app.overrideSource,
)).apkUrlPrefetchModifier(
tempFileUrl.value,
apps[id]!.app.url,
apps[id]!.app.additionalSettings,
additionalSettingsPlusSourceConfig,
),
);
}

9
lib/providers/settings_provider.dart
View File

@@ -249,6 +249,15 @@ class SettingsProvider with ChangeNotifier {
notifyListeners();
}
bool? getSettingBool(String settingId) {
return prefs?.getBool(settingId) ?? false;
}
void setSettingBool(String settingId, bool value) {
prefs?.setBool(settingId, value);
notifyListeners();
}
Map<String, int> get categories =>
Map<String, int>.from(jsonDecode(prefs?.getString('categories') ?? '{}'));

30
lib/providers/source_provider.dart
View File

@@ -686,14 +686,27 @@ abstract class AppSource {
bool followRedirects = true,
Object? postBody,
}) async {
var sp = SettingsProvider();
await sp.initializeSettings();
getSourceConfigValues(additionalSettings, sp);
var additionalSettingsPlusSourceConfig = {
...additionalSettings,
...(await getSourceConfigValues(additionalSettings, sp)),
};
url = await generalReqPrefetchModifier(
url,
additionalSettingsPlusSourceConfig,
);
var method = postBody == null ? 'GET' : 'POST';
var requestHeaders = await getRequestHeaders(additionalSettings);
var requestHeaders = await getRequestHeaders(
additionalSettingsPlusSourceConfig,
);
var streamedResponseUrlWithResponseAndClient =
await sourceRequestStreamResponse(
method,
url,
requestHeaders,
additionalSettings,
additionalSettingsPlusSourceConfig,
followRedirects: followRedirects,
postBody: postBody,
);
@@ -911,12 +924,19 @@ abstract class AppSource {
return null;
}
Future<String> apkUrlPrefetchModifier(
String apkUrl,
Future<String> assetUrlPrefetchModifier(
String assetUrl,
String standardUrl,
Map<String, dynamic> additionalSettings,
) async {
return apkUrl;
return assetUrl;
}
Future<String> generalReqPrefetchModifier(
String reqUrl,
Map<String, dynamic> additionalSettings,
) async {
return reqUrl;
}
bool canSearch = false;