@christianriedl/media 1.0.206 → 1.0.208

package/dist/iBooks.d.ts

@@ -56,6 +56,10 @@ export interface IPlace {
     hintenBookId: number;
     vorneAuthorId: number;
     vorneBookId: number;
+    hintenSelFrom?: number;
+    hintenSelTo?: number;
+    vorneSelFrom?: number;
+    vorneSelTo?: number;
 }
 export interface IBooksService {
     categories: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/media",
-  "version": "1.0.206",
+  "version": "1.0.208",
   "description": "RIC media interfaces",
 
   "main": "dist/index.js",

package/src/components/BookPlace.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-    import { StyleValue } from 'vue';
+    import { StyleValue, computed } from 'vue';
     import { IPlace } from '@christianriedl/media';
     const props = defineProps<{ place: IPlace, height: number, ismobile: boolean }>();
     const emits = defineEmits<{
@@ -9,6 +9,36 @@
     const heightStyle: StyleValue = { height: props.height + "px" };
     const vorne = { vorne: !props.ismobile, vorneM: props.ismobile };
     const hinten = { hinten: !props.ismobile, hintenM: props.ismobile };
+    const textVorne = computed (() => buildText (place.vorne, place.vorne2, place.vorneSelFrom, place.vorneSelTo));
+    const textHinten = computed (() => buildText (place.hinten, place.hinten2, place.hintenSelFrom, place.hintenSelTo));
+
+    function buildText (buchstaben: string, buchstaben2: string, selFrom?: number, selTo?: number) : string {
+        let text = "";
+        if (selFrom === undefined || selTo === undefined) 
+        {
+            return buchstaben + "<br>" + buchstaben2;
+        }
+        for (let i = 0; i < buchstaben.length; i++) {
+            const buchstabe = buchstaben.substring(i, i+1);
+            if (i >= selFrom && i <= selTo) {
+                text += `<span style="color: red; font-weight: 900">${buchstabe}</span>`;
+            }
+            else {
+                text += `<span>${buchstabe}</span>`;
+            }
+        }
+        text += "<br>";
+        for (let i = 0; i < buchstaben2.length; i++) {
+            const buchstabe = buchstaben2.substring(i, i+1);
+            if (i >= selFrom && i <= selTo) {
+                text += `<span style="color: red; font-weight: 900">${buchstabe}</span>`;
+            }
+            else {
+                text += `<span>${buchstabe}</span>`;
+            }
+        }
+        return text;
+    }
 
     function selectVorne () {
         emits('select', place, false);
@@ -21,10 +51,10 @@
 <template>
     <v-row dense :class="[place.color,'place']" :style="heightStyle" >
         <v-col v-if="place.vorne" cols="12" @click="selectVorne">
-            <p :class="vorne">{{place.vorne}}<br>{{place.vorne2}}</p>
+            <p :class="vorne" v-html="textVorne"></p>
         </v-col>
         <v-col v-if="place.hinten" cols="12" @click="selectHinten" >
-            <p :class="hinten">{{place.hinten}}<br>{{place.hinten2}}</p>
+            <p :class="hinten" v-html="textHinten"></p>
         </v-col>
     </v-row>
     <v-divider></v-divider>

package/src/views/BooksPage.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
     import { inject, ref, reactive, onMounted, onUnmounted, computed, StyleValue } from 'vue';
-    import { useRouter } from 'vue-router';
+    import { useRouter, useRoute } from 'vue-router';
     import { IAppState, appStateSymbol, getOpenAISymbol, IOpenAIService, ICompleteData, EScope, EDevice } from '@christianriedl/utils';
     import { BooksService, getBooksSymbol, IAuthorShort, IAuthor, IBook } from '@christianriedl/media';
     import BookLine from '../components/BookLine.vue';
@@ -37,9 +37,9 @@
         }
         if (booksService.selectedAuthorId) {
             selectedAuthor.value = authors.find ((x) => x.id == booksService.selectedAuthorId);
-            getCurrentAuthor (booksService.selectedAuthorId, true)
-            booksService.selectedAuthorId = 0;
-            booksService.selectedBookId = 0;
+            if (await getCurrentAuthor (booksService.selectedAuthorId, true) && booksService.selectedBookId) {
+                selectBook (booksService.selectedBookId, () => {});
+            }
         }
     }
     async function addAuthor() {
@@ -87,6 +87,7 @@
           const authors = await booksService.getAuthors(undefined, undefined, withBooks, id);
           if (authors && authors.length > 0) {
               const a = authors[0];
+              booksService.selectedAuthorId = a.id;
               currentAuthor.id = a.id;
               currentAuthor.surName = a.surName;
               currentAuthor.givenName = a.givenName;
@@ -134,12 +135,12 @@
         }
     }
     function search () {
-        booksService.selectedAuthorId = 0;
-        booksService.selectedBookId = 0;
+        const url = `/books?authorId=${currentAuthor.id}&bookId=${selectedBook.value.id}`;
+        router.options.history.replace (url);
         router.push({ path: 'booksearch' });
     }
     function places () {
-        router.push({ path: 'bookplaces' });
+        router.push({ path: 'bookplaces', query: { author: currentAuthor.surName, authorId: currentAuthor.id, bookId: selectedBook.value.id  } });
     }
     async function addNewBook() {
         if (lastAllBooksId.value != currentAuthor.id) {
@@ -158,6 +159,7 @@
             return;
         }
         setBookChanged = func;
+        booksService.selectedBookId = id;
         if (currentAuthor.books) {
             selectedBook.value = currentAuthor.books.find (x => x.id == id) as IBook;
             if (selectedBook.value && !selectedBook.value.description && !selectedBook.value.comment) {

package/src/views/BooksPlacePage.vue

@@ -1,9 +1,11 @@
 <script setup lang="ts">
     import { inject, ref, reactive, onMounted, onUnmounted, computed, StyleValue } from 'vue';
+    import { useRouter, useRoute } from 'vue-router';
     import { IAppState, appStateSymbol, getOpenAISymbol, IOpenAIService, ICompleteData, EScope, EDevice } from '@christianriedl/utils';
     import { BooksService, getBooksSymbol, IAuthorShort, IAuthor, IFullBook, IPlace } from '@christianriedl/media';
     import BookPlace from '../components/BookPlace.vue';
 
+    const route = useRoute();
     const appState = inject(appStateSymbol)!;
     const getBooksService = inject(getBooksSymbol)!;
     const booksService = getBooksService() as BooksService;
@@ -25,6 +27,9 @@
     const maxFillPerc = ref(86);
     const showDistribute = ref(false);
     const placeName = ref("");
+    const selectedAuthor = ref("");
+    const selectedAuthorId = ref(0);
+    const selectedBookId = ref(0);
 
     start();
 
@@ -54,10 +59,38 @@
     }
 
     async function start() {   
+        if (route.query) {
+            if (route.query.author)
+                selectedAuthor.value = route.query.author.toString();
+            if (route.query.authorId)
+                selectedAuthorId.value = Number(route.query.authorId);
+            if (route.query.bookId)
+                selectedBookId.value = Number(route.query.bookId);
+        }
         const places = await booksService.getBookPlaces();
         for (let i = 0; i < places.length; i++) {
             const place = places[i];
             let regal: Regal;
+            let selFrom: number | undefined;
+            let selTo: number | undefined;
+            if (selectedAuthor.value && place.buchstaben.includes(selectedAuthor.value.substring(0,1)) && place.zweitBuchstaben.includes(selectedAuthor.value.substring(1,2))) {
+                const fullBooks = await booksService.getBooksFrom (place.firstAuthorId, place.firstBookId, place.buchstaben.length);
+                for (let j = 0; j < fullBooks.length; j++) {
+                    const fullBook = fullBooks[j];
+                    if (selectedBookId.value) {
+                        if (selectedBookId.value == fullBook.bookId) {
+                            selFrom = selTo = j; break;
+                        }
+                    }
+                    else if (selectedAuthorId.value) {
+                        if (selectedAuthorId.value == fullBook.authorId) {
+                            if (selFrom === undefined)
+                                selFrom = j;
+                            selTo = j;
+                        }
+                    }
+                }
+            }
             if (place.vorzimmer) {
                 regal = regale[8 + place.regalVonLinks - 1];
             }
@@ -70,12 +103,16 @@
                 fach.hintenBookId = place.firstBookId;
                 fach.hinten = place.buchstaben;
                 fach.hinten2 = place.zweitBuchstaben;
+                fach.hintenSelFrom = selFrom;
+                fach.hintenSelTo = selTo;
             }
             else {
                 fach.vorneAuthorId = place.firstAuthorId;
                 fach.vorneBookId = place.firstBookId;
                 fach.vorne = place.buchstaben;
                 fach.vorne2 = place.zweitBuchstaben;
+                fach.vorneSelFrom = selFrom;
+                fach.vorneSelTo = selTo;
             }
         }
     }
@@ -85,17 +122,17 @@
             placeName.value = place.placeName;
             if (place.placeName.startsWith ("Wohn"))
                 placeName.value += hinten ? "hinten" : "vorne";
-            const b = await booksService.getBooksFrom (place.hintenAuthorId, place.hintenBookId, place.hinten.length);
-            if (b)
-                books.splice (0, 0, ...b);
+            const fullBooks = await booksService.getBooksFrom (place.hintenAuthorId, place.hintenBookId, place.hinten.length);
+            if (fullBooks)
+                books.splice (0, 0, ...fullBooks);
         }
         if (!hinten && place.vorneAuthorId && place.vorneBookId) {
             placeName.value = place.placeName;
             if (place.placeName.startsWith ("Wohn"))
                 placeName.value += hinten ? "hinten" : "vorne";
-            const b = await booksService.getBooksFrom (place.vorneAuthorId, place.vorneBookId, place.vorne.length);
-            if (b)
-                books.splice (0, 0, ...b);
+            const fullBooks = await booksService.getBooksFrom (place.vorneAuthorId, place.vorneBookId, place.vorne.length);
+            if (fullBooks)
+                books.splice (0, 0, ...fullBooks);
         }
         showBooks.value = true;
     }

package/src/views/ThumbnailsPage.vue

@@ -79,12 +79,13 @@
         }
         return idxs;
     }
-    async function searchPictures(titlePattern: string, searchPerson: boolean, searchLocation: boolean): Promise<IPictureFile[]> {
+    async function searchPictures(titlePattern: string, searchPerson: boolean, searchLocation: boolean, rating: number, maxPictures: number = 200): Promise<IPictureFile[]> {
         const regex = new RegExp(`^.*${titlePattern.toLowerCase()}.*$`);
         const root = mediaService.getFolder("ph.all.ye|");
         const result: IPictureFile[] = [];
         const personIdxs = searchPerson ? inMediaList ("Picture.Person", regex) : undefined;
         const locationIdxs = searchLocation ? inMediaList ("Picture.Location", regex) : undefined;
+        let count = 0;
 
         photos.value.splice(0, photos.value.length);
         for (let i = 0; i < root.folders.length; i++) {
@@ -98,6 +99,8 @@
                     for (let k = 0; k < album.files.length; k++) {
                         let match = false;
                         const photo = album.files[k] as IPictureFile;
+                        if (photo.rating < rating)
+                            continue;
                         if (personIdxs && photo.personIdxs) {
                             for (let l = 0; l < photo.personIdxs.length; l++) {
                                 if (personIdxs.includes (photo.personIdxs[l])) {
@@ -112,16 +115,22 @@
                         if (regex.test (photo.name.toLowerCase())) 
                             match = true;
 
-                        if (match)
-                            result.push(photo);
+                        if (match) {
+                            count++;
+                            if (result.length < maxPictures)
+                                result.push(photo);
+                        } 
                     }
                 }
             }
         }
+        if (result.length >= maxPictures) {
+            alert (`Too many pictures (${count}) found, limit : ${result.length}`)
+        }
         return result;
     }
     async function onSearch() {
-        const list = await searchPictures (title.value, withPerson.value, withLocation.value);
+        const list = await searchPictures (title.value, withPerson.value, withLocation.value, mediaService.photoSelection.rating, isMobile ? 200 : 500);
         photos.value.splice(0, photos.value.length, ...list);
         console.log(photos.value.length);
     }