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

push

Browse Source
This commit is contained in:
Fabian Freund
2025-02-03 15:09:04 +01:00
parent 36acd46318
commit 025ecaf2e3
132 changed files with 4431 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/bangs/data/database/daos/bang.dart
+2 -1
View File
@@ -1,4 +1,5 @@
import 'package:drift/drift.dart';
import 'package:lensai/extensions/nullable.dart';
import 'package:lensai/features/bangs/data/database/database.dart';
import 'package:lensai/features/bangs/data/models/bang.dart';
import 'package:lensai/features/bangs/data/models/bang_data.dart';
@@ -20,7 +21,7 @@ class BangDao extends DatabaseAccessor<BangDatabase> with _$BangDaoMixin {
SingleSelectable<int> getBangCount({Iterable<BangGroup>? groups}) {
return db.bang.count(
where: (groups != null) ? (t) => t.group.isInValues(groups) : null,
where: groups.mapNotNull((groups) => (t) => t.group.isInValues(groups)),
);
}
app/lib/features/bangs/domain/repositories/data.dart
+44 -19
View File
@@ -3,7 +3,6 @@ import 'dart:convert';
import 'package:drift/drift.dart';
import 'package:exceptions/exceptions.dart';
import 'package:lensai/domain/services/generic_website.dart';
import 'package:lensai/features/bangs/data/database/database.dart';
import 'package:lensai/features/bangs/data/models/bang.dart';
import 'package:lensai/features/bangs/data/models/bang_data.dart';
import 'package:lensai/features/bangs/data/models/search_history_entry.dart';
@@ -14,23 +13,27 @@ part 'data.g.dart';
@Riverpod(keepAlive: true)
class BangDataRepository extends _$BangDataRepository {
late BangDatabase _db;
@override
void build() {
_db = ref.watch(bangDatabaseProvider);
}
void build() {}
Stream<BangData?> watchBang(String? trigger) {
if (trigger != null) {
return _db.bangDao.getBangData(trigger).watchSingleOrNull();
return ref
.read(bangDatabaseProvider)
.bangDao
.getBangData(trigger)
.watchSingleOrNull();
} else {
return Stream.value(null);
}
}
Stream<Map<String, List<String>>> watchCategories() {
return _db.categoriesJson().watchSingle().map((json) {
return ref
.read(bangDatabaseProvider)
.categoriesJson()
.watchSingle()
.map((json) {
final decoded = jsonDecode(json) as Map<String, dynamic>;
return decoded.map(
(key, value) => MapEntry(key, (value as List<dynamic>).cast()),
@@ -39,7 +42,10 @@ class BangDataRepository extends _$BangDataRepository {
}
Stream<int> watchBangCount(BangGroup group) {
return _db.bangDao.getBangCount(groups: [group]).watchSingle();
return ref
.read(bangDatabaseProvider)
.bangDao
.getBangCount(groups: [group]).watchSingle();
}
Stream<List<BangData>> watchBangs({
@@ -48,7 +54,9 @@ class BangDataRepository extends _$BangDataRepository {
({String category, String? subCategory})? categoryFilter,
bool? orderMostFrequentFirst,
}) {
return _db.bangDao
return ref
.read(bangDatabaseProvider)
.bangDao
.getBangDataList(
groups: groups,
domain: domain,
@@ -60,15 +68,25 @@ class BangDataRepository extends _$BangDataRepository {
}
Stream<List<BangData>> watchFrequentBangs({Iterable<BangGroup>? groups}) {
return _db.bangDao.getFrequentBangDataList(groups: groups).watch();
return ref
.read(bangDatabaseProvider)
.bangDao
.getFrequentBangDataList(groups: groups)
.watch();
}
Stream<List<SearchHistoryEntry>> watchSearchHistory({required int limit}) {
return _db.searchHistoryEntries(limit: limit).watch();
return ref
.read(bangDatabaseProvider)
.searchHistoryEntries(limit: limit)
.watch();
}
Future<void> increaseFrequency(String trigger) {
return _db.bangDao.increaseBangFrequency(trigger);
return ref
.read(bangDatabaseProvider)
.bangDao
.increaseBangFrequency(trigger);
}
Future<void> addSearchEntry(
@@ -76,17 +94,21 @@ class BangDataRepository extends _$BangDataRepository {
String searchQuery, {
required int maxEntryCount,
}) {
final db = ref.read(bangDatabaseProvider);
//Pack in a transaction to bundle rebuilds of watch() queries
return _db.transaction(
return db.transaction(
() async {
await _db.bangDao.addSearchEntry(trigger, searchQuery);
await _db.evictHistoryEntries(limit: maxEntryCount);
await db.bangDao.addSearchEntry(trigger, searchQuery);
await db.evictHistoryEntries(limit: maxEntryCount);
},
);
}
Future<void> removeSearchEntry(String searchQuery) {
return _db.bangDao.removeSearchEntry(searchQuery);
return ref
.read(bangDatabaseProvider)
.bangDao
.removeSearchEntry(searchQuery);
}
Future<Result<BangData>> ensureIconAvailable(BangData bang) async {
@@ -110,10 +132,13 @@ class BangDataRepository extends _$BangDataRepository {
}
Future<int> resetFrequencies() {
return _db.bangFrequency.deleteAll();
return ref.read(bangDatabaseProvider).bangFrequency.deleteAll();
}
Future<int> resetFrequency(String trigger) {
return _db.bangFrequency.deleteWhere((t) => t.trigger.equals(trigger));
return ref
.read(bangDatabaseProvider)
.bangFrequency
.deleteWhere((t) => t.trigger.equals(trigger));
}
}
app/lib/features/bangs/domain/repositories/data.g.dart
+1 -1
View File
@@ -7,7 +7,7 @@ part of 'data.dart';
// **************************************************************************
String _$bangDataRepositoryHash() =>
r'b51786552a812ddd54d1418450fe03ff89351e28';
r'2c009519cf02df4d3cbb6768dbe55e9eb696e126';
/// See also [BangDataRepository].
@ProviderFor(BangDataRepository)
app/lib/features/bangs/domain/repositories/search.dart
+6 -4
View File
@@ -1,6 +1,5 @@
import 'dart:async';
import 'package:lensai/features/bangs/data/database/database.dart';
import 'package:lensai/features/bangs/data/models/bang_data.dart';
import 'package:lensai/features/bangs/data/providers.dart';
import 'package:lensai/features/bangs/domain/providers/bangs.dart';
@@ -11,17 +10,20 @@ part 'search.g.dart';
@Riverpod()
class BangSearch extends _$BangSearch {
late StreamController<List<BangData>> _streamController;
late BangDatabase _db;
Future<void> search(String input) async {
if (input.isNotEmpty) {
await _db.bangDao.queryBangs(input).get().then(_streamController.add);
await ref
.read(bangDatabaseProvider)
.bangDao
.queryBangs(input)
.get()
.then(_streamController.add);
}
}
@override
Stream<List<BangData>> build() {
_db = ref.watch(bangDatabaseProvider);
_streamController = StreamController();
ref.onDispose(() async {
app/lib/features/bangs/domain/repositories/search.g.dart
+1 -1
View File
@@ -6,7 +6,7 @@ part of 'search.dart';
// RiverpodGenerator
// **************************************************************************
String _$bangSearchHash() => r'abd71f10288ac1f559e66fc11035f9f2b027c353';
String _$bangSearchHash() => r'632ddd09a1198394884cb5c27a2bde7850c0515b';
/// See also [BangSearch].
@ProviderFor(BangSearch)
app/lib/features/bangs/domain/repositories/sync.dart
+21 -23
View File
@@ -11,10 +11,6 @@ part 'sync.g.dart';
@Riverpod(keepAlive: true)
class BangSyncRepository extends _$BangSyncRepository {
late BangDatabase _db;
BangSyncRepository();
static Future<Result<void>> _fetchAndSync({
required BangSourceService sourceService,
required BangDatabase db,
@@ -51,22 +47,22 @@ class BangSyncRepository extends _$BangSyncRepository {
) async {
try {
return Result.success(
await _db.computeWithDatabase(
connect: BangDatabase.new,
computation: (db) async {
final ref = ProviderContainer();
final result = await _fetchAndSync(
sourceService: ref.read(bangSourceServiceProvider.notifier),
db: db,
url: Uri.parse(group.url),
group: group,
syncInterval: syncInterval,
);
await ref.read(bangDatabaseProvider).computeWithDatabase(
connect: BangDatabase.new,
computation: (db) async {
final ref = ProviderContainer();
final result = await _fetchAndSync(
sourceService: ref.read(bangSourceServiceProvider.notifier),
db: db,
url: Uri.parse(group.url),
group: group,
syncInterval: syncInterval,
);
//Throw if necessary
return result.value;
},
),
//Throw if necessary
return result.value;
},
),
);
} catch (e) {
return Result.failure(
@@ -80,7 +76,11 @@ class BangSyncRepository extends _$BangSyncRepository {
}
Stream<DateTime?> watchLastSyncOfGroup(BangGroup group) {
return _db.syncDao.lastSyncOfGroup(group).watchSingleOrNull();
return ref
.read(bangDatabaseProvider)
.syncDao
.lastSyncOfGroup(group)
.watchSingleOrNull();
}
Future<Map<BangGroup, Result<void>>> syncBangGroups({
@@ -100,7 +100,5 @@ class BangSyncRepository extends _$BangSyncRepository {
}
@override
void build() {
_db = ref.watch(bangDatabaseProvider);
}
void build() {}
}
app/lib/features/bangs/domain/repositories/sync.g.dart
+1 -1
View File
@@ -7,7 +7,7 @@ part of 'sync.dart';
// **************************************************************************
String _$bangSyncRepositoryHash() =>
r'86933b05d01629c67ed0443df91e991c40136423';
r'a46813f953e550585f432b11c364d87791819c34';
/// See also [BangSyncRepository].
@ProviderFor(BangSyncRepository)
app/lib/features/bangs/presentation/screens/list.dart
+3 -3
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:lensai/core/routing/routes.dart';
import 'package:lensai/extensions/nullable.dart';
import 'package:lensai/features/bangs/domain/providers/bangs.dart';
import 'package:lensai/features/bangs/presentation/widgets/bang_details.dart';
import 'package:lensai/features/geckoview/features/browser/domain/entities/sheet.dart';
@@ -21,9 +22,8 @@ class BangListScreen extends HookConsumerWidget {
final bangsAsync = ref.watch(
bangDataListProvider(
filter: (
categoryFilter: (category != null)
? (category: category!, subCategory: subCategory)
: null,
categoryFilter: category.mapNotNull(
(category) => (category: category, subCategory: subCategory)),
domain: null,
groups: null,
orderMostFrequentFirst: null,
app/lib/features/bangs/presentation/screens/search.dart
+2 -4
View File
@@ -8,7 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:lensai/features/bangs/domain/repositories/search.dart';
import 'package:lensai/features/bangs/presentation/widgets/bang_details.dart';
import 'package:lensai/features/geckoview/features/browser/domain/providers.dart';
import 'package:lensai/features/user/domain/repositories/settings.dart';
import 'package:lensai/features/user/domain/providers.dart';
import 'package:lensai/presentation/hooks/listenable_callback.dart';
import 'package:lensai/presentation/widgets/failure_widget.dart';
@@ -20,9 +20,7 @@ class BangSearchScreen extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final resultsAsync = ref.watch(bangSearchProvider);
final incognitoEnabled = ref.watch(
settingsRepositoryProvider.select((value) => value.incognitoMode),
);
final incognitoEnabled = ref.watch(incognitoModeEnabledProvider);
final textEditingController =
useTextEditingController(text: initialSearchText);