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/itemComparator.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/itemComparator.ts')
-rw-r--r-- | viewer/src/services/itemComparator.ts | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/viewer/src/services/itemComparator.ts b/viewer/src/services/itemComparator.ts new file mode 100644 index 0000000..25010b8 --- /dev/null +++ b/viewer/src/services/itemComparator.ts | |||
@@ -0,0 +1,93 @@ | |||
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, ItemSortStr } from '@/@types/gallery'; | ||
21 | import i18n from '@/plugins/i18n'; | ||
22 | import { isDirectory } from './itemGuards'; | ||
23 | |||
24 | const { t } = i18n.global; | ||
25 | |||
26 | export type ItemComparator = (left: Item, right: Item) => number; | ||
27 | export type ItemSort = { name: ItemSortStr, text: string; fn: ItemComparator }; | ||
28 | |||
29 | function _sortByPathAsc(left: Item, right: Item): number { | ||
30 | return left.path.localeCompare(right.path, undefined, { | ||
31 | sensitivity: 'base', | ||
32 | ignorePunctuation: true, | ||
33 | numeric: true, | ||
34 | }); | ||
35 | } | ||
36 | |||
37 | function _sortByTitleAsc(left: Item, right: Item): number { | ||
38 | return left.title.localeCompare(right.title, undefined, { | ||
39 | sensitivity: 'base', | ||
40 | ignorePunctuation: true, | ||
41 | numeric: true, | ||
42 | }); | ||
43 | } | ||
44 | |||
45 | function _sortByDateAsc(left: Item, right: Item): number { | ||
46 | return left.datetime.localeCompare(right.datetime); // TODO: handle timezones | ||
47 | } | ||
48 | |||
49 | function _sortDirectoryFirst(left: Item, right: Item): number { | ||
50 | const dLeft = isDirectory(left) ? 1 : 0; | ||
51 | const dRight = isDirectory(right) ? 1 : 0; | ||
52 | return dRight - dLeft; | ||
53 | } | ||
54 | |||
55 | function _reverse(fn: ItemComparator): ItemComparator { | ||
56 | return (l, r) => -fn(l, r); | ||
57 | } | ||
58 | |||
59 | function _chain(comparators: ItemComparator[]): ItemComparator { | ||
60 | return comparators.reduce((primary, tieBreaker) => (l, r) => { | ||
61 | const primaryComparison = primary(l, r); | ||
62 | return primaryComparison !== 0 ? primaryComparison : tieBreaker(l, r); | ||
63 | }); | ||
64 | } | ||
65 | |||
66 | // --- | ||
67 | |||
68 | export const useItemComparator = () => { | ||
69 | const ITEM_SORTS: ItemSort[] = [ | ||
70 | { | ||
71 | name: 'title_asc', | ||
72 | text: t('command.sort.byTitleAsc'), | ||
73 | fn: _chain([_sortDirectoryFirst, _sortByTitleAsc, _sortByPathAsc]), | ||
74 | }, | ||
75 | { | ||
76 | name: 'date_asc', | ||
77 | text: t('command.sort.byDateAsc'), | ||
78 | fn: _chain([_sortDirectoryFirst, _sortByDateAsc, _sortByPathAsc]), | ||
79 | }, | ||
80 | { | ||
81 | name: 'date_desc', | ||
82 | text: t('command.sort.byDateDesc'), | ||
83 | fn: _chain([_sortDirectoryFirst, _reverse(_sortByDateAsc), _sortByPathAsc]), | ||
84 | }, | ||
85 | ]; | ||
86 | |||
87 | const DEFAULT = ITEM_SORTS[2]; // date_desc | ||
88 | |||
89 | return { | ||
90 | ITEM_SORTS, | ||
91 | DEFAULT, | ||
92 | }; | ||
93 | }; | ||