Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor 013: Cleaup query, index related codes #602

Merged
merged 8 commits into from
Dec 30, 2024
Merged

Refactor 013: Cleaup query, index related codes #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a3d2b1
Rename HitomiIndexes -> HentaiIndex
violet-dev Dec 30, 2024
eb4b1ea
Compose tag count map to index
violet-dev Dec 30, 2024
91a7339
Move autocomplete methods to index
violet-dev Dec 30, 2024
b526f76
Extract normalize tag prefix
violet-dev Dec 30, 2024
b57f000
Extract translate2query
violet-dev Dec 30, 2024
28dc54f
Tidy query translate
violet-dev Dec 30, 2024
7401ef7
Rename 'recent' prefix
violet-dev Dec 30, 2024
9fc0039
Fix clippy
violet-dev Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions violet/lib/component/hentai.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import 'package:violet/component/hitomi/hitomi.dart';
import 'package:violet/component/hitomi/hitomi_parser.dart';
import 'package:violet/component/hitomi/hitomi_provider.dart';
import 'package:violet/component/image_provider.dart';
import 'package:violet/component/query_translate.dart';
import 'package:violet/database/database.dart';
import 'package:violet/database/query.dart';
import 'package:violet/log/log.dart';
Expand Down Expand Up @@ -68,7 +69,7 @@ class HentaiManager {
}

static Future<SearchResult> idSearch(String what) async {
final queryString = HitomiManager.translate2query(what);
final queryString = translate2query(what);
final queryResult = (await (await DataBaseManager.getInstance())
.query('$queryString ORDER BY Id DESC LIMIT 1 OFFSET 0'))
.map((e) => QueryResult(result: e))
Expand Down Expand Up @@ -237,7 +238,7 @@ class HentaiManager {
return const SearchResult(results: [], offset: -1);
}
}
final queryString = HitomiManager.translate2query(
final queryString = translate2query(
'$wwhat ${Settings.includeTags} ${Settings.serializedExcludeTags}');

// if (offset == 0 && seed < 0) _latestSeed = new Random().nextDouble() + 1;
Expand All @@ -258,7 +259,7 @@ class HentaiManager {
}

static Future<SearchResult> _dbSearch(String what, [int offset = 0]) async {
final queryString = HitomiManager.translate2query(
final queryString = translate2query(
'$what ${Settings.includeTags} ${Settings.serializedExcludeTags}');

await Logger.info('[Database Query]\nSQL: $queryString');
Expand Down Expand Up @@ -315,7 +316,7 @@ class HentaiManager {
}

static Future<int> countSearch(String what) async {
final queryString = HitomiManager.translate2query(
final queryString = translate2query(
'$what ${Settings.includeTags} ${Settings.serializedExcludeTags}');

var count = (await (await DataBaseManager.getInstance()).query(queryString
Expand Down
Loading
Loading