5 files changed, 35 insertions, 30 deletions

diff --git a/viewer/src/services/indexfactory.ts b/viewer/src/services/indexfactory.ts
index 4b28a60..0c5fdc5 100644
--- a/viewer/src/services/indexfactory.ts
+++ b/viewer/src/services/indexfactory.ts
@@ -17,19 +17,20 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Operation } from "@/@types/Operation";
+import { Item, RawTag } from "@/@types/gallery";
 import { ItemType } from "@/@types/ItemType";
+import { Operation } from "@/@types/Operation";
 import Navigation from "@/services/navigation";
 
 export default class IndexFactory {
-  public static generateTags(root: Gallery.Item | null): Tag.Index {
+  public static generateTags(root: Item | null): Tag.Index {
     const tagsIndex: Tag.Index = {};
     if (root) IndexFactory.pushTagsForItem(tagsIndex, root);
     return tagsIndex;
   }
 
   // Pushes all tags for a root item (and its children) to the index
-  private static pushTagsForItem(tagsIndex: Tag.Index, item: Gallery.Item): void {
+  private static pushTagsForItem(tagsIndex: Tag.Index, item: Item): void {
     if (item.properties.type === ItemType.DIRECTORY) {
       item.properties.items.forEach(item => this.pushTagsForItem(tagsIndex, item));
       return; // Directories are not indexed
@@ -49,7 +50,7 @@ export default class IndexFactory {
     }
   }
 
-  private static pushPartToIndex(index: Tag.Node, part: string, item: Gallery.Item, rootPart: boolean): Tag.Node {
+  private static pushPartToIndex(index: Tag.Node, part: string, item: Item, rootPart: boolean): Tag.Node {
     if (!index)
       index = {
         tag: part,
@@ -131,7 +132,7 @@ export default class IndexFactory {
 
   // ---
 
-  public static generateCategories(tagsIndex: Tag.Index, categoryTags?: Gallery.RawTag[]): Tag.Category[] {
+  public static generateCategories(tagsIndex: Tag.Index, categoryTags?: RawTag[]): Tag.Category[] {
     if (!categoryTags?.length) return [{ tag: "", index: tagsIndex }];
 
     const tagsCategories: Tag.Category[] = [];
@@ -149,7 +150,7 @@ export default class IndexFactory {
     return tagsCategories;
   }
 
-  private static isDiscriminantTagOnly(tags: Gallery.RawTag[], node: Tag.Node): boolean {
+  private static isDiscriminantTagOnly(tags: RawTag[], node: Tag.Node): boolean {
     return !tags.includes(node.tag) || !node.childPart;
   }
 }
diff --git a/viewer/src/services/indexsearch.ts b/viewer/src/services/indexsearch.ts
index 00f8cfc..eda1b27 100644
--- a/viewer/src/services/indexsearch.ts
+++ b/viewer/src/services/indexsearch.ts
@@ -17,11 +17,12 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Item } from "@/@types/gallery";
 import { Operation } from "@/@types/Operation";
 
 export default class IndexSearch {
   // Results of the search (by tags)
-  public static search(searchTags: Tag.Search[]): Gallery.Item[] {
+  public static search(searchTags: Tag.Search[]): Item[] {
     const byOperation = this.extractTagsByOperation(searchTags);
     const intersection = this.extractIntersection(byOperation);
     const substraction = this.extractSubstraction(byOperation);
@@ -36,8 +37,8 @@ export default class IndexSearch {
     return byOperation;
   }
 
-  private static extractIntersection(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    const intersection = new Set<Gallery.Item>();
+  private static extractIntersection(byOperation: Tag.SearchByOperation): Set<Item> {
+    const intersection = new Set<Item>();
     if (byOperation[Operation.INTERSECTION].length > 0) {
       byOperation[Operation.INTERSECTION]
         .map(tag => tag.items)
@@ -48,8 +49,8 @@ export default class IndexSearch {
     return intersection;
   }
 
-  private static extractSubstraction(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    const substraction = new Set<Gallery.Item>();
+  private static extractSubstraction(byOperation: Tag.SearchByOperation): Set<Item> {
+    const substraction = new Set<Item>();
     if (byOperation[Operation.SUBSTRACTION].length > 0) {
       byOperation[Operation.SUBSTRACTION].flatMap(tag => tag.items).forEach(item => substraction.add(item));
     }
@@ -58,9 +59,9 @@ export default class IndexSearch {
 
   private static aggregateAll(
     byOperation: Tag.SearchByOperation,
-    intersection: Set<Gallery.Item>,
-    substraction: Set<Gallery.Item>
-  ): Gallery.Item[] {
+    intersection: Set<Item>,
+    substraction: Set<Item>
+  ): Item[] {
     byOperation[Operation.ADDITION].flatMap(tag => tag.items).forEach(item => intersection.add(item));
     substraction.forEach(item => intersection.delete(item));
     return [...intersection];
diff --git a/viewer/src/services/itemComparators.ts b/viewer/src/services/itemComparators.ts
index bd9accb..aceff79 100644
--- a/viewer/src/services/itemComparators.ts
+++ b/viewer/src/services/itemComparators.ts
@@ -16,14 +16,15 @@
 -- You should have received a copy of the GNU Affero General Public License
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import { TranslateResult } from "vue-i18n";
+import { Item, ItemSortStr } from "@/@types/gallery";
 import i18n from "@/plugins/i18n";
+import { TranslateResult } from "vue-i18n";
 
-export type ItemComparator = (left: Gallery.Item, right: Gallery.Item) => number;
+export type ItemComparator = (left: Item, right: Item) => number;
 export type ItemSort = { text: TranslateResult; fn: ItemComparator };
 
 export default class ItemComparators {
-  static readonly ITEM_SORTS: Record<Gallery.ItemSortStr, ItemSort> = {
+  static readonly ITEM_SORTS: Record<ItemSortStr, ItemSort> = {
     title_asc: {
       text: i18n.t("command.sort.byTitleAsc"),
       fn: ItemComparators.chain(ItemComparators.sortByTitleAsc, ItemComparators.sortByPathAsc),
@@ -40,7 +41,7 @@ export default class ItemComparators {
 
   static readonly DEFAULT = ItemComparators.ITEM_SORTS.date_asc;
 
-  static sortByPathAsc(left: Gallery.Item, right: Gallery.Item): number {
+  static sortByPathAsc(left: Item, right: Item): number {
     return left.path.localeCompare(right.path, undefined, {
       sensitivity: "base",
       ignorePunctuation: true,
@@ -48,7 +49,7 @@ export default class ItemComparators {
     });
   }
 
-  static sortByTitleAsc(left: Gallery.Item, right: Gallery.Item): number {
+  static sortByTitleAsc(left: Item, right: Item): number {
     return left.title.localeCompare(right.title, undefined, {
       sensitivity: "base",
       ignorePunctuation: true,
@@ -56,7 +57,7 @@ export default class ItemComparators {
     });
   }
 
-  static sortByDateAsc(left: Gallery.Item, right: Gallery.Item): number {
+  static sortByDateAsc(left: Item, right: Item): number {
     return left.datetime.localeCompare(right.datetime); // TODO: handle timezones
   }
 
diff --git a/viewer/src/services/ldzoom.ts b/viewer/src/services/ldzoom.ts
index 0fb0848..33a64c8 100644
--- a/viewer/src/services/ldzoom.ts
+++ b/viewer/src/services/ldzoom.ts
@@ -17,6 +17,7 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { PictureProperties, Resolution } from "@/@types/gallery";
 import "hammerjs";
 
 /**
@@ -25,7 +26,7 @@ import "hammerjs";
 export default class LdZoom {
   readonly containerElement: HTMLDivElement;
   readonly imageElement: HTMLImageElement;
-  readonly pictureProperties: Gallery.PictureProperties;
+  readonly pictureProperties: PictureProperties;
   readonly maxScaleFactor: number;
   readonly scrollZoomSpeed: number;
   scaleFactor: number = 0.0;
@@ -33,7 +34,7 @@ export default class LdZoom {
   constructor(
     containerElement: HTMLDivElement,
     imageElement: HTMLImageElement,
-    pictureProperties: Gallery.PictureProperties,
+    pictureProperties: PictureProperties,
     maxScaleFactor: number,