@christianriedl/media 1.0.238 → 1.0.240

package/package.json

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

package/src/components/BookPlace.vue

@@ -15,23 +15,15 @@
     function buildText (buchstaben: string, buchstaben2: string, neuesFach: boolean, selFrom?: number, selTo?: number) : string {
         let text1 = buchstaben;
         let text2 = buchstaben2;
-        if (neuesFach && selFrom != 0) {
-            text1 = '<span style="font-weight: 900">' + buchstaben.substring(0, 1) + '</span>';
-            text2 = '<span style="font-weight: 900">' + buchstaben2.substring(0, 1) + '</span>';
-            if (buchstaben.length > 1) {
-                text1 += '<span>' + buchstaben.substring(1) + '</span>';
-                text2 += '<span>' + buchstaben2.substring(1) + '</span>';
-            }
-        }
-        else if (selFrom !== undefined && selTo !== undefined) 
+        if (selFrom !== undefined && selTo !== undefined) 
         {
             selTo++;
             text1 = text2 = '';
             if (selFrom > 0) {
                 let start = 0;
                 if (neuesFach) {
-                    text1 = '<span style="font-weight: 900">' + buchstaben.substring(0, 1) + '</span>';
-                    text2 = '<span style="font-weight: 900">' + buchstaben2.substring(0, 1) + '</span>';
+                    text1 = '<span style="color: blue; font-weight: bold">' + buchstaben.substring(0, 1) + '</span>';
+                    text2 = '<span style="color: blue; font-weight: bold">' + buchstaben2.substring(0, 1) + '</span>';
                     start = 1;
                 }
                 if (selFrom > start) {
@@ -39,13 +31,21 @@
                     text2 += '<span>' + buchstaben2.substring(start, selFrom) + '</span>';
                 }
             }
-            text1 += '<span style="color: red; font-weight: 900">' + buchstaben.substring(selFrom, selTo) + '</span>';
-            text2 += '<span style="color: red; font-weight: 900">' + buchstaben2.substring(selFrom, selTo) + '</span>';
+            text1 += '<span style="color: red; font-weight: bold">' + buchstaben.substring(selFrom, selTo) + '</span>';
+            text2 += '<span style="color: red; font-weight: bold">' + buchstaben2.substring(selFrom, selTo) + '</span>';
             if (selTo < buchstaben.length) {
                 text1 += '<span>' + buchstaben.substring(selTo) + '</span>';
                 text2 += '<span>' + buchstaben2.substring(selTo) + '</span>';
             }
         }
+        else if (neuesFach) {
+            text1 = '<span style="color: blue; font-weight: bold">' + buchstaben.substring(0, 1) + '</span>';
+            text2 = '<span style="color: blue; font-weight: bold">' + buchstaben2.substring(0, 1) + '</span>';
+            if (buchstaben.length > 1) {
+                text1 += '<span>' + buchstaben.substring(1) + '</span>';
+                text2 += '<span>' + buchstaben2.substring(1) + '</span>';
+            }
+        }
         return text1 + "<br>" + text2;
     }
 

package/src/views/BooksPlacePage.vue

@@ -39,7 +39,8 @@
             let regal: Regal = { faecher: [] };
             for (let j = 0; j < 6; j++) {
                 const fach: IPlace = { placeName: "", vorne: "", hinten: "", vorne2: "", hinten2: "", color: regalColor,
-                                       hintenAuthorId: 0, hintenBookId: 0, vorneAuthorId: 0, vorneBookId: 0 };
+                                       hintenAuthorId: 0, hintenBookId: 0, hintenNeuesFach: false,
+                                       vorneAuthorId: 0, vorneBookId: 0, vorneNeuesFach: false };
                 if (i < 8) {
                     // Wohnzimmer   
                     fach.placeName = `Wohnzimmer Regal ${Math.floor(i / 2 + 1)}, Fach ${j + 1} ${i % 2 ? "rechts" : "links"} `;

package/src/views/PhotoAlbumPage.vue

@@ -3,7 +3,8 @@
     import type { ComponentPublicInstance } from 'vue';
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, IAppConfig, EDevice, EDirection, Dictionary, Helper, appStateSymbol, appConfigSymbol } from '@christianriedl/utils';
-    import { EMediaType, EOrientation, EPictureFlags, IPictureFile, MediaService, IMediaService, IMediaAppConfig, EPictureQuality, getMediaSymbol, getMediaBinSymbol } from '@christianriedl/media';
+    import { EMediaType, EOrientation, EPictureFlags, IPictureFile, IMediaFolder, MediaService, IMediaService, IMediaAppConfig, EPictureQuality, 
+             MediaHelper, getMediaSymbol, getMediaBinSymbol } from '@christianriedl/media';
 
     const router = useRouter();
     const route = useRoute();
@@ -14,10 +15,8 @@
     const mediaService = getMediaService() as unknown as IMediaService;
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'hidden' } });
     const isMobile = appState.isMobile;
-    const albumUrl = ref('');
     const infoDialog = ref(false);
     const keyDialog = ref(false);
-    const folderId = decodeURIComponent(route.query!.id!.toString());
     const index = ref(0);
     const items = reactive<IPictureFile[]>([]);
     const width = ref(0);
@@ -29,7 +28,7 @@
     const hasCoordinates = ref(false);
     const carousel = ref<ComponentPublicInstance | null>(null);
     const itemName = ref("");
-    const albumName = ref("");
+    let album: IMediaFolder;
     let origUrl = "";
     let gpsLng: number[];
     let gpsLat: number[];
@@ -62,18 +61,27 @@
             if (!mediaService.medialists["Picture.Event"])
                 await (mediaService as MediaService).getLists(EMediaType.Picture);
         }
-        let folder = mediaService.getFolder(folderId);
-        if (!folder) {
-            const split = folderId.split(/[.|]/);
-            await mediaService.getPhotosByCriteria(split[1], split[2]);
-            folder = mediaService.getFolder(folderId);
-            if (!folder) 
-                return false;
+        let list: IPictureFile[] = [];
+        if (route.query!.id) {
+            // by id usafe
+            const folderId = decodeURIComponent(route.query!.id!.toString());
+            let folder = mediaService.getFolder(folderId);
+            if (!folder) {
+                const split = folderId.split(/[.|]/);
+                await mediaService.getPhotosByCriteria(split[1], split[2]);
+                folder = mediaService.getFolder(folderId);
+                if (!folder) 
+                    return false;
+            }
+            album = await mediaService.getPhotos(folder);
+            list = album.files as IPictureFile[];
+        }
+        else if (route.query!.title) {
+            const title = decodeURIComponent(route.query!.title!.toString());
+            list = await MediaHelper.searchPictures (mediaService, title, route.query!.pers!.toString() === "true", route.query!.loc!.toString() === "true", mediaService.photoSelection.rating, mediaAppConfig.pictureSearchLimit);
         }
-        const photos = await mediaService.getPhotos(folder);
-        albumName.value = photos.name;
-        if(photos.files.length > 0) {
-            items.splice(0, items.length, ...photos.files as IPictureFile[]);
+        if(list && list.length > 0) {
+            items.splice(0, items.length, ...list);
             if (route.query.start) {
                 const start = route.query.start.toString();
                 const idx = items.findIndex((item) => item.dlnaid == start);
@@ -81,7 +89,6 @@
                     index.value = idx;
                 }
             }
-            albumUrl.value = photos.url;
             onUpdate();
         }
         else {
@@ -127,17 +134,18 @@
         const pictureQuality = mediaAppConfig.pictureQuality;
         const quality = getQuality(pictureQuality);
         const factor = getFactor(pictureQuality);
+        const albumUrl = album ? album.url : mediaService.getFolder(item.dlnaParentId).url;
         if (landscape.value) {
             let h = height.value * factor;
             if (item.height <= h)
                 h = 0;
-            return mediaService.getPhotoUrl(albumUrl.value, item.url, `${0}x${h}x${item.orientation}x${quality}`);
+            return mediaService.getPhotoUrl(albumUrl, item.url, `${0}x${h}x${item.orientation}x${quality}`);
         }
         else {
             let w = width.value * factor;
             if (item.width <= w)
                 w = 0;
-            return mediaService.getPhotoUrl(albumUrl.value, item.url, `${w}x${0}x${item.orientation}x${quality}`);
+            return mediaService.getPhotoUrl(albumUrl, item.url, `${w}x${0}x${item.orientation}x${quality}`);
         }
     }
     function getHeight(item: IPictureFile) {
@@ -160,7 +168,7 @@
     }
     function showMap(ev: Event) {
         const current = items[index.value];
-        router.options.history.replace(`/photoalbum?id=${folderId}&start=${current.dlnaid}`);
+        router.options.history.replace(`/photoalbum?id=${current.dlnaParentId}&start=${current.dlnaid}`);
         router.push({
             path: 'map', query: {
                 lat: `${gpsLat[0]} ${gpsLat[1]}`,
@@ -291,10 +299,11 @@
         }
     }
     function setMetaData(exif: Dictionary<any>, file: IPictureFile) {
-        origUrl = mediaService.getPhotoUrl(albumUrl.value, file.url, '0x0x0');
-        metadata['Album'] = albumName.value;
+        const folder = album ? album : mediaService.getFolder(file.dlnaParentId);
+        origUrl = mediaService.getPhotoUrl(folder.url, file.url, '0x0x0');
+        metadata['Album'] = folder.name;
         metadata['Name'] = file.name;
-        let fileName: string = albumUrl.value + file.url;
+        let fileName: string = folder.url + file.url;
         const idx = fileName.lastIndexOf('/');
         if (idx > 0)
             fileName = fileName.substring(idx + 1);

package/src/views/ThumbnailsPage.vue

@@ -97,7 +97,7 @@
                 if (withLocation.value)
                     url += '&loc';
                 router.options.history.replace (url);
-                router.push({ path: 'photoalbum', query: { id: item.dlnaParentId, start: item.dlnaid } });
+                router.push({ path: 'photoalbum', query: { title: title.value, pers: withPerson.value.toString(), loc: withLocation.value.toString(), start: item.dlnaid } });
             }
         }
     }