switch to new bang structure
This commit is contained in:
@@ -2226,6 +2226,12 @@ class BangDataView extends i0.ViewInfo<i3.BangDataView, i5.BangData>
|
|||||||
i0.DriftSqlType.string,
|
i0.DriftSqlType.string,
|
||||||
data['${effectivePrefix}url_template'],
|
data['${effectivePrefix}url_template'],
|
||||||
)!,
|
)!,
|
||||||
|
group: i3.BangTable.$convertergroup.fromSql(
|
||||||
|
attachedDatabase.typeMapping.read(
|
||||||
|
i0.DriftSqlType.int,
|
||||||
|
data['${effectivePrefix}group'],
|
||||||
|
)!,
|
||||||
|
),
|
||||||
category: attachedDatabase.typeMapping.read(
|
category: attachedDatabase.typeMapping.read(
|
||||||
i0.DriftSqlType.string,
|
i0.DriftSqlType.string,
|
||||||
data['${effectivePrefix}category'],
|
data['${effectivePrefix}category'],
|
||||||
@@ -2362,6 +2368,7 @@ class DefinitionsDrift extends i6.ModularAccessor {
|
|||||||
domain: row.read<String>('domain'),
|
domain: row.read<String>('domain'),
|
||||||
trigger: row.read<String>('trigger'),
|
trigger: row.read<String>('trigger'),
|
||||||
urlTemplate: row.read<String>('url_template'),
|
urlTemplate: row.read<String>('url_template'),
|
||||||
|
group: i3.BangTable.$convertergroup.fromSql(row.read<int>('group')),
|
||||||
category: row.readNullable<String>('category'),
|
category: row.readNullable<String>('category'),
|
||||||
subCategory: row.readNullable<String>('sub_category'),
|
subCategory: row.readNullable<String>('sub_category'),
|
||||||
format: i3.BangTable.$converterformat.fromSql(
|
format: i3.BangTable.$converterformat.fromSql(
|
||||||
@@ -2384,6 +2391,7 @@ class DefinitionsDrift extends i6.ModularAccessor {
|
|||||||
domain: row.read<String>('domain'),
|
domain: row.read<String>('domain'),
|
||||||
trigger: row.read<String>('trigger'),
|
trigger: row.read<String>('trigger'),
|
||||||
urlTemplate: row.read<String>('url_template'),
|
urlTemplate: row.read<String>('url_template'),
|
||||||
|
group: i3.BangTable.$convertergroup.fromSql(row.read<int>('group')),
|
||||||
category: row.readNullable<String>('category'),
|
category: row.readNullable<String>('category'),
|
||||||
subCategory: row.readNullable<String>('sub_category'),
|
subCategory: row.readNullable<String>('sub_category'),
|
||||||
format: i3.BangTable.$converterformat.fromSql(
|
format: i3.BangTable.$converterformat.fromSql(
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import 'package:weblibre/features/geckoview/domain/entities/browser_icon.dart';
|
|||||||
|
|
||||||
part 'bang_data.g.dart';
|
part 'bang_data.g.dart';
|
||||||
|
|
||||||
@CopyWith()
|
@CopyWith(constructor: '_copyWith')
|
||||||
class BangData extends Bang {
|
class BangData extends Bang {
|
||||||
final int frequency;
|
final int frequency;
|
||||||
final DateTime? lastUsed;
|
final DateTime? lastUsed;
|
||||||
@@ -36,6 +36,21 @@ class BangData extends Bang {
|
|||||||
BangGroup get group => super.group!;
|
BangGroup get group => super.group!;
|
||||||
|
|
||||||
BangData({
|
BangData({
|
||||||
|
required super.websiteName,
|
||||||
|
required super.domain,
|
||||||
|
required super.trigger,
|
||||||
|
required super.urlTemplate,
|
||||||
|
required super.group,
|
||||||
|
super.category,
|
||||||
|
super.subCategory,
|
||||||
|
super.format,
|
||||||
|
int? frequency,
|
||||||
|
this.lastUsed,
|
||||||
|
this.icon,
|
||||||
|
}) : frequency = frequency ?? 0;
|
||||||
|
|
||||||
|
//For some reasons including super.group breaks generation of copywith, so we have this one for now
|
||||||
|
BangData._copyWith({
|
||||||
required super.websiteName,
|
required super.websiteName,
|
||||||
required super.domain,
|
required super.domain,
|
||||||
required super.trigger,
|
required super.trigger,
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ class _$BangDataCWProxyImpl implements _$BangDataCWProxy {
|
|||||||
Object? lastUsed = const $CopyWithPlaceholder(),
|
Object? lastUsed = const $CopyWithPlaceholder(),
|
||||||
Object? icon = const $CopyWithPlaceholder(),
|
Object? icon = const $CopyWithPlaceholder(),
|
||||||
}) {
|
}) {
|
||||||
return BangData(
|
return BangData._copyWith(
|
||||||
websiteName:
|
websiteName:
|
||||||
websiteName == const $CopyWithPlaceholder() || websiteName == null
|
websiteName == const $CopyWithPlaceholder() || websiteName == null
|
||||||
? _value.websiteName
|
? _value.websiteName
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ BangDatabase bangDatabase(Ref ref) {
|
|||||||
// put the database file, called db.sqlite here, into the documents folder
|
// put the database file, called db.sqlite here, into the documents folder
|
||||||
// for your app.
|
// for your app.
|
||||||
final dbFolder = await path_provider.getApplicationDocumentsDirectory();
|
final dbFolder = await path_provider.getApplicationDocumentsDirectory();
|
||||||
final file = File(p.join(dbFolder.path, 'bang.db'));
|
final file = File(p.join(dbFolder.path, 'bang2.db'));
|
||||||
|
|
||||||
// Also work around limitations on old Android versions
|
// Also work around limitations on old Android versions
|
||||||
if (Platform.isAndroid) {
|
if (Platform.isAndroid) {
|
||||||
|
|||||||
@@ -48,4 +48,4 @@ final class BangDatabaseProvider
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
String _$bangDatabaseHash() => r'e31cf4b499300aff65174a16fb74c7dd8ec3d6f0';
|
String _$bangDatabaseHash() => r'35142ef6c747e7c65c3417a2b6fc1c6f41d0411b';
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ class SiteSearch extends HookConsumerWidget {
|
|||||||
},
|
},
|
||||||
onDeleted: (bang) {
|
onDeleted: (bang) {
|
||||||
if (ref.read(selectedBangTriggerProvider(domain: domain)) ==
|
if (ref.read(selectedBangTriggerProvider(domain: domain)) ==
|
||||||
bang.trigger) {
|
bang.toKey()) {
|
||||||
ref
|
ref
|
||||||
.read(
|
.read(
|
||||||
selectedBangTriggerProvider(domain: domain).notifier,
|
selectedBangTriggerProvider(domain: domain).notifier,
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import 'package:weblibre/features/search/domain/entities/abstract/i_search_sugge
|
|||||||
|
|
||||||
part 'general_settings.g.dart';
|
part 'general_settings.g.dart';
|
||||||
|
|
||||||
final _fallbackSearchProvider = BangKey(
|
const _fallbackSearchProvider = BangKey(
|
||||||
group: BangGroup.general,
|
group: BangGroup.general,
|
||||||
trigger: 'wikipedia',
|
trigger: 'wikipedia',
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user