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

background fetch running

Browse Source
This commit is contained in:
Fabian Freund
2025-03-05 14:27:13 +01:00
parent 20bdc4df3e
commit 70d1c1b50e
62 changed files with 898 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/web_feed/data/database/daos/article.dart
+37
View File
@@ -24,10 +24,45 @@ class ArticleDao extends DatabaseAccessor<FeedDatabase> with _$ArticleDaoMixin {
]);
}
Selectable<FeedArticle> getUnprocessedArticles() {
return db.articleView.select()..where(
(article) =>
(article.contentHtml.isNotNull() &
(article.contentMarkdown.isNull() |
article.contentPlain.isNull())) |
(article.summaryHtml.isNotNull() &
(article.summaryMarkdown.isNull() |
article.summaryPlain.isNull())),
);
}
SingleOrNullSelectable<FeedArticle> getArticleById(String articleId) {
return db.articleView.select()..where((row) => row.id.equals(articleId));
}
Future<void> updateArticleContent(List<FeedArticle> articles) {
return db.transaction(() async {
await Future.wait(
articles.map((newArticle) {
final statement =
db.article.update()
..where((article) => article.id.equals(newArticle.id));
return statement.write(
ArticleCompanion(
summaryHtml: Value(newArticle.summaryHtml),
summaryMarkdown: Value(newArticle.summaryMarkdown),
summaryPlain: Value(newArticle.summaryPlain),
contentHtml: Value(newArticle.contentHtml),
contentMarkdown: Value(newArticle.contentMarkdown),
contentPlain: Value(newArticle.contentPlain),
),
);
}),
);
});
}
Future<void> upsertArticles(List<FeedArticle> articles) {
return db.transaction(() async {
await Future.wait(
@@ -39,9 +74,11 @@ class ArticleDao extends DatabaseAccessor<FeedDatabase> with _$ArticleDaoMixin {
(old) {
return ArticleCompanion(
authors: Value(article.authors),
contentHtml: Value(article.contentHtml),
contentMarkdown: Value(article.contentMarkdown),
contentPlain: Value(article.contentPlain),
links: Value(article.links),
summaryHtml: Value(article.summaryHtml),
summaryMarkdown: Value(article.summaryMarkdown),
summaryPlain: Value(article.summaryPlain),
tags: Value(article.tags),
app/lib/features/web_feed/data/database/database.drift
+4 -1
View File
@@ -27,8 +27,10 @@ CREATE TABLE article (
authors TEXT MAPPED BY `const FeedAuthorsConverter()`,
tags TEXT MAPPED BY `const FeedCategoriesConverter()`,
links TEXT MAPPED BY `const FeedLinksConverter()`,
summaryHtml TEXT,
summaryMarkdown TEXT,
summaryPlain TEXT,
contentHtml TEXT,
contentMarkdown TEXT,
contentPlain TEXT
) WITH FeedArticle;
@@ -36,7 +38,8 @@ CREATE TABLE article (
CREATE VIEW article_view WITH FeedArticle AS
SELECT
a.*,
f.icon
f.icon,
f.site_link
FROM
article a
INNER JOIN
app/lib/features/web_feed/data/database/database.g.dart
+116
View File
@@ -547,6 +547,14 @@ class Article extends Table with TableInfo<Article, FeedArticle> {
requiredDuringInsert: false,
$customConstraints: '',
).withConverter<List<FeedLink>?>(Article.$converterlinksn);
late final GeneratedColumn<String> summaryHtml = GeneratedColumn<String>(
'summaryHtml',
aliasedName,
true,
type: DriftSqlType.string,
requiredDuringInsert: false,
$customConstraints: '',
);
late final GeneratedColumn<String> summaryMarkdown = GeneratedColumn<String>(
'summaryMarkdown',
aliasedName,
@@ -563,6 +571,14 @@ class Article extends Table with TableInfo<Article, FeedArticle> {
requiredDuringInsert: false,
$customConstraints: '',
);
late final GeneratedColumn<String> contentHtml = GeneratedColumn<String>(
'contentHtml',
aliasedName,
true,
type: DriftSqlType.string,
requiredDuringInsert: false,
$customConstraints: '',
);
late final GeneratedColumn<String> contentMarkdown = GeneratedColumn<String>(
'contentMarkdown',
aliasedName,
@@ -591,8 +607,10 @@ class Article extends Table with TableInfo<Article, FeedArticle> {
authors,
tags,
links,
summaryHtml,
summaryMarkdown,
summaryPlain,
contentHtml,
contentMarkdown,
contentPlain,
];
@@ -657,6 +675,10 @@ class Article extends Table with TableInfo<Article, FeedArticle> {
data['${effectivePrefix}links'],
),
),
summaryHtml: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}summaryHtml'],
),
summaryMarkdown: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}summaryMarkdown'],
@@ -665,6 +687,10 @@ class Article extends Table with TableInfo<Article, FeedArticle> {
DriftSqlType.string,
data['${effectivePrefix}summaryPlain'],
),
contentHtml: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}contentHtml'],
),
contentMarkdown: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}contentMarkdown'],
@@ -709,8 +735,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
final Value<List<FeedAuthor>?> authors;
final Value<List<FeedCategory>?> tags;
final Value<List<FeedLink>?> links;
final Value<String?> summaryHtml;
final Value<String?> summaryMarkdown;
final Value<String?> summaryPlain;
final Value<String?> contentHtml;
final Value<String?> contentMarkdown;
final Value<String?> contentPlain;
final Value<int> rowid;
@@ -725,8 +753,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
this.authors = const Value.absent(),
this.tags = const Value.absent(),
this.links = const Value.absent(),
this.summaryHtml = const Value.absent(),
this.summaryMarkdown = const Value.absent(),
this.summaryPlain = const Value.absent(),
this.contentHtml = const Value.absent(),
this.contentMarkdown = const Value.absent(),
this.contentPlain = const Value.absent(),
this.rowid = const Value.absent(),
@@ -742,8 +772,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
this.authors = const Value.absent(),
this.tags = const Value.absent(),
this.links = const Value.absent(),
this.summaryHtml = const Value.absent(),
this.summaryMarkdown = const Value.absent(),
this.summaryPlain = const Value.absent(),
this.contentHtml = const Value.absent(),
this.contentMarkdown = const Value.absent(),
this.contentPlain = const Value.absent(),
this.rowid = const Value.absent(),
@@ -761,8 +793,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
Expression<String>? authors,
Expression<String>? tags,
Expression<String>? links,
Expression<String>? summaryHtml,
Expression<String>? summaryMarkdown,
Expression<String>? summaryPlain,
Expression<String>? contentHtml,
Expression<String>? contentMarkdown,
Expression<String>? contentPlain,
Expression<int>? rowid,
@@ -778,8 +812,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
if (authors != null) 'authors': authors,
if (tags != null) 'tags': tags,
if (links != null) 'links': links,
if (summaryHtml != null) 'summaryHtml': summaryHtml,
if (summaryMarkdown != null) 'summaryMarkdown': summaryMarkdown,
if (summaryPlain != null) 'summaryPlain': summaryPlain,
if (contentHtml != null) 'contentHtml': contentHtml,
if (contentMarkdown != null) 'contentMarkdown': contentMarkdown,
if (contentPlain != null) 'contentPlain': contentPlain,
if (rowid != null) 'rowid': rowid,
@@ -797,8 +833,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
Value<List<FeedAuthor>?>? authors,
Value<List<FeedCategory>?>? tags,
Value<List<FeedLink>?>? links,
Value<String?>? summaryHtml,
Value<String?>? summaryMarkdown,
Value<String?>? summaryPlain,
Value<String?>? contentHtml,
Value<String?>? contentMarkdown,
Value<String?>? contentPlain,
Value<int>? rowid,
@@ -814,8 +852,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
authors: authors ?? this.authors,
tags: tags ?? this.tags,
links: links ?? this.links,
summaryHtml: summaryHtml ?? this.summaryHtml,
summaryMarkdown: summaryMarkdown ?? this.summaryMarkdown,
summaryPlain: summaryPlain ?? this.summaryPlain,
contentHtml: contentHtml ?? this.contentHtml,
contentMarkdown: contentMarkdown ?? this.contentMarkdown,
contentPlain: contentPlain ?? this.contentPlain,
rowid: rowid ?? this.rowid,
@@ -861,12 +901,18 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
Article.$converterlinksn.toSql(links.value),
);
}
if (summaryHtml.present) {
map['summaryHtml'] = Variable<String>(summaryHtml.value);
}
if (summaryMarkdown.present) {
map['summaryMarkdown'] = Variable<String>(summaryMarkdown.value);
}
if (summaryPlain.present) {
map['summaryPlain'] = Variable<String>(summaryPlain.value);
}
if (contentHtml.present) {
map['contentHtml'] = Variable<String>(contentHtml.value);
}
if (contentMarkdown.present) {
map['contentMarkdown'] = Variable<String>(contentMarkdown.value);
}
@@ -892,8 +938,10 @@ class ArticleCompanion extends UpdateCompanion<FeedArticle> {
..write('authors: $authors, ')
..write('tags: $tags, ')
..write('links: $links, ')
..write('summaryHtml: $summaryHtml, ')
..write('summaryMarkdown: $summaryMarkdown, ')
..write('summaryPlain: $summaryPlain, ')
..write('contentHtml: $contentHtml, ')
..write('contentMarkdown: $contentMarkdown, ')
..write('contentPlain: $contentPlain, ')
..write('rowid: $rowid')
@@ -920,8 +968,10 @@ class ArticleView extends ViewInfo<ArticleView, FeedArticle>
authors,
tags,
links,
summaryHtml,
summaryMarkdown,
summaryPlain,
contentHtml,
contentMarkdown,
contentPlain,
icon,
@@ -991,6 +1041,10 @@ class ArticleView extends ViewInfo<ArticleView, FeedArticle>
data['${effectivePrefix}links'],
),
),
summaryHtml: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}summaryHtml'],
),
summaryMarkdown: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}summaryMarkdown'],
@@ -999,6 +1053,10 @@ class ArticleView extends ViewInfo<ArticleView, FeedArticle>
DriftSqlType.string,
data['${effectivePrefix}summaryPlain'],
),
contentHtml: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}contentHtml'],
),
contentMarkdown: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}contentMarkdown'],
@@ -1080,6 +1138,12 @@ class ArticleView extends ViewInfo<ArticleView, FeedArticle>
true,
type: DriftSqlType.string,
).withConverter<List<FeedLink>?>(Article.$converterlinksn);
late final GeneratedColumn<String> summaryHtml = GeneratedColumn<String>(
'summaryHtml',
aliasedName,
true,
type: DriftSqlType.string,
);
late final GeneratedColumn<String> summaryMarkdown = GeneratedColumn<String>(
'summaryMarkdown',
aliasedName,
@@ -1092,6 +1156,12 @@ class ArticleView extends ViewInfo<ArticleView, FeedArticle>
true,
type: DriftSqlType.string,
);
late final GeneratedColumn<String> contentHtml = GeneratedColumn<String>(
'contentHtml',
aliasedName,
true,
type: DriftSqlType.string,
);
late final GeneratedColumn<String> contentMarkdown = GeneratedColumn<String>(
'contentMarkdown',
aliasedName,
@@ -1420,8 +1490,10 @@ abstract class _$FeedDatabase extends GeneratedDatabase {
Article.$converterlinks,
row.readNullable<String>('links'),
),
summaryHtml: row.readNullable<String>('summaryHtml'),
summaryMarkdown: row.readNullable<String>('summaryMarkdown'),
summaryPlain: row.readNullable<String>('summaryPlain'),
contentHtml: row.readNullable<String>('contentHtml'),
contentMarkdown: row.readNullable<String>('contentMarkdown'),
contentPlain: row.readNullable<String>('contentPlain'),
icon: NullAwareTypeConverter.wrapFromSql(
@@ -1473,8 +1545,10 @@ abstract class _$FeedDatabase extends GeneratedDatabase {
Article.$converterlinks,
row.readNullable<String>('links'),
),
summaryHtml: row.readNullable<String>('summaryHtml'),
summaryMarkdown: row.readNullable<String>('summaryMarkdown'),
summaryPlain: row.readNullable<String>('summaryPlain'),
contentHtml: row.readNullable<String>('contentHtml'),
contentMarkdown: row.readNullable<String>('contentMarkdown'),
contentPlain: row.readNullable<String>('contentPlain'),
icon: NullAwareTypeConverter.wrapFromSql(
@@ -1911,8 +1985,10 @@ typedef $ArticleCreateCompanionBuilder =
Value<List<FeedAuthor>?> authors,
Value<List<FeedCategory>?> tags,
Value<List<FeedLink>?> links,
Value<String?> summaryHtml,
Value<String?> summaryMarkdown,
Value<String?> summaryPlain,
Value<String?> contentHtml,
Value<String?> contentMarkdown,
Value<String?> contentPlain,
Value<int> rowid,
@@ -1929,8 +2005,10 @@ typedef $ArticleUpdateCompanionBuilder =
Value<List<FeedAuthor>?> authors,
Value<List<FeedCategory>?> tags,
Value<List<FeedLink>?> links,
Value<String?> summaryHtml,
Value<String?> summaryMarkdown,
Value<String?> summaryPlain,
Value<String?> contentHtml,
Value<String?> contentMarkdown,
Value<String?> contentPlain,
Value<int> rowid,
@@ -2018,6 +2096,11 @@ class $ArticleFilterComposer extends Composer<_$FeedDatabase, Article> {
builder: (column) => ColumnWithTypeConverterFilters(column),
);
ColumnFilters<String> get summaryHtml => $composableBuilder(
column: $table.summaryHtml,
builder: (column) => ColumnFilters(column),
);
ColumnFilters<String> get summaryMarkdown => $composableBuilder(
column: $table.summaryMarkdown,
builder: (column) => ColumnFilters(column),
@@ -2028,6 +2111,11 @@ class $ArticleFilterComposer extends Composer<_$FeedDatabase, Article> {
builder: (column) => ColumnFilters(column),
);
ColumnFilters<String> get contentHtml => $composableBuilder(
column: $table.contentHtml,
builder: (column) => ColumnFilters(column),
);
ColumnFilters<String> get contentMarkdown => $composableBuilder(
column: $table.contentMarkdown,
builder: (column) => ColumnFilters(column),
@@ -2115,6 +2203,11 @@ class $ArticleOrderingComposer extends Composer<_$FeedDatabase, Article> {
builder: (column) => ColumnOrderings(column),
);
ColumnOrderings<String> get summaryHtml => $composableBuilder(
column: $table.summaryHtml,
builder: (column) => ColumnOrderings(column),
);
ColumnOrderings<String> get summaryMarkdown => $composableBuilder(
column: $table.summaryMarkdown,
builder: (column) => ColumnOrderings(column),
@@ -2125,6 +2218,11 @@ class $ArticleOrderingComposer extends Composer<_$FeedDatabase, Article> {
builder: (column) => ColumnOrderings(column),
);
ColumnOrderings<String> get contentHtml => $composableBuilder(
column: $table.contentHtml,
builder: (column) => ColumnOrderings(column),
);
ColumnOrderings<String> get contentMarkdown => $composableBuilder(
column: $table.contentMarkdown,
builder: (column) => ColumnOrderings(column),
@@ -2194,6 +2292,11 @@ class $ArticleAnnotationComposer extends Composer<_$FeedDatabase, Article> {
GeneratedColumnWithTypeConverter<List<FeedLink>?, String> get links =>
$composableBuilder(column: $table.links, builder: (column) => column);
GeneratedColumn<String> get summaryHtml => $composableBuilder(
column: $table.summaryHtml,
builder: (column) => column,
);
GeneratedColumn<String> get summaryMarkdown => $composableBuilder(
column: $table.summaryMarkdown,
builder: (column) => column,
@@ -2204,6 +2307,11 @@ class $ArticleAnnotationComposer extends Composer<_$FeedDatabase, Article> {
builder: (column) => column,
);
GeneratedColumn<String> get contentHtml => $composableBuilder(
column: $table.contentHtml,
builder: (column) => column,
);
GeneratedColumn<String> get contentMarkdown => $composableBuilder(
column: $table.contentMarkdown,
builder: (column) => column,
@@ -2276,8 +2384,10 @@ class $ArticleTableManager
Value<List<FeedAuthor>?> authors = const Value.absent(),
Value<List<FeedCategory>?> tags = const Value.absent(),
Value<List<FeedLink>?> links = const Value.absent(),
Value<String?> summaryHtml = const Value.absent(),
Value<String?> summaryMarkdown = const Value.absent(),
Value<String?> summaryPlain = const Value.absent(),
Value<String?> contentHtml = const Value.absent(),
Value<String?> contentMarkdown = const Value.absent(),
Value<String?> contentPlain = const Value.absent(),
Value<int> rowid = const Value.absent(),
@@ -2292,8 +2402,10 @@ class $ArticleTableManager
authors: authors,
tags: tags,
links: links,
summaryHtml: summaryHtml,
summaryMarkdown: summaryMarkdown,
summaryPlain: summaryPlain,
contentHtml: contentHtml,
contentMarkdown: contentMarkdown,
contentPlain: contentPlain,
rowid: rowid,
@@ -2310,8 +2422,10 @@ class $ArticleTableManager
Value<List<FeedAuthor>?> authors = const Value.absent(),
Value<List<FeedCategory>?> tags = const Value.absent(),
Value<List<FeedLink>?> links = const Value.absent(),
Value<String?> summaryHtml = const Value.absent(),
Value<String?> summaryMarkdown = const Value.absent(),
Value<String?> summaryPlain = const Value.absent(),
Value<String?> contentHtml = const Value.absent(),
Value<String?> contentMarkdown = const Value.absent(),
Value<String?> contentPlain = const Value.absent(),
Value<int> rowid = const Value.absent(),
@@ -2326,8 +2440,10 @@ class $ArticleTableManager
authors: authors,
tags: tags,
links: links,
summaryHtml: summaryHtml,
summaryMarkdown: summaryMarkdown,
summaryPlain: summaryPlain,
contentHtml: contentHtml,
contentMarkdown: contentMarkdown,
contentPlain: contentPlain,
rowid: rowid,