MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

refactored sync & bangs

Browse Source
This commit is contained in:
Fabian Freund
2024-06-12 08:34:48 +02:00
parent ff40d57ce7
commit b1e2b65a0c
22 changed files with 1023 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/bangs/domain/repositories/bang.dart
-154
View File
@@ -1,154 +0,0 @@
import 'package:bang_navigator/domain/services/generic_website.dart';
import 'package:bang_navigator/features/bangs/data/database/database.dart';
import 'package:bang_navigator/features/bangs/data/models/bang.dart';
import 'package:bang_navigator/features/bangs/data/models/bang_data.dart';
import 'package:bang_navigator/features/bangs/data/providers.dart';
import 'package:bang_navigator/features/bangs/data/services/bang_source.dart';
import 'package:bang_navigator/utils/image_helper.dart';
import 'package:drift/isolate.dart';
import 'package:exceptions/exceptions.dart';
import 'package:riverpod/riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'bang.g.dart';
Future<Result<void>> _syncBangGroupStatic(
BangSource source,
BangDatabase db,
Uri url,
BangGroup? group,
) async {
final result = await source.getBangs(url, group);
return result.flatMapAsync(
(value) async {
final sourcedBangMap =
Map.fromEntries(value.map((e) => MapEntry(e.trigger, e)));
final localBangMap =
await db.bangDao.getBangs(groups: [group]).get().then(
(bangs) =>
Map.fromEntries(bangs.map((e) => MapEntry(e.trigger, e))),
);
final sourcedBangTriggers = sourcedBangMap.keys.toSet();
final localBangTriggers = localBangMap.keys.toSet();
final removedBangs = localBangTriggers.difference(sourcedBangTriggers);
final addedBangs = sourcedBangTriggers.difference(localBangTriggers).map(
(e) => sourcedBangMap[e]!,
);
final changedBangs = sourcedBangTriggers
.intersection(localBangTriggers)
.where((e) => sourcedBangMap[e] != localBangMap[e])
.map(
(e) => sourcedBangMap[e]!,
);
await db.bangDao.deleteBangs(removedBangs);
await db.bangDao.insertBangs(addedBangs);
await db.bangDao.replaceBangs(changedBangs);
await db.optimizeFtsIndex();
},
);
}
@Riverpod(keepAlive: true)
class BangRepository extends _$BangRepository {
late BangDatabase _db;
@override
void build() {
_db = ref.watch(bangDatabaseProvider);
}
Stream<BangData?> watchBang(String? trigger) {
if (trigger != null) {
return _db.bangDao.getBangData(trigger).watchSingleOrNull();
} else {
return Stream.value(null);
}
}
Stream<List<BangData>> watchBangs({Iterable<BangGroup?>? groups}) {
return _db.bangDao.getBangDataList(groups: groups).watch();
}
Stream<List<BangData>> watchFrequentBangs({Iterable<BangGroup?>? groups}) {
return _db.bangDao.getFrequentBangDataList(groups: groups).watch();
}
Future<void> increaseFrequency(String trigger) {
return _db.bangDao.increaseFrequency(trigger);
}
Future<Result<BangData>> ensureIconAvailable(BangData bang) async {
if (bang.iconData != null) {
return Result.success(bang);
}
final result = await ref
.read(genericWebsiteServiceProvider.notifier)
.getFaviconBytes(Uri.parse(bang.getUrl('').origin));
return result.flatMapAsync(
(faviconBytes) async {
if (faviconBytes != null && await isImageValid(faviconBytes)) {
await _db.bangDao.upsertIcon(bang.trigger, faviconBytes);
return bang.copyWith.iconData(faviconBytes);
}
return bang;
},
);
}
Future<Result<void>> syncBangGroup(
Uri url,
BangGroup? group,
) =>
_syncBangGroupStatic(
ref.read(bangSourceProvider.notifier),
_db,
url,
group,
);
Future<void> syncAllBangGroups() async {
await _db.computeWithDatabase(
connect: BangDatabase.new,
computation: (db) async {
final ref = ProviderContainer();
final source = ref.read(bangSourceProvider.notifier);
await _syncBangGroupStatic(
source,
db,
Uri.parse(
'https://raw.githubusercontent.com/kagisearch/bangs/main/data/bangs.json',
),
null,
);
await _syncBangGroupStatic(
source,
db,
Uri.parse(
'https://raw.githubusercontent.com/kagisearch/bangs/main/data/kagi_bangs.json',
),
BangGroup.kagi,
);
await _syncBangGroupStatic(
source,
db,
Uri.parse(
'https://raw.githubusercontent.com/kagisearch/bangs/main/data/assistant_bangs.json',
),
BangGroup.assistant,
);
},
);
}
}
app/lib/features/bangs/domain/repositories/bang_data.dart
+74
View File
@@ -0,0 +1,74 @@
import 'package:bang_navigator/domain/services/generic_website.dart';
import 'package:bang_navigator/features/bangs/data/database/database.dart';
import 'package:bang_navigator/features/bangs/data/models/bang.dart';
import 'package:bang_navigator/features/bangs/data/models/bang_data.dart';
import 'package:bang_navigator/features/bangs/data/providers.dart';
import 'package:bang_navigator/utils/image_helper.dart';
import 'package:drift/drift.dart';
import 'package:exceptions/exceptions.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'bang_data.g.dart';
@Riverpod(keepAlive: true)
class BangDataRepository extends _$BangDataRepository {
late BangDatabase _db;
@override
void build() {
_db = ref.watch(bangDatabaseProvider);
}
Stream<BangData?> watchBang(String? trigger) {
if (trigger != null) {
return _db.bangDao.getBangData(trigger).watchSingleOrNull();
} else {
return Stream.value(null);
}
}
Stream<int> watchBangCount(BangGroup group) {
return _db.bangDao.getBangCount(groups: [group]).watchSingle();
}
Stream<List<BangData>> watchBangs({Iterable<BangGroup>? groups}) {
return _db.bangDao.getBangDataList(groups: groups).watch();
}
Stream<List<BangData>> watchFrequentBangs({Iterable<BangGroup>? groups}) {
return _db.bangDao.getFrequentBangDataList(groups: groups).watch();
}
Future<void> increaseFrequency(String trigger) {
return _db.bangDao.increaseBangFrequency(trigger);
}
Future<Result<BangData>> ensureIconAvailable(BangData bang) async {
if (bang.iconData != null) {
return Result.success(bang);
}
final result = await ref
.read(genericWebsiteServiceProvider.notifier)
.getFaviconBytes(Uri.parse(bang.getUrl('').origin));
return result.flatMapAsync(
(faviconBytes) async {
if (faviconBytes != null && await isImageValid(faviconBytes)) {
await _db.bangDao.upsertBangIcon(bang.trigger, faviconBytes);
return bang.copyWith.iconData(faviconBytes);
}
return bang;
},
);
}
Future<int> clearIconData() {
return _db.bangIcon.deleteAll();
}
Future<int> clearFrequency() {
return _db.bangFrequency.deleteAll();
}
}
app/lib/features/bangs/domain/repositories/bang_data.g.dart
+27
View File
@@ -0,0 +1,27 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'bang_data.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$bangDataRepositoryHash() =>
r'6ac3a59546f6d7e22f3c37aacd43a3579978eb50';
/// See also [BangDataRepository].
@ProviderFor(BangDataRepository)
final bangDataRepositoryProvider =
NotifierProvider<BangDataRepository, void>.internal(
BangDataRepository.new,
name: r'bangDataRepositoryProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$bangDataRepositoryHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$BangDataRepository = Notifier<void>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
app/lib/features/bangs/domain/repositories/sync.dart
+133
View File
@@ -0,0 +1,133 @@
import 'package:bang_navigator/features/bangs/data/database/database.dart';
import 'package:bang_navigator/features/bangs/data/models/bang.dart';
import 'package:bang_navigator/features/bangs/data/providers.dart';
import 'package:bang_navigator/features/bangs/data/services/bang_source.dart';
import 'package:drift/isolate.dart';
import 'package:exceptions/exceptions.dart';
import 'package:riverpod/riverpod.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'sync.g.dart';
@Riverpod(keepAlive: true)
class BangSyncRepository extends _$BangSyncRepository {
late BangDatabase _db;
BangSyncRepository();
static Future<Result<void>> _fetchAndSync({
required BangSource sourceRepository,
required BangDatabase db,
required Uri url,
required BangGroup group,
required Duration? syncInterval,
}) async {
if (syncInterval != null) {
final lastSync =
await db.syncDao.lastSyncOfGroup(group).getSingleOrNull();
if (lastSync != null &&
lastSync.difference(DateTime.now()) < syncInterval) {
return Result.success(null);
}
}
final result = await sourceRepository.getBangs(url, group);
return result.flatMapAsync(
(remoteBangs) async {
await db.syncDao.syncBangs(
group: group,
remoteBangs: remoteBangs,
syncTime: DateTime.now(),
);
await db.optimizeFtsIndex();
},
);
}
Future<Result<void>> _syncBangGroup(
BangGroup group,
Uri url,
Duration? syncInterval,
) async {
try {
return Result.success(
await _db.computeWithDatabase(
connect: BangDatabase.new,
computation: (db) async {
final ref = ProviderContainer();
final result = await _fetchAndSync(
sourceRepository: ref.read(bangSourceProvider.notifier),
db: db,
url: url,
group: group,
syncInterval: syncInterval,
);
//Throw if necessary
return result.value;
},
),
);
} catch (e) {
return Result.failure(
ErrorMessage(
message: "Failed to sync Bangs (${group.name})",
source: 'BangSync',
details: e,
),
);
}
}
Stream<DateTime?> watchLastSyncOfGroup(BangGroup group) {
return _db.syncDao.lastSyncOfGroup(group).watchSingleOrNull();
}
Future<Result<void>> syncGeneralBangs({Duration? syncInterval}) =>
_syncBangGroup(
BangGroup.general,
Uri.parse(
'https://raw.githubusercontent.com/kagisearch/bangs/main/data/bangs.json',
),
syncInterval,
);
Future<Result<void>> syncKagiBangs({Duration? syncInterval}) =>
_syncBangGroup(
BangGroup.kagi,
Uri.parse(
'https://raw.githubusercontent.com/kagisearch/bangs/main/data/kagi_bangs.json',
),
syncInterval,
);
Future<Result<void>> syncAssistantBangs({Duration? syncInterval}) =>
_syncBangGroup(
BangGroup.assistant,
Uri.parse(
'https://raw.githubusercontent.com/kagisearch/bangs/main/data/assistant_bangs.json',
),
syncInterval,
);
Future<Map<BangGroup, Result<void>>> syncAllBangGroups({
Duration? syncInterval,
}) async {
//Run isolated operations
final generalSync = syncGeneralBangs(syncInterval: syncInterval);
final assistantSync = syncAssistantBangs(syncInterval: syncInterval);
final kagiSync = syncKagiBangs(syncInterval: syncInterval);
return {
BangGroup.general: await generalSync,
BangGroup.assistant: await assistantSync,
BangGroup.kagi: await kagiSync,
};
}
@override
void build() {
_db = ref.watch(bangDatabaseProvider);
}
}
app/lib/features/bangs/domain/repositories/bang.g.dart → app/lib/features/bangs/domain/repositories/sync.g.dart
+11 -9
View File
@@ -1,25 +1,27 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'bang.dart';
part of 'sync.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$bangRepositoryHash() => r'd405550e2ad11c57f3644f18390348efb71bdf0f';
String _$bangSyncRepositoryHash() =>
r'79b9c561638e96eb404ceeecb4b50dec31f0c610';
/// See also [BangRepository].
@ProviderFor(BangRepository)
final bangRepositoryProvider = NotifierProvider<BangRepository, void>.internal(
BangRepository.new,
name: r'bangRepositoryProvider',
/// See also [BangSyncRepository].
@ProviderFor(BangSyncRepository)
final bangSyncRepositoryProvider =
NotifierProvider<BangSyncRepository, void>.internal(
BangSyncRepository.new,
name: r'bangSyncRepositoryProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$bangRepositoryHash,
: _$bangSyncRepositoryHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$BangRepository = Notifier<void>;
typedef _$BangSyncRepository = Notifier<void>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member