improve weblibre search

This commit is contained in:
Fabian Freund
2026-06-01 07:17:37 +02:00
parent 88f128621f
commit 453e1a6c30
23 changed files with 1095 additions and 796 deletions
@@ -3374,6 +3374,7 @@ class DefinitionsDrift extends i7.ModularAccessor {
).map(
(i0.QueryRow row) => i8.SearchHistoryEntry(
searchQuery: row.read<String>('search_query'),
group: i3.BangHistory.$convertergroup.fromSql(row.read<int>('group')),
trigger: row.read<String>('trigger'),
searchDate: row.read<DateTime>('search_date'),
),
@@ -29,7 +29,7 @@ enum BangGroup {
bundled: 'assets/bangs/kagi_bangs.json',
),
user(remote: null, bundled: null),
weblibre(remote: null, bundled: null);
weblibre(remote: null, bundled: 'assets/bangs/weblibre_bangs.json');
final String? bundled;
final String? remote;
@@ -18,18 +18,21 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import 'package:fast_equatable/fast_equatable.dart';
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
class SearchHistoryEntry with FastEquatable {
final String searchQuery;
final BangGroup group;
final String trigger;
final DateTime searchDate;
SearchHistoryEntry({
required this.searchQuery,
required this.group,
required this.trigger,
required this.searchDate,
});
@override
List<Object?> get hashParameters => [searchQuery, trigger, searchDate];
List<Object?> get hashParameters => [searchQuery, group, trigger, searchDate];
}
@@ -2,23 +2,7 @@ import 'package:weblibre/features/bangs/data/models/bang_data.dart';
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
import 'package:weblibre/features/bangs/data/models/bang_key.dart';
const webSearchBangTrigger = 'wl';
final webSearchBang = BangData(
websiteName: 'WebLibre Search',
domain: 'weblibre.eu',
trigger: webSearchBangTrigger,
// Placeholder template — selecting this bang routes the query through the
// token-based search backend instead of opening this URL.
urlTemplate: 'https://weblibre.eu/?q={{{s}}}',
group: BangGroup.weblibre,
searxngApi: false,
);
const webSearchBangKey = BangKey(
group: BangGroup.weblibre,
trigger: webSearchBangTrigger,
);
const webSearchBangKey = BangKey(group: BangGroup.weblibre, trigger: 'wl');
bool isWebSearchBang(BangData? bang) =>
bang != null && bang.toKey() == webSearchBangKey;
@@ -21,7 +21,6 @@ import 'package:exceptions/exceptions.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:weblibre/features/bangs/data/database/database.dart';
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
import 'package:weblibre/features/bangs/data/models/web_search_bang.dart';
import 'package:weblibre/features/bangs/data/providers.dart';
import 'package:weblibre/features/bangs/data/services/data_source.dart';
@@ -70,12 +69,6 @@ class BangSyncRepository extends _$BangSyncRepository {
);
}
if (group.remote == null) {
return Result.failure(
const ErrorMessage(source: 'BangSync', message: 'No remote source'),
);
}
final lastSync = await db.syncDao
.getLastSyncOfGroup(group)
.getSingleOrNull();
@@ -171,21 +164,6 @@ class BangSyncRepository extends _$BangSyncRepository {
.watchSingleOrNull();
}
Future<Result<void>> _syncSyntheticBangs() async {
try {
await ref.read(bangDatabaseProvider).bangDao.upsertBang(webSearchBang);
return Result.success(null);
} catch (e) {
return Result.failure(
ErrorMessage(
message: 'Failed to sync synthetic Bangs',
source: 'BangSync',
details: e,
),
);
}
}
Future<Map<BangGroup, Result<void>>> syncBundledBangGroups({
Set<BangGroup>? groups,
}) async {
@@ -199,10 +177,7 @@ class BangSyncRepository extends _$BangSyncRepository {
).then((result) => MapEntry(source, result)),
);
return {
...Map.fromEntries(await Future.wait(futures)),
BangGroup.weblibre: await _syncSyntheticBangs(),
};
return Map.fromEntries(await Future.wait(futures));
}
@override
@@ -42,7 +42,7 @@ final class BangSyncRepositoryProvider
}
String _$bangSyncRepositoryHash() =>
r'cdb78ef0243224fdb7b3a8660f0920c471987296';
r'd1c6709f099165c17db535ab03334fcd1c610492';
abstract class _$BangSyncRepository extends $Notifier<void> {
void build();
@@ -18,10 +18,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import 'package:flutter/material.dart';
import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:nullability/nullability.dart';
import 'package:weblibre/core/routing/routes.dart';
import 'package:weblibre/features/bangs/data/models/bang_data.dart';
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
import 'package:weblibre/features/geckoview/domain/repositories/tab.dart';
import 'package:weblibre/features/geckoview/features/tabs/data/entities/tab_mode.dart';
import 'package:weblibre/features/user/domain/repositories/general_settings.dart';
@@ -77,6 +79,15 @@ class BangDetails extends HookConsumerWidget {
],
),
),
if (bangData.group == BangGroup.weblibre)
const Tooltip(
message: 'Official WebLibre search',
child: Icon(
MdiIcons.crown,
color: Colors.amber,
size: 20.0,
),
),
],
),
const SizedBox(height: 8.0),
@@ -0,0 +1,49 @@
/*
* Copyright (c) 2024-2026 Fabian Freund.
*
* This file is part of WebLibre
* (see https://weblibre.eu).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import 'package:flutter/material.dart';
import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
import 'package:weblibre/features/bangs/data/models/bang.dart';
import 'package:weblibre/features/bangs/data/models/bang_group.dart';
/// Renders a bang's website name, appending an amber crown for the official
/// WebLibre bang ([BangGroup.weblibre]) so it stands out as first-party.
class BangLabel extends StatelessWidget {
final Bang bang;
const BangLabel(this.bang, {super.key});
@override
Widget build(BuildContext context) {
final label = Text(bang.websiteName);
if (bang.group != BangGroup.weblibre) {
return label;
}
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Flexible(child: label),
const SizedBox(width: 4.0),
const Icon(MdiIcons.crown, color: Colors.amber, size: 16.0),
],
);
}
}