diff options
author | Zéro~Informatique | 2022-07-26 08:44:34 +0200 |
---|---|---|
committer | pacien | 2022-09-03 01:30:42 +0200 |
commit | 00510820a2794efcadbc83f7f8b54318fe198ecb (patch) | |
tree | a894d99c22a601197869c7a6928d40bb4ae2c392 /viewer/src/services/indexSearch.ts | |
parent | 88aa098c07e067f9f737fbeba1f52a9bd5042e53 (diff) | |
download | ldgallery-00510820a2794efcadbc83f7f8b54318fe198ecb.tar.gz |
viewer: migrate to vue 3, general refactoring and cleanup
Non-exhaustive list of fixes and improvements done at the same time:
- html default background to grey (avoids white flash during init)
- unified links behavior
- added more theme variables
- removed the flex-expand transition (it wasn't working) and replaced it
with a slide
- fixed LdLoading not centered on the content
- title on removable tags
- fixed an issue with encoded URI from vue-router
- unified Item resource URLs
- removed the iframe for PlainTextViewer (it wasn't working properly)
and replaced it with a pre
- fixed clear and search buttons tabindex
- fixed the information panel bumping up during the fade animation of
tag's dropdown
- fixed some focus outlines not appearing correctly
- moved CSS variables to the :root context
- Code cleaning
GitHub: closes #217
GitHub: closes #300
GitHub: closes #297
GitHub: closes #105
GitHub: closes #267
GitHub: closes #275
GitHub: closes #228
GitHub: closes #215
GitHub: closes #112
Diffstat (limited to 'viewer/src/services/indexSearch.ts')
-rw-r--r-- | viewer/src/services/indexSearch.ts | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/viewer/src/services/indexSearch.ts b/viewer/src/services/indexSearch.ts new file mode 100644 index 0000000..df0a600 --- /dev/null +++ b/viewer/src/services/indexSearch.ts | |||
@@ -0,0 +1,74 @@ | |||
1 | /* ldgallery - A static generator which turns a collection of tagged | ||
2 | -- pictures into a searchable web gallery. | ||
3 | -- | ||
4 | -- Copyright (C) 2019-2022 Guillaume FOUET | ||
5 | -- | ||
6 | -- This program is free software: you can redistribute it and/or modify | ||
7 | -- it under the terms of the GNU Affero General Public License as | ||
8 | -- published by the Free Software Foundation, either version 3 of the | ||
9 | -- License, or (at your option) any later version. | ||
10 | -- | ||
11 | -- This program is distributed in the hope that it will be useful, | ||
12 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | -- GNU Affero General Public License for more details. | ||
15 | -- | ||
16 | -- You should have received a copy of the GNU Affero General Public License | ||
17 | -- along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
18 | */ | ||
19 | |||
20 | import { Item } from '@/@types/gallery'; | ||
21 | import { Operation } from '@/@types/operation'; | ||
22 | import { TagSearch, TagSearchByOperation } from '@/@types/tag'; | ||
23 | |||
24 | function _extractTagsByOperation(searchTags: TagSearch[]): TagSearchByOperation { | ||
25 | const byOperation: TagSearchByOperation = {}; | ||
26 | Object.values(Operation).forEach( | ||
27 | operation => (byOperation[operation] = searchTags.filter(tag => tag.operation === operation)), | ||
28 | ); | ||
29 | return byOperation; | ||
30 | } | ||
31 | |||
32 | function _extractIntersection(byOperation: TagSearchByOperation): Set<Item> { | ||
33 | const intersection = new Set<Item>(); | ||
34 | if (byOperation[Operation.INTERSECTION].length > 0) { | ||
35 | byOperation[Operation.INTERSECTION] | ||
36 | .map(tag => tag.items) | ||
37 | .reduce((a, b) => a.filter(c => b.includes(c))) | ||
38 | .flatMap(items => items) | ||
39 | .forEach(item => intersection.add(item)); | ||
40 | } | ||
41 | return intersection; | ||
42 | } | ||
43 | |||
44 | function _extractSubstraction(byOperation: TagSearchByOperation): Set<Item> { | ||
45 | const substraction = new Set<Item>(); | ||
46 | if (byOperation[Operation.SUBSTRACTION].length > 0) { | ||
47 | byOperation[Operation.SUBSTRACTION].flatMap(tag => tag.items).forEach(item => substraction.add(item)); | ||
48 | } | ||
49 | return substraction; | ||
50 | } | ||
51 | |||
52 | function _aggregateAll( | ||
53 | byOperation: TagSearchByOperation, | ||
54 | intersection: Set<Item>, | ||
55 | substraction: Set<Item>, | ||
56 | ): Item[] { | ||
57 | byOperation[Operation.ADDITION].flatMap(tag => tag.items).forEach(item => intersection.add(item)); | ||
58 | substraction.forEach(item => intersection.delete(item)); | ||
59 | return [...intersection]; | ||
60 | } | ||
61 | |||
62 | // --- | ||
63 | |||
64 | export const useIndexSearch = () => { | ||
65 | // Results of the search (by tags) | ||
66 | function indexSearch(searchTags: TagSearch[]): Item[] { | ||
67 | const byOperation = _extractTagsByOperation(searchTags); | ||
68 | const intersection = _extractIntersection(byOperation); | ||
69 | const substraction = _extractSubstraction(byOperation); | ||
70 | return _aggregateAll(byOperation, intersection, substraction); | ||
71 | } | ||
72 | |||
73 | return indexSearch; | ||
74 | }; | ||