bundle bangs, fetch on demand
This commit is contained in:
@@ -1,16 +1,27 @@
|
||||
enum BangGroup {
|
||||
general('https://raw.githubusercontent.com/FaFre/bangs/main/data/bangs.json'),
|
||||
general(
|
||||
remote:
|
||||
'https://raw.githubusercontent.com/FaFre/bangs/main/data/bangs.json',
|
||||
bundled: 'assets/bangs/bangs.json',
|
||||
),
|
||||
assistant(
|
||||
'https://raw.githubusercontent.com/FaFre/bangs/main/data/assistant_bangs.json',
|
||||
remote:
|
||||
'https://raw.githubusercontent.com/FaFre/bangs/main/data/assistant_bangs.json',
|
||||
bundled: 'assets/bangs/assistant_bangs.json',
|
||||
),
|
||||
kagi(
|
||||
'https://raw.githubusercontent.com/FaFre/bangs/main/data/kagi_bangs.json',
|
||||
remote:
|
||||
'https://raw.githubusercontent.com/FaFre/bangs/main/data/kagi_bangs.json',
|
||||
bundled: 'assets/bangs/kagi_bangs.json',
|
||||
),
|
||||
custom(
|
||||
'https://raw.githubusercontent.com/FaFre/bangs/refs/heads/custom/data/custom.json',
|
||||
remote:
|
||||
'https://raw.githubusercontent.com/FaFre/bangs/refs/heads/custom/data/custom.json',
|
||||
bundled: 'assets/bangs/custom.json',
|
||||
);
|
||||
|
||||
final String url;
|
||||
final String bundled;
|
||||
final String remote;
|
||||
|
||||
const BangGroup(this.url);
|
||||
const BangGroup({required this.bundled, required this.remote});
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'dart:convert';
|
||||
|
||||
import 'package:exceptions/exceptions.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/services.dart' show rootBundle;
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:weblibre/core/http_error_handler.dart';
|
||||
@@ -15,7 +16,7 @@ class BangDataSourceService extends _$BangDataSourceService {
|
||||
@override
|
||||
void build() {}
|
||||
|
||||
Future<Result<List<Bang>>> getBangs(Uri url, BangGroup? group) {
|
||||
Future<Result<List<Bang>>> fetchRemoteBangs(Uri url, BangGroup? group) {
|
||||
return Result.fromAsync(() async {
|
||||
return await compute((args) async {
|
||||
final client = http.Client();
|
||||
@@ -42,4 +43,26 @@ class BangDataSourceService extends _$BangDataSourceService {
|
||||
);
|
||||
}, exceptionHandler: handleHttpError);
|
||||
}
|
||||
|
||||
Future<DateTime> getBundledBangDate(String path) async {
|
||||
final content = await rootBundle.loadString(path);
|
||||
return DateTime.parse(content.trim()).toLocal();
|
||||
}
|
||||
|
||||
Future<Result<List<Bang>>> getBundledBangs(String path, BangGroup? group) {
|
||||
return Result.fromAsync(() async {
|
||||
final content = await rootBundle.loadString(path);
|
||||
final json = jsonDecode(content) as List;
|
||||
|
||||
return json.map((e) {
|
||||
var bang = Bang.fromJson(e as Map<String, dynamic>);
|
||||
|
||||
if (group != null) {
|
||||
bang = bang.copyWith.group(group);
|
||||
}
|
||||
|
||||
return bang;
|
||||
}).toList();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ part 'sync.g.dart';
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class BangSyncRepository extends _$BangSyncRepository {
|
||||
static Future<Result<void>> _fetchAndSync({
|
||||
static Future<Result<void>> _fetchAndSyncRemote({
|
||||
required BangDataSourceService sourceService,
|
||||
required BangDatabase db,
|
||||
required Uri url,
|
||||
@@ -29,7 +29,7 @@ class BangSyncRepository extends _$BangSyncRepository {
|
||||
}
|
||||
}
|
||||
|
||||
final result = await sourceService.getBangs(url, group);
|
||||
final result = await sourceService.fetchRemoteBangs(url, group);
|
||||
return result.flatMapAsync((remoteBangs) async {
|
||||
await db.syncDao.syncBangs(
|
||||
group: group,
|
||||
@@ -40,7 +40,37 @@ class BangSyncRepository extends _$BangSyncRepository {
|
||||
});
|
||||
}
|
||||
|
||||
Future<Result<void>> syncBangGroup(
|
||||
static Future<Result<void>> _fetchAndSyncBundled({
|
||||
required BangDataSourceService sourceService,
|
||||
required BangDatabase db,
|
||||
required BangGroup group,
|
||||
}) async {
|
||||
final lastSync = await db.syncDao
|
||||
.getLastSyncOfGroup(group)
|
||||
.getSingleOrNull();
|
||||
|
||||
final sourceDate = await sourceService.getBundledBangDate(
|
||||
'assets/bangs/last_sync.txt',
|
||||
);
|
||||
|
||||
if (lastSync != null &&
|
||||
(sourceDate == lastSync ||
|
||||
sourceDate.difference(lastSync).isNegative)) {
|
||||
return Result.success(null);
|
||||
}
|
||||
|
||||
final result = await sourceService.getBundledBangs(group.bundled, group);
|
||||
return result.flatMapAsync((remoteBangs) async {
|
||||
await db.syncDao.syncBangs(
|
||||
group: group,
|
||||
remoteBangs: remoteBangs,
|
||||
syncTime: sourceDate,
|
||||
);
|
||||
await db.optimizeFtsIndex();
|
||||
});
|
||||
}
|
||||
|
||||
Future<Result<void>> syncRemoteBangGroup(
|
||||
BangGroup group,
|
||||
Duration? syncInterval,
|
||||
) async {
|
||||
@@ -52,12 +82,12 @@ class BangSyncRepository extends _$BangSyncRepository {
|
||||
connect: BangDatabase.new,
|
||||
computation: (db) async {
|
||||
final ref = ProviderContainer();
|
||||
final result = await _fetchAndSync(
|
||||
final result = await _fetchAndSyncRemote(
|
||||
sourceService: ref.read(
|
||||
bangDataSourceServiceProvider.notifier,
|
||||
),
|
||||
db: db,
|
||||
url: Uri.parse(group.url),
|
||||
url: Uri.parse(group.remote),
|
||||
group: group,
|
||||
syncInterval: syncInterval,
|
||||
);
|
||||
@@ -78,6 +108,29 @@ class BangSyncRepository extends _$BangSyncRepository {
|
||||
}
|
||||
}
|
||||
|
||||
Future<Result<void>> syncBundledBangGroup(BangGroup group) async {
|
||||
try {
|
||||
final db = ref.read(bangDatabaseProvider);
|
||||
|
||||
final result = await _fetchAndSyncBundled(
|
||||
sourceService: ref.read(bangDataSourceServiceProvider.notifier),
|
||||
db: db,
|
||||
group: group,
|
||||
);
|
||||
|
||||
//Throw if necessary
|
||||
return result;
|
||||
} catch (e) {
|
||||
return Result.failure(
|
||||
ErrorMessage(
|
||||
message: "Failed to sync Bangs (${group.name})",
|
||||
source: 'BangSync',
|
||||
details: e,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Stream<DateTime?> watchLastSyncOfGroup(BangGroup group) {
|
||||
return ref
|
||||
.read(bangDatabaseProvider)
|
||||
@@ -86,18 +139,16 @@ class BangSyncRepository extends _$BangSyncRepository {
|
||||
.watchSingleOrNull();
|
||||
}
|
||||
|
||||
Future<Map<BangGroup, Result<void>>> syncBangGroups({
|
||||
Future<Map<BangGroup, Result<void>>> syncBundledBangGroups({
|
||||
Set<BangGroup>? groups,
|
||||
Duration? syncInterval,
|
||||
}) async {
|
||||
//Default to all sources
|
||||
groups ??= BangGroup.values.toSet();
|
||||
|
||||
//Run isolated operations
|
||||
final futures = groups.map(
|
||||
(source) => syncBangGroup(
|
||||
(source) => syncBundledBangGroup(
|
||||
source,
|
||||
syncInterval,
|
||||
).then((result) => MapEntry(source, result)),
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user