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/search/domain/fts_tokenizer.dart
+34 -39
View File
@@ -19,8 +19,9 @@ sealed class FtsQueryBuilder {
///https://www.sqlite.org/fts5.html#fts5_strings
///
///Elsewise ths string needs to get quoted
static final _barewordPattern =
RegExp(r'^([^\x00-\x7F]|[\w]|[\d]|[_]|[\x1A])+$');
static final _barewordPattern = RegExp(
r'^([^\x00-\x7F]|[\w]|[\d]|[_]|[\x1A])+$',
);
static bool _isReservedBareword(Bareword input) =>
_reservedBarewords.contains(input.word);
@@ -36,27 +37,29 @@ sealed class FtsQueryBuilder {
}) {
final matches = _tokenizePattern.allMatches(input);
final barewords = matches
.map((match) {
if (match.group(1) != null) {
return EnclosedBareword(match.group(1)!);
} else if (_barewordPattern.hasMatch(match.group(2)!)) {
return SimpleBareword(match.group(2)!);
} else {
return EnclosedBareword(match.group(2)!);
}
})
.where((token) => token.word.isNotEmpty)
.whereNot(_isReservedBareword)
.toList();
final barewords =
matches
.map((match) {
if (match.group(1) != null) {
return EnclosedBareword(match.group(1)!);
} else if (_barewordPattern.hasMatch(match.group(2)!)) {
return SimpleBareword(match.group(2)!);
} else {
return EnclosedBareword(match.group(2)!);
}
})
.where((token) => token.word.isNotEmpty)
.whereNot(_isReservedBareword)
.toList();
//Merge short tokens
_mergeShortBarewords(barewords, minTokenLength);
_tokens = barewords
.where((bareword) => bareword.word.length >= minTokenLength)
.take(tokenLimit)
.toList();
_tokens =
barewords
.where((bareword) => bareword.word.length >= minTokenLength)
.take(tokenLimit)
.toList();
}
static void _mergeShortBarewords(
@@ -149,8 +152,8 @@ sealed class FtsQueryBuilder {
//Remove dependend phrases
if (joinedPhrase.whereType<JoinedBareword>().any(
(joined) => joined.dependencies.contains(bareword),
)) {
(joined) => joined.dependencies.contains(bareword),
)) {
joinedPhrase.removeAt(i);
i--;
}
@@ -164,9 +167,9 @@ sealed class FtsQueryBuilder {
String Function(List<Bareword> phrase) barewordConcat,
String phraseConcat,
) {
final phrases = _generatePhrases(tokens)
.map(_removeDependendBarewords)
.expand(_combineUnenclosed);
final phrases = _generatePhrases(
tokens,
).map(_removeDependendBarewords).expand(_combineUnenclosed);
return phrases
.where((phrase) => phrase.isNotEmpty)
@@ -189,17 +192,13 @@ final class PrefixQueryBuilder extends FtsQueryBuilder {
@override
String build() {
return _buildQuery(
_tokens,
(phrase) {
if (phrase.length == 1) {
return '${phrase.first}*';
}
return _buildQuery(_tokens, (phrase) {
if (phrase.length == 1) {
return '${phrase.first}*';
}
return 'NEAR(${phrase.map((bareword) => '$bareword*').join(' ')})';
},
' OR ',
);
return 'NEAR(${phrase.map((bareword) => '$bareword*').join(' ')})';
}, ' OR ');
}
}
@@ -212,11 +211,7 @@ final class TrigramQueryBuilder extends FtsQueryBuilder {
@override
String build() {
return _buildQuery(
_tokens,
(phrase) => phrase.join(' '),
' OR ',
);
return _buildQuery(_tokens, (phrase) => phrase.join(' '), ' OR ');
}
}
app/lib/features/search/domain/unix_tokenizer.dart
+11 -10
View File
@@ -33,16 +33,17 @@ sealed class UnixTokenizer {
}) {
final matches = _tokenizePattern.allMatches(input);
final barewords = matches
.map((match) {
if (match.group(1) != null) {
return EnclosedBareword(match.group(1)!);
} else {
return SimpleBareword(match.group(2)!);
}
})
.where((token) => token.word.isNotEmpty)
.toList();
final barewords =
matches
.map((match) {
if (match.group(1) != null) {
return EnclosedBareword(match.group(1)!);
} else {
return SimpleBareword(match.group(2)!);
}
})
.where((token) => token.word.isNotEmpty)
.toList();
//Merge short tokens
_mergeShortBarewords(barewords, minTokenLength);
app/lib/features/search/util/tokenized_filter.dart
+19 -17
View File
@@ -80,16 +80,17 @@ class TokenizedFilter<T> {
}) {
final queryTokens = _tokenize(query);
final scoredItems = items.map((item) {
final itemString = toString(item);
if (itemString == null || itemString.isEmpty) {
return (item, 0.0);
}
final scoredItems =
items.map((item) {
final itemString = toString(item);
if (itemString == null || itemString.isEmpty) {
return (item, 0.0);
}
final itemTokens = _tokenize(itemString);
final score = _calculateScore(queryTokens, itemTokens);
return (item, score);
}).toList();
final itemTokens = _tokenize(itemString);
final score = _calculateScore(queryTokens, itemTokens);
return (item, score);
}).toList();
// Sort by score in descending order
scoredItems.sort((a, b) => b.$2.compareTo(a.$2));
@@ -107,15 +108,16 @@ class TokenizedFilter<T> {
}) {
final queryTokens = _tokenize(query);
final filtered = items.where((item) {
final itemString = toString(item);
if (itemString == null || itemString.isEmpty) {
return false;
}
final filtered =
items.where((item) {
final itemString = toString(item);
if (itemString == null || itemString.isEmpty) {
return false;
}
final itemTokens = _tokenize(itemString);
return _matchTokens(queryTokens, itemTokens);
}).toList();
final itemTokens = _tokenize(itemString);
return _matchTokens(queryTokens, itemTokens);
}).toList();
return TokenizedFilter._(items, filtered);
}