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

increase min sdk and apply new formatter

Browse Source
This commit is contained in:
Fabian Freund
2025-02-18 15:37:03 +01:00
parent f7885fc829
commit a1ee8bef35
266 changed files with 11329 additions and 10058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/chat_archive/data/database/daos/search.dart
+1 -3
View File
@@ -24,9 +24,7 @@ class SearchDao extends DatabaseAccessor<ChatSearchDatabase>
return db.chat.insertOne(
chat,
onConflict: DoUpdate(
(old) => ChatCompanion.custom(
content: Variable(chat.content.value),
),
(old) => ChatCompanion.custom(content: Variable(chat.content.value)),
),
);
}
app/lib/features/chat_archive/data/database/database.dart
+1 -4
View File
@@ -4,10 +4,7 @@ import 'package:lensai/features/search/domain/fts_tokenizer.dart';
part 'database.g.dart';
@DriftDatabase(
include: {'database.drift'},
daos: [SearchDao],
)
@DriftDatabase(include: {'database.drift'}, daos: [SearchDao])
class ChatSearchDatabase extends _$ChatSearchDatabase
with TrigramQueryBuilderMixin {
@override
app/lib/features/chat_archive/data/database/database.g.dart
+352 -258
View File
@@ -9,20 +9,29 @@ class Chat extends Table with TableInfo<Chat, ChatData> {
final String? _alias;
Chat(this.attachedDatabase, [this._alias]);
late final GeneratedColumn<String> fileName = GeneratedColumn<String>(
'file_name', aliasedName, false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: 'PRIMARY KEY NOT NULL');
'file_name',
aliasedName,
false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: 'PRIMARY KEY NOT NULL',
);
late final GeneratedColumn<String> title = GeneratedColumn<String>(
'title', aliasedName, false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: 'NOT NULL');
'title',
aliasedName,
false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: 'NOT NULL',
);
late final GeneratedColumn<String> content = GeneratedColumn<String>(
'content', aliasedName, false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: 'NOT NULL');
'content',
aliasedName,
false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: 'NOT NULL',
);
@override
List<GeneratedColumn> get $columns => [fileName, title, content];
@override
@@ -36,12 +45,21 @@ class Chat extends Table with TableInfo<Chat, ChatData> {
ChatData map(Map<String, dynamic> data, {String? tablePrefix}) {
final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
return ChatData(
fileName: attachedDatabase.typeMapping
.read(DriftSqlType.string, data['${effectivePrefix}file_name'])!,
title: attachedDatabase.typeMapping
.read(DriftSqlType.string, data['${effectivePrefix}title'])!,
content: attachedDatabase.typeMapping
.read(DriftSqlType.string, data['${effectivePrefix}content'])!,
fileName:
attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}file_name'],
)!,
title:
attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}title'],
)!,
content:
attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}content'],
)!,
);
}
@@ -58,8 +76,11 @@ class ChatData extends DataClass implements Insertable<ChatData> {
final String fileName;
final String title;
final String content;
const ChatData(
{required this.fileName, required this.title, required this.content});
const ChatData({
required this.fileName,
required this.title,
required this.content,
});
@override
Map<String, Expression> toColumns(bool nullToAbsent) {
final map = <String, Expression>{};
@@ -69,8 +90,10 @@ class ChatData extends DataClass implements Insertable<ChatData> {
return map;
}
factory ChatData.fromJson(Map<String, dynamic> json,
{ValueSerializer? serializer}) {
factory ChatData.fromJson(
Map<String, dynamic> json, {
ValueSerializer? serializer,
}) {
serializer ??= driftRuntimeOptions.defaultSerializer;
return ChatData(
fileName: serializer.fromJson<String>(json['file_name']),
@@ -139,9 +162,9 @@ class ChatCompanion extends UpdateCompanion<ChatData> {
required String title,
required String content,
this.rowid = const Value.absent(),
}) : fileName = Value(fileName),
title = Value(title),
content = Value(content);
}) : fileName = Value(fileName),
title = Value(title),
content = Value(content);
static Insertable<ChatData> custom({
Expression<String>? fileName,
Expression<String>? title,
@@ -156,11 +179,12 @@ class ChatCompanion extends UpdateCompanion<ChatData> {
});
}
ChatCompanion copyWith(
{Value<String>? fileName,
Value<String>? title,
Value<String>? content,
Value<int>? rowid}) {
ChatCompanion copyWith({
Value<String>? fileName,
Value<String>? title,
Value<String>? content,
Value<int>? rowid,
}) {
return ChatCompanion(
fileName: fileName ?? this.fileName,
title: title ?? this.title,
@@ -206,15 +230,21 @@ class ChatFts extends Table
final String? _alias;
ChatFts(this.attachedDatabase, [this._alias]);
late final GeneratedColumn<String> title = GeneratedColumn<String>(
'title', aliasedName, false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: '');
'title',
aliasedName,
false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: '',
);
late final GeneratedColumn<String> content = GeneratedColumn<String>(
'content', aliasedName, false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: '');
'content',
aliasedName,
false,
type: DriftSqlType.string,
requiredDuringInsert: true,
$customConstraints: '',
);
@override
List<GeneratedColumn> get $columns => [title, content];
@override
@@ -228,10 +258,16 @@ class ChatFts extends Table
ChatFt map(Map<String, dynamic> data, {String? tablePrefix}) {
final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
return ChatFt(
title: attachedDatabase.typeMapping
.read(DriftSqlType.string, data['${effectivePrefix}title'])!,
content: attachedDatabase.typeMapping
.read(DriftSqlType.string, data['${effectivePrefix}content'])!,
title:
attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}title'],
)!,
content:
attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}content'],
)!,
);
}
@@ -259,8 +295,10 @@ class ChatFt extends DataClass implements Insertable<ChatFt> {
return map;
}
factory ChatFt.fromJson(Map<String, dynamic> json,
{ValueSerializer? serializer}) {
factory ChatFt.fromJson(
Map<String, dynamic> json, {
ValueSerializer? serializer,
}) {
serializer ??= driftRuntimeOptions.defaultSerializer;
return ChatFt(
title: serializer.fromJson<String>(json['title']),
@@ -276,10 +314,8 @@ class ChatFt extends DataClass implements Insertable<ChatFt> {
};
}
ChatFt copyWith({String? title, String? content}) => ChatFt(
title: title ?? this.title,
content: content ?? this.content,
);
ChatFt copyWith({String? title, String? content}) =>
ChatFt(title: title ?? this.title, content: content ?? this.content);
ChatFt copyWithCompanion(ChatFtsCompanion data) {
return ChatFt(
title: data.title.present ? data.title.value : this.title,
@@ -319,8 +355,8 @@ class ChatFtsCompanion extends UpdateCompanion<ChatFt> {
required String title,
required String content,
this.rowid = const Value.absent(),
}) : title = Value(title),
content = Value(content);
}) : title = Value(title),
content = Value(content);
static Insertable<ChatFt> custom({
Expression<String>? title,
Expression<String>? content,
@@ -333,8 +369,11 @@ class ChatFtsCompanion extends UpdateCompanion<ChatFt> {
});
}
ChatFtsCompanion copyWith(
{Value<String>? title, Value<String>? content, Value<int>? rowid}) {
ChatFtsCompanion copyWith({
Value<String>? title,
Value<String>? content,
Value<int>? rowid,
}) {
return ChatFtsCompanion(
title: title ?? this.title,
content: content ?? this.content,
@@ -374,86 +413,95 @@ abstract class _$ChatSearchDatabase extends GeneratedDatabase {
late final Chat chat = Chat(this);
late final ChatFts chatFts = ChatFts(this);
late final Trigger chatAfterInsert = Trigger(
'CREATE TRIGGER chat_after_insert AFTER INSERT ON chat BEGIN INSERT INTO chat_fts ("rowid", title, content) VALUES (new."rowid", new.title, new.content);END',
'chat_after_insert');
'CREATE TRIGGER chat_after_insert AFTER INSERT ON chat BEGIN INSERT INTO chat_fts ("rowid", title, content) VALUES (new."rowid", new.title, new.content);END',
'chat_after_insert',
);
late final Trigger chatAfterDelete = Trigger(
'CREATE TRIGGER chat_after_delete AFTER DELETE ON chat BEGIN INSERT INTO chat_fts (chat_fts, "rowid", title, content) VALUES (\'delete\', old."rowid", old.title, old.content);END',
'chat_after_delete');
'CREATE TRIGGER chat_after_delete AFTER DELETE ON chat BEGIN INSERT INTO chat_fts (chat_fts, "rowid", title, content) VALUES (\'delete\', old."rowid", old.title, old.content);END',
'chat_after_delete',
);
late final Trigger chatAfterUpdate = Trigger(
'CREATE TRIGGER chat_after_update AFTER UPDATE ON chat BEGIN INSERT INTO chat_fts (chat_fts, "rowid", title, content) VALUES (\'delete\', old."rowid", old.title, old.content);INSERT INTO chat_fts ("rowid", title, content) VALUES (new."rowid", new.title, new.content);END',
'chat_after_update');
'CREATE TRIGGER chat_after_update AFTER UPDATE ON chat BEGIN INSERT INTO chat_fts (chat_fts, "rowid", title, content) VALUES (\'delete\', old."rowid", old.title, old.content);INSERT INTO chat_fts ("rowid", title, content) VALUES (new."rowid", new.title, new.content);END',
'chat_after_update',
);
late final SearchDao searchDao = SearchDao(this as ChatSearchDatabase);
Selectable<ChatQueryResult> chatQuery(
{required String beforeMatch,
required String afterMatch,
required String ellipsis,
required int snippetLength,
required String query}) {
Selectable<ChatQueryResult> chatQuery({
required String beforeMatch,
required String afterMatch,
required String ellipsis,
required int snippetLength,
required String query,
}) {
return customSelect(
'SELECT c.file_name, highlight(chat_fts, 0, ?1, ?2) AS title, snippet(chat_fts, 1, ?1, ?2, ?3, ?4) AS content_snippet FROM chat_fts(?5)AS fts INNER JOIN chat AS c ON c."rowid" = fts."rowid" ORDER BY RANK',
variables: [
Variable<String>(beforeMatch),
Variable<String>(afterMatch),
Variable<String>(ellipsis),
Variable<int>(snippetLength),
Variable<String>(query)
],
readsFrom: {
chat,
chatFts,
}).map((QueryRow row) => ChatQueryResult(
fileName: row.read<String>('file_name'),
title: row.readNullable<String>('title'),
contentSnippet: row.readNullable<String>('content_snippet'),
));
'SELECT c.file_name, highlight(chat_fts, 0, ?1, ?2) AS title, snippet(chat_fts, 1, ?1, ?2, ?3, ?4) AS content_snippet FROM chat_fts(?5)AS fts INNER JOIN chat AS c ON c."rowid" = fts."rowid" ORDER BY RANK',
variables: [
Variable<String>(beforeMatch),
Variable<String>(afterMatch),
Variable<String>(ellipsis),
Variable<int>(snippetLength),
Variable<String>(query),
],
readsFrom: {chat, chatFts},
).map(
(QueryRow row) => ChatQueryResult(
fileName: row.read<String>('file_name'),
title: row.readNullable<String>('title'),
contentSnippet: row.readNullable<String>('content_snippet'),
),
);
}
@override
Iterable<TableInfo<Table, Object?>> get allTables =>
allSchemaEntities.whereType<TableInfo<Table, Object?>>();
@override
List<DatabaseSchemaEntity> get allSchemaEntities =>
[chat, chatFts, chatAfterInsert, chatAfterDelete, chatAfterUpdate];
List<DatabaseSchemaEntity> get allSchemaEntities => [
chat,
chatFts,
chatAfterInsert,
chatAfterDelete,
chatAfterUpdate,
];
@override
StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules(
[
WritePropagation(
on: TableUpdateQuery.onTableName('chat',
limitUpdateKind: UpdateKind.insert),
result: [
TableUpdate('chat_fts', kind: UpdateKind.insert),
],
),
WritePropagation(
on: TableUpdateQuery.onTableName('chat',
limitUpdateKind: UpdateKind.delete),
result: [
TableUpdate('chat_fts', kind: UpdateKind.insert),
],
),
WritePropagation(
on: TableUpdateQuery.onTableName('chat',
limitUpdateKind: UpdateKind.update),
result: [
TableUpdate('chat_fts', kind: UpdateKind.insert),
],
),
],
);
StreamQueryUpdateRules get streamUpdateRules => const StreamQueryUpdateRules([
WritePropagation(
on: TableUpdateQuery.onTableName(
'chat',
limitUpdateKind: UpdateKind.insert,
),
result: [TableUpdate('chat_fts', kind: UpdateKind.insert)],
),
WritePropagation(
on: TableUpdateQuery.onTableName(
'chat',
limitUpdateKind: UpdateKind.delete,
),
result: [TableUpdate('chat_fts', kind: UpdateKind.insert)],
),
WritePropagation(
on: TableUpdateQuery.onTableName(
'chat',
limitUpdateKind: UpdateKind.update,
),
result: [TableUpdate('chat_fts', kind: UpdateKind.insert)],
),
]);
}
typedef $ChatCreateCompanionBuilder = ChatCompanion Function({
required String fileName,
required String title,
required String content,
Value<int> rowid,
});
typedef $ChatUpdateCompanionBuilder = ChatCompanion Function({
Value<String> fileName,
Value<String> title,
Value<String> content,
Value<int> rowid,
});
typedef $ChatCreateCompanionBuilder =
ChatCompanion Function({
required String fileName,
required String title,
required String content,
Value<int> rowid,
});
typedef $ChatUpdateCompanionBuilder =
ChatCompanion Function({
Value<String> fileName,
Value<String> title,
Value<String> content,
Value<int> rowid,
});
class $ChatFilterComposer extends Composer<_$ChatSearchDatabase, Chat> {
$ChatFilterComposer({
@@ -464,13 +512,19 @@ class $ChatFilterComposer extends Composer<_$ChatSearchDatabase, Chat> {
super.$removeJoinBuilderFromRootComposer,
});
ColumnFilters<String> get fileName => $composableBuilder(
column: $table.fileName, builder: (column) => ColumnFilters(column));
column: $table.fileName,
builder: (column) => ColumnFilters(column),
);
ColumnFilters<String> get title => $composableBuilder(
column: $table.title, builder: (column) => ColumnFilters(column));
column: $table.title,
builder: (column) => ColumnFilters(column),
);
ColumnFilters<String> get content => $composableBuilder(
column: $table.content, builder: (column) => ColumnFilters(column));
column: $table.content,
builder: (column) => ColumnFilters(column),
);
}
class $ChatOrderingComposer extends Composer<_$ChatSearchDatabase, Chat> {
@@ -482,13 +536,19 @@ class $ChatOrderingComposer extends Composer<_$ChatSearchDatabase, Chat> {
super.$removeJoinBuilderFromRootComposer,
});
ColumnOrderings<String> get fileName => $composableBuilder(
column: $table.fileName, builder: (column) => ColumnOrderings(column));
column: $table.fileName,
builder: (column) => ColumnOrderings(column),
);
ColumnOrderings<String> get title => $composableBuilder(
column: $table.title, builder: (column) => ColumnOrderings(column));
column: $table.title,
builder: (column) => ColumnOrderings(column),
);
ColumnOrderings<String> get content => $composableBuilder(
column: $table.content, builder: (column) => ColumnOrderings(column));
column: $table.content,
builder: (column) => ColumnOrderings(column),
);
}
class $ChatAnnotationComposer extends Composer<_$ChatSearchDatabase, Chat> {
@@ -509,81 +569,97 @@ class $ChatAnnotationComposer extends Composer<_$ChatSearchDatabase, Chat> {
$composableBuilder(column: $table.content, builder: (column) => column);
}
class $ChatTableManager extends RootTableManager<
_$ChatSearchDatabase,
Chat,
ChatData,
$ChatFilterComposer,
$ChatOrderingComposer,
$ChatAnnotationComposer,
$ChatCreateCompanionBuilder,
$ChatUpdateCompanionBuilder,
(ChatData, BaseReferences<_$ChatSearchDatabase, Chat, ChatData>),
ChatData,
PrefetchHooks Function()> {
class $ChatTableManager
extends
RootTableManager<
_$ChatSearchDatabase,
Chat,
ChatData,
$ChatFilterComposer,
$ChatOrderingComposer,
$ChatAnnotationComposer,
$ChatCreateCompanionBuilder,
$ChatUpdateCompanionBuilder,
(ChatData, BaseReferences<_$ChatSearchDatabase, Chat, ChatData>),
ChatData,
PrefetchHooks Function()
> {
$ChatTableManager(_$ChatSearchDatabase db, Chat table)
: super(TableManagerState(
: super(
TableManagerState(
db: db,
table: table,
createFilteringComposer: () =>
$ChatFilterComposer($db: db, $table: table),
createOrderingComposer: () =>
$ChatOrderingComposer($db: db, $table: table),
createComputedFieldComposer: () =>
$ChatAnnotationComposer($db: db, $table: table),
updateCompanionCallback: ({
Value<String> fileName = const Value.absent(),
Value<String> title = const Value.absent(),
Value<String> content = const Value.absent(),
Value<int> rowid = const Value.absent(),
}) =>
ChatCompanion(
fileName: fileName,
title: title,
content: content,
rowid: rowid,
),
createCompanionCallback: ({
required String fileName,
required String title,
required String content,
Value<int> rowid = const Value.absent(),
}) =>
ChatCompanion.insert(
fileName: fileName,
title: title,
content: content,
rowid: rowid,
),
withReferenceMapper: (p0) => p0
.map((e) => (e.readTable(table), BaseReferences(db, table, e)))
.toList(),
createFilteringComposer:
() => $ChatFilterComposer($db: db, $table: table),
createOrderingComposer:
() => $ChatOrderingComposer($db: db, $table: table),
createComputedFieldComposer:
() => $ChatAnnotationComposer($db: db, $table: table),
updateCompanionCallback:
({
Value<String> fileName = const Value.absent(),
Value<String> title = const Value.absent(),
Value<String> content = const Value.absent(),
Value<int> rowid = const Value.absent(),
}) => ChatCompanion(
fileName: fileName,
title: title,
content: content,
rowid: rowid,
),
createCompanionCallback:
({
required String fileName,
required String title,
required String content,
Value<int> rowid = const Value.absent(),
}) => ChatCompanion.insert(
fileName: fileName,
title: title,
content: content,
rowid: rowid,
),
withReferenceMapper:
(p0) =>
p0
.map(
(e) => (
e.readTable(table),
BaseReferences(db, table, e),
),
)
.toList(),
prefetchHooksCallback: null,
));
),
);
}
typedef $ChatProcessedTableManager = ProcessedTableManager<
_$ChatSearchDatabase,
Chat,
ChatData,
$ChatFilterComposer,
$ChatOrderingComposer,
$ChatAnnotationComposer,
$ChatCreateCompanionBuilder,
$ChatUpdateCompanionBuilder,
(ChatData, BaseReferences<_$ChatSearchDatabase, Chat, ChatData>),
ChatData,
PrefetchHooks Function()>;
typedef $ChatFtsCreateCompanionBuilder = ChatFtsCompanion Function({
required String title,
required String content,
Value<int> rowid,
});
typedef $ChatFtsUpdateCompanionBuilder = ChatFtsCompanion Function({
Value<String> title,
Value<String> content,
Value<int> rowid,
});
typedef $ChatProcessedTableManager =
ProcessedTableManager<
_$ChatSearchDatabase,
Chat,
ChatData,
$ChatFilterComposer,
$ChatOrderingComposer,
$ChatAnnotationComposer,
$ChatCreateCompanionBuilder,
$ChatUpdateCompanionBuilder,
(ChatData, BaseReferences<_$ChatSearchDatabase, Chat, ChatData>),
ChatData,
PrefetchHooks Function()
>;
typedef $ChatFtsCreateCompanionBuilder =
ChatFtsCompanion Function({
required String title,
required String content,
Value<int> rowid,
});
typedef $ChatFtsUpdateCompanionBuilder =
ChatFtsCompanion Function({
Value<String> title,
Value<String> content,
Value<int> rowid,
});
class $ChatFtsFilterComposer extends Composer<_$ChatSearchDatabase, ChatFts> {
$ChatFtsFilterComposer({
@@ -594,10 +670,14 @@ class $ChatFtsFilterComposer extends Composer<_$ChatSearchDatabase, ChatFts> {
super.$removeJoinBuilderFromRootComposer,
});
ColumnFilters<String> get title => $composableBuilder(
column: $table.title, builder: (column) => ColumnFilters(column));
column: $table.title,
builder: (column) => ColumnFilters(column),
);
ColumnFilters<String> get content => $composableBuilder(
column: $table.content, builder: (column) => ColumnFilters(column));
column: $table.content,
builder: (column) => ColumnFilters(column),
);
}
class $ChatFtsOrderingComposer extends Composer<_$ChatSearchDatabase, ChatFts> {
@@ -609,10 +689,14 @@ class $ChatFtsOrderingComposer extends Composer<_$ChatSearchDatabase, ChatFts> {
super.$removeJoinBuilderFromRootComposer,
});
ColumnOrderings<String> get title => $composableBuilder(
column: $table.title, builder: (column) => ColumnOrderings(column));
column: $table.title,
builder: (column) => ColumnOrderings(column),
);
ColumnOrderings<String> get content => $composableBuilder(
column: $table.content, builder: (column) => ColumnOrderings(column));
column: $table.content,
builder: (column) => ColumnOrderings(column),
);
}
class $ChatFtsAnnotationComposer
@@ -631,67 +715,81 @@ class $ChatFtsAnnotationComposer
$composableBuilder(column: $table.content, builder: (column) => column);
}
class $ChatFtsTableManager extends RootTableManager<
_$ChatSearchDatabase,
ChatFts,
ChatFt,
$ChatFtsFilterComposer,
$ChatFtsOrderingComposer,
$ChatFtsAnnotationComposer,
$ChatFtsCreateCompanionBuilder,
$ChatFtsUpdateCompanionBuilder,
(ChatFt, BaseReferences<_$ChatSearchDatabase, ChatFts, ChatFt>),
ChatFt,
PrefetchHooks Function()> {
class $ChatFtsTableManager
extends
RootTableManager<
_$ChatSearchDatabase,
ChatFts,
ChatFt,
$ChatFtsFilterComposer,
$ChatFtsOrderingComposer,
$ChatFtsAnnotationComposer,
$ChatFtsCreateCompanionBuilder,
$ChatFtsUpdateCompanionBuilder,
(ChatFt, BaseReferences<_$ChatSearchDatabase, ChatFts, ChatFt>),
ChatFt,
PrefetchHooks Function()
> {
$ChatFtsTableManager(_$ChatSearchDatabase db, ChatFts table)
: super(TableManagerState(
: super(
TableManagerState(
db: db,
table: table,
createFilteringComposer: () =>
$ChatFtsFilterComposer($db: db, $table: table),
createOrderingComposer: () =>
$ChatFtsOrderingComposer($db: db, $table: table),
createComputedFieldComposer: () =>
$ChatFtsAnnotationComposer($db: db, $table: table),
updateCompanionCallback: ({
Value<String> title = const Value.absent(),
Value<String> content = const Value.absent(),
Value<int> rowid = const Value.absent(),
}) =>
ChatFtsCompanion(
title: title,
content: content,
rowid: rowid,
),
createCompanionCallback: ({
required String title,
required String content,
Value<int> rowid = const Value.absent(),
}) =>
ChatFtsCompanion.insert(
title: title,
content: content,
rowid: rowid,
),
withReferenceMapper: (p0) => p0
.map((e) => (e.readTable(table), BaseReferences(db, table, e)))
.toList(),
createFilteringComposer:
() => $ChatFtsFilterComposer($db: db, $table: table),
createOrderingComposer:
() => $ChatFtsOrderingComposer($db: db, $table: table),
createComputedFieldComposer:
() => $ChatFtsAnnotationComposer($db: db, $table: table),
updateCompanionCallback:
({
Value<String> title = const Value.absent(),
Value<String> content = const Value.absent(),
Value<int> rowid = const Value.absent(),
}) => ChatFtsCompanion(
title: title,
content: content,
rowid: rowid,
),
createCompanionCallback:
({
required String title,
required String content,
Value<int> rowid = const Value.absent(),
}) => ChatFtsCompanion.insert(
title: title,
content: content,
rowid: rowid,
),
withReferenceMapper:
(p0) =>
p0
.map(
(e) => (
e.readTable(table),
BaseReferences(db, table, e),
),
)
.toList(),
prefetchHooksCallback: null,
));
),
);
}
typedef $ChatFtsProcessedTableManager = ProcessedTableManager<
_$ChatSearchDatabase,
ChatFts,
ChatFt,
$ChatFtsFilterComposer,
$ChatFtsOrderingComposer,
$ChatFtsAnnotationComposer,
$ChatFtsCreateCompanionBuilder,
$ChatFtsUpdateCompanionBuilder,
(ChatFt, BaseReferences<_$ChatSearchDatabase, ChatFts, ChatFt>),
ChatFt,
PrefetchHooks Function()>;
typedef $ChatFtsProcessedTableManager =
ProcessedTableManager<
_$ChatSearchDatabase,
ChatFts,
ChatFt,
$ChatFtsFilterComposer,
$ChatFtsOrderingComposer,
$ChatFtsAnnotationComposer,
$ChatFtsCreateCompanionBuilder,
$ChatFtsUpdateCompanionBuilder,
(ChatFt, BaseReferences<_$ChatSearchDatabase, ChatFts, ChatFt>),
ChatFt,
PrefetchHooks Function()
>;
class $ChatSearchDatabaseManager {
final _$ChatSearchDatabase _db;
@@ -704,9 +802,5 @@ class ChatQueryResult {
final String fileName;
final String? title;
final String? contentSnippet;
ChatQueryResult({
required this.fileName,
this.title,
this.contentSnippet,
});
ChatQueryResult({required this.fileName, this.title, this.contentSnippet});
}
app/lib/features/chat_archive/data/providers.g.dart
+9 -8
View File
@@ -13,14 +13,15 @@ String _$chatSearchDatabaseHash() =>
@ProviderFor(chatSearchDatabase)
final chatSearchDatabaseProvider =
AutoDisposeProvider<ChatSearchDatabase>.internal(
chatSearchDatabase,
name: r'chatSearchDatabaseProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$chatSearchDatabaseHash,
dependencies: null,
allTransitiveDependencies: null,
);
chatSearchDatabase,
name: r'chatSearchDatabaseProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$chatSearchDatabaseHash,
dependencies: null,
allTransitiveDependencies: null,
);
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
app/lib/features/chat_archive/data/services/file.dart
+15 -12
View File
@@ -11,19 +11,21 @@ class ChatArchiveFileService extends _$ChatArchiveFileService {
final Future<Directory> _archiveDirectoryFuture;
ChatArchiveFileService()
: _archiveDirectoryFuture =
path_provider.getApplicationDocumentsDirectory().then(
(documentDirectory) => Directory(
path.join(documentDirectory.path, 'archive', 'chat'),
).create(recursive: true),
);
: _archiveDirectoryFuture = path_provider
.getApplicationDocumentsDirectory()
.then(
(documentDirectory) => Directory(
path.join(documentDirectory.path, 'archive', 'chat'),
).create(recursive: true),
);
Future<List<FileSystemEntity>> list() {
return _archiveDirectoryFuture.then(
(value) => value
.list()
.where((file) => path.extension(file.path) == '.md')
.toList(),
(value) =>
value
.list()
.where((file) => path.extension(file.path) == '.md')
.toList(),
);
}
@@ -56,8 +58,9 @@ class ChatArchiveFileService extends _$ChatArchiveFileService {
Stream<WatchEvent> _directoryStream() async* {
final watcher = DirectoryWatcher(
await _archiveDirectoryFuture
.then((archiveDirectory) => archiveDirectory.absolute.path),
await _archiveDirectoryFuture.then(
(archiveDirectory) => archiveDirectory.absolute.path,
),
);
yield* watcher.events.where((event) => path.extension(event.path) == '.md');
app/lib/features/chat_archive/data/services/file.g.dart
+7 -4
View File
@@ -12,12 +12,15 @@ String _$chatArchiveFileServiceHash() =>
/// See also [ChatArchiveFileService].
@ProviderFor(ChatArchiveFileService)
final chatArchiveFileServiceProvider = AutoDisposeNotifierProvider<
ChatArchiveFileService, Raw<Stream<WatchEvent>>>.internal(
ChatArchiveFileService,
Raw<Stream<WatchEvent>>
>.internal(
ChatArchiveFileService.new,
name: r'chatArchiveFileServiceProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$chatArchiveFileServiceHash,
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$chatArchiveFileServiceHash,
dependencies: null,
allTransitiveDependencies: null,
);
app/lib/features/chat_archive/domain/repositories/archive.dart
+16 -15
View File
@@ -21,8 +21,9 @@ class ChatArchiveRepository extends _$ChatArchiveRepository {
}
Future<Result<void>> archiveChat(String fileName, Uri url) async {
final contentsResult =
await ref.read(kagiChatServiceProvider.notifier).downloadChat(url);
final contentsResult = await ref
.read(kagiChatServiceProvider.notifier)
.downloadChat(url);
return contentsResult.flatMapAsync(
(contents) => ref
@@ -37,14 +38,15 @@ class ChatArchiveRepository extends _$ChatArchiveRepository {
);
return contentsResult.fold(
(value) => (value == null)
? Result.failure(
ErrorMessage(
source: 'Chat Archive',
message: 'Chat $fileName not found',
),
)
: Result.success(value),
(value) =>
(value == null)
? Result.failure(
ErrorMessage(
source: 'Chat Archive',
message: 'Chat $fileName not found',
),
)
: Result.success(value),
onFailure: Result.failure,
);
}
@@ -55,17 +57,16 @@ class ChatArchiveRepository extends _$ChatArchiveRepository {
yield* ConcatStream([
listArchivedChats().asStream(),
fileRepository.asyncMap(
(_) => listArchivedChats(),
),
fileRepository.asyncMap((_) => listArchivedChats()),
]);
}
}
@Riverpod()
Future<String> readArchivedChat(Ref ref, String fileName) async {
final result =
await ref.read(chatArchiveRepositoryProvider.notifier).readChat(fileName);
final result = await ref
.read(chatArchiveRepositoryProvider.notifier)
.readChat(fileName);
return result.value;
}
app/lib/features/chat_archive/domain/repositories/archive.g.dart
+26 -32
View File
@@ -39,21 +39,15 @@ class ReadArchivedChatFamily extends Family<AsyncValue<String>> {
const ReadArchivedChatFamily();
/// See also [readArchivedChat].
ReadArchivedChatProvider call(
String fileName,
) {
return ReadArchivedChatProvider(
fileName,
);
ReadArchivedChatProvider call(String fileName) {
return ReadArchivedChatProvider(fileName);
}
@override
ReadArchivedChatProvider getProviderOverride(
covariant ReadArchivedChatProvider provider,
) {
return call(
provider.fileName,
);
return call(provider.fileName);
}
static const Iterable<ProviderOrFamily>? _dependencies = null;
@@ -74,24 +68,20 @@ class ReadArchivedChatFamily extends Family<AsyncValue<String>> {
/// See also [readArchivedChat].
class ReadArchivedChatProvider extends AutoDisposeFutureProvider<String> {
/// See also [readArchivedChat].
ReadArchivedChatProvider(
String fileName,
) : this._internal(
(ref) => readArchivedChat(
ref as ReadArchivedChatRef,
fileName,
),
from: readArchivedChatProvider,
name: r'readArchivedChatProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$readArchivedChatHash,
dependencies: ReadArchivedChatFamily._dependencies,
allTransitiveDependencies:
ReadArchivedChatFamily._allTransitiveDependencies,
fileName: fileName,
);
ReadArchivedChatProvider(String fileName)
: this._internal(
(ref) => readArchivedChat(ref as ReadArchivedChatRef, fileName),
from: readArchivedChatProvider,
name: r'readArchivedChatProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$readArchivedChatHash,
dependencies: ReadArchivedChatFamily._dependencies,
allTransitiveDependencies:
ReadArchivedChatFamily._allTransitiveDependencies,
fileName: fileName,
);
ReadArchivedChatProvider._internal(
super._createNotifier, {
@@ -150,7 +140,8 @@ mixin ReadArchivedChatRef on AutoDisposeFutureProviderRef<String> {
}
class _ReadArchivedChatProviderElement
extends AutoDisposeFutureProviderElement<String> with ReadArchivedChatRef {
extends AutoDisposeFutureProviderElement<String>
with ReadArchivedChatRef {
_ReadArchivedChatProviderElement(super.provider);
@override
@@ -163,12 +154,15 @@ String _$chatArchiveRepositoryHash() =>
/// See also [ChatArchiveRepository].
@ProviderFor(ChatArchiveRepository)
final chatArchiveRepositoryProvider = AutoDisposeStreamNotifierProvider<
ChatArchiveRepository, List<ChatEntity>>.internal(
ChatArchiveRepository,
List<ChatEntity>
>.internal(
ChatArchiveRepository.new,
name: r'chatArchiveRepositoryProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$chatArchiveRepositoryHash,
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$chatArchiveRepositoryHash,
dependencies: null,
allTransitiveDependencies: null,
);
app/lib/features/chat_archive/domain/repositories/search.dart
+21 -22
View File
@@ -74,13 +74,11 @@ class ChatArchiveSearchRepository extends _$ChatArchiveSearchRepository {
ellipsis: ellipsis,
)
.get()
.then(
(value) {
if (!_streamController.isClosed) {
_streamController.add(value);
}
},
);
.then((value) {
if (!_streamController.isClosed) {
_streamController.add(value);
}
});
}
}
@@ -96,23 +94,24 @@ class ChatArchiveSearchRepository extends _$ChatArchiveSearchRepository {
await searchDatabase.searchDao.indexChats(await _availableChats());
_populatedCompleter.complete();
final changeStreamSubscription =
ref.watch(chatArchiveFileServiceProvider).listen((event) async {
final chat = ChatEntity.fromFileName(path.basename(event.path));
final changeStreamSubscription = ref
.watch(chatArchiveFileServiceProvider)
.listen((event) async {
final chat = ChatEntity.fromFileName(path.basename(event.path));
switch (event.type) {
case ChangeType.ADD:
case ChangeType.MODIFY:
if (chat.name != null) {
final companion = await _readChat(chat);
if (companion != null) {
await searchDatabase.searchDao.upsertChat(companion);
}
switch (event.type) {
case ChangeType.ADD:
case ChangeType.MODIFY:
if (chat.name != null) {
final companion = await _readChat(chat);
if (companion != null) {
await searchDatabase.searchDao.upsertChat(companion);
}
}
case ChangeType.REMOVE:
await searchDatabase.searchDao.deleteChat(chat.fileName);
}
case ChangeType.REMOVE:
await searchDatabase.searchDao.deleteChat(chat.fileName);
}
});
});
ref.onDispose(() async {
await changeStreamSubscription.cancel();
app/lib/features/chat_archive/domain/repositories/search.g.dart
+9 -6
View File
@@ -12,17 +12,20 @@ String _$chatArchiveSearchRepositoryHash() =>
/// See also [ChatArchiveSearchRepository].
@ProviderFor(ChatArchiveSearchRepository)
final chatArchiveSearchRepositoryProvider = AutoDisposeStreamNotifierProvider<
ChatArchiveSearchRepository, List<ChatQueryResult>>.internal(
ChatArchiveSearchRepository,
List<ChatQueryResult>
>.internal(
ChatArchiveSearchRepository.new,
name: r'chatArchiveSearchRepositoryProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$chatArchiveSearchRepositoryHash,
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$chatArchiveSearchRepositoryHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$ChatArchiveSearchRepository
= AutoDisposeStreamNotifier<List<ChatQueryResult>>;
typedef _$ChatArchiveSearchRepository =
AutoDisposeStreamNotifier<List<ChatQueryResult>>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
app/lib/features/chat_archive/presentation/screens/detail.dart
+18 -21
View File
@@ -62,9 +62,7 @@ class ChatArchiveDetailScreen extends HookConsumerWidget {
onPressed: () async {
if (chatAsync.valueOrNull != null) {
await Clipboard.setData(
ClipboardData(
text: chatAsync.valueOrNull!,
),
ClipboardData(text: chatAsync.valueOrNull!),
);
}
},
@@ -94,23 +92,24 @@ class ChatArchiveDetailScreen extends HookConsumerWidget {
enabled: chatAsync.isLoading,
justifyMultiLineText: false,
child: chatAsync.when(
data: (data) => Markdown(
data: data,
selectable: true,
onTapLink: (text, href, title) async {
if (href != null) {
if (Uri.parse(href) case final Uri url) {
await ref
.read(tabRepositoryProvider.notifier)
.addTab(url: url);
data:
(data) => Markdown(
data: data,
selectable: true,
onTapLink: (text, href, title) async {
if (href != null) {
if (Uri.parse(href) case final Uri url) {
await ref
.read(tabRepositoryProvider.notifier)
.addTab(url: url);
if (context.mounted) {
context.go(BrowserRoute().location);
if (context.mounted) {
context.go(BrowserRoute().location);
}
}
}
}
}
},
),
},
),
error: (error, stackTrace) {
return FailureWidget(
title: 'Could not load chat',
@@ -118,9 +117,7 @@ class ChatArchiveDetailScreen extends HookConsumerWidget {
onRetry: () => ref.refresh(readArchivedChatProvider(fileName)),
);
},
loading: () => const Bone.multiText(
lines: 15,
),
loading: () => const Bone.multiText(lines: 15),
),
),
);
app/lib/features/chat_archive/presentation/screens/list.dart
+12 -9
View File
@@ -48,8 +48,9 @@ class ChatArchiveListScreen extends HookConsumerWidget {
),
onTap: () async {
await context.push(
ChatArchiveDetailRoute(fileName: chat.fileName)
.location,
ChatArchiveDetailRoute(
fileName: chat.fileName,
).location,
);
},
);
@@ -65,13 +66,15 @@ class ChatArchiveListScreen extends HookConsumerWidget {
onRetry: () => ref.refresh(chatArchiveRepositoryProvider),
);
},
loading: () => ListView.builder(
itemCount: 3,
itemBuilder: (context, index) => const ListTile(
title: Bone.text(),
subtitle: Bone.text(),
),
),
loading:
() => ListView.builder(
itemCount: 3,
itemBuilder:
(context, index) => const ListTile(
title: Bone.text(),
subtitle: Bone.text(),
),
),
),
),
);
app/lib/features/chat_archive/presentation/screens/search.dart
+47 -47
View File
@@ -56,58 +56,58 @@ class ChatArchiveSearchScreen extends HookConsumerWidget {
),
body: resultsAsync.when(
skipLoadingOnReload: true,
data: (chats) => FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return ListView.builder(
controller: controller,
itemCount: chats.length,
itemBuilder: (context, index) {
final chat = chats[index];
final chatEntity = ChatEntity.fromFileName(chat.fileName);
data:
(chats) => FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return ListView.builder(
controller: controller,
itemCount: chats.length,
itemBuilder: (context, index) {
final chat = chats[index];
final chatEntity = ChatEntity.fromFileName(chat.fileName);
return Card(
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: () async {
await context.push(
ChatArchiveDetailRoute(fileName: chat.fileName)
.location,
);
},
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
MarkdownBody(
data: '## ${chat.title}',
return Card(
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: () async {
await context.push(
ChatArchiveDetailRoute(
fileName: chat.fileName,
).location,
);
},
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
MarkdownBody(data: '## ${chat.title}'),
if (chatEntity.dateTime != null)
Text(
chatEntity.dateTime!
.formatWithMinutePrecision(),
),
const SizedBox(height: 8.0),
if (chat.contentSnippet != null)
MarkdownBody(data: chat.contentSnippet!),
],
),
if (chatEntity.dateTime != null)
Text(
chatEntity.dateTime!.formatWithMinutePrecision(),
),
const SizedBox(height: 8.0),
if (chat.contentSnippet != null)
MarkdownBody(
data: chat.contentSnippet!,
),
],
),
),
),
),
);
},
);
},
);
},
),
error: (error, stackTrace) => Center(
child: FailureWidget(
title: 'Chat Search failed',
exception: error,
),
),
),
error:
(error, stackTrace) => Center(
child: FailureWidget(
title: 'Chat Search failed',
exception: error,
),
),
loading: () => const SizedBox.shrink(),
),
);