Skip to content

feat(bookmarks): support excluding tags with - prefix in search #684

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

Open
esefxdz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(bookmarks): support excluding tags with - prefix in search #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
922d2f8
feat(bookmarks): support excluding tags with - prefix in search
esefxdz Jul 4, 2026
351c7a3
feat(bookmarks): extend tag exclusion to also match source host
esefxdz Jul 4, 2026
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
21 changes: 16 additions & 5 deletions lib/core/bookmarks/src/providers/local_providers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,33 @@ enum BookmarkSortType {
List<Bookmark> filterBookmarks({
required List<Bookmark> bookmarks,
required List<String> selectedTags,
required List<String> excludedTags,
required BookmarkSortType sortType,
String? selectedBooruUrl,
BookmarkShuffleState? shuffleState,
}) {
final tagsList = selectedTags;
final excludeList = excludedTags;

final hasFilters =
selectedBooruUrl != null || tagsList.isNotEmpty || excludeList.isNotEmpty;

// Filter bookmarks based on URL and tags.
final filtered = selectedBooruUrl == null && tagsList.isEmpty
? bookmarks
: bookmarks.where(
final filtered = hasFilters
? bookmarks.where(
(bookmark) =>
(selectedBooruUrl == null ||
bookmark.sourceUrl.contains(selectedBooruUrl)) &&
(tagsList.isEmpty ||
tagsList.every((tag) => bookmark.tags.contains(tag))),
);
tagsList.every((tag) => bookmark.tags.contains(tag))) &&
(excludeList.isEmpty ||
excludeList.every(
(tag) =>
!bookmark.tags.contains(tag) &&
!bookmark.sourceUrl.contains(tag),
)),
)
: bookmarks;

final sorted = filtered
.sorted(
Expand Down
12 changes: 9 additions & 3 deletions lib/core/bookmarks/src/providers/suggestion_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,16 @@ class TagSuggestionsNotifier
);

try {
final tags = tagString.trim().split(' ');
final tag = tags.lastOrNull?.trim();
final segments = tagString.trim().split(' ');
final rawTag = segments.lastOrNull?.trim() ?? '';

if (tag == null || tag.isEmpty) {
// Strip leading - for exclusion tag suggestions
final tag = switch (rawTag) {
String t when t.startsWith('-') => t.substring(1),
_ => rawTag,
};

if (tag.isEmpty) {
state = AsyncValue.data(
currentState.copyWith(
suggestions: const [],
Expand Down
39 changes: 28 additions & 11 deletions lib/core/bookmarks/src/widgets/bookmark_scroll_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,29 @@ class BookmarkScrollView extends ConsumerStatefulWidget {
class _BookmarkScrollViewState extends ConsumerState<BookmarkScrollView> {
final _selectionModeController = SelectionModeController();

List<String> _parseTagsFromText(String text) {
return text.isEmpty
? <String>[]
: text
.trim()
.replaceAll(RegExp(r'\s+'), ' ')
.split(' ')
.where((e) => e.isNotEmpty)
.toList();
({
List<String> include,
List<String> exclude,
})
_parseTagsFromText(String text) {
if (text.isEmpty) {
return (include: <String>[], exclude: <String>[]);
}

final segments = text
.trim()
.replaceAll(RegExp(r'\s+'), ' ')
.split(' ')
.where((e) => e.isNotEmpty)
.toList();

return (
include: segments.where((e) => !e.startsWith('-')).toList(),
exclude: segments
.where((e) => e.startsWith('-'))
.map((e) => e.substring(1))
.toList(),
);
}

@override
Expand All @@ -81,12 +95,15 @@ class _BookmarkScrollViewState extends ConsumerState<BookmarkScrollView> {
},
fetcher: (page) => TaskEither.Do(
($) async {
final searchTags = _parseTagsFromText(widget.searchController.text);
final (:include, :exclude) = _parseTagsFromText(
widget.searchController.text,
);
final sortType = ref.read(selectedBookmarkSortTypeProvider);
final selectedBooruUrl = ref.read(selectedBooruUrlProvider);
final shuffleState = ref.read(bookmarkShuffleProvider);
final bookmarks = filterBookmarks(
selectedTags: searchTags,
selectedTags: include,
excludedTags: exclude,
bookmarks: await (await ref.read(bookmarkRepoProvider.future))
.getAllBookmarksOrEmpty(
imageUrlResolver: (booruId) =>
Expand Down
8 changes: 6 additions & 2 deletions lib/core/bookmarks/src/widgets/bookmark_search_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,13 @@ class _BookmarkSearchBarState extends ConsumerState<BookmarkSearchBar> {
child: _Overlay(
controller: widget.controller,
onTap: (tag) {
final text = widget.controller.text;
final lastSegment = text.split(' ').last;
final isExcluding = lastSegment.startsWith('-');
final adjustedTag = isExcluding ? '-${tag.tag}' : tag.tag;
widget.controller.text = replaceOrAppendTag(
widget.controller.text,
tag.tag,
text,
adjustedTag,
);
_search();
},
Expand Down