@christianriedl/media 1.0.94 → 1.0.96

package/package.json

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

package/src/views/PhotoAlbumPage.vue

@@ -28,6 +28,8 @@
     const interval = ref(8000);
     const hasCoordinates = ref(false);
     const carousel = ref<ComponentPublicInstance | null>(null);
+    const itemName = ref("");
+    const albumName = ref("");
     let origUrl = "";
     let gpsLng: number[];
     let gpsLat: number[];
@@ -60,6 +62,7 @@
                 return false;
         }
         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 (route.query.start) {
@@ -369,6 +372,7 @@
     }
     function clearName() {                      // also called by VImg::loadstart
         showName.value = false;
+        itemName.value = "";
         if (nameTimer >= 0) {
             window.clearTimeout(nameTimer);
             nameTimer = -1;
@@ -386,8 +390,17 @@
         const name = item.Url.substr(0, idx);
         if (!item.Name.includes(name)) {
             showName.value = true;
+            itemName.value = item.Name;
 			nameTimer = window.setTimeout(() => { clearName(); }, mediaAppConfig.nameDurationMS);
         }
+        else if (item.LocationIdx >= 0) {
+            const location = mediaService.getListEntry("Picture.Location", item.LocationIdx);
+            if (location && !albumName.value.includes(location)) {
+                showName.value = true;
+                itemName.value = location;
+                nameTimer = window.setTimeout(() => { clearName(); }, mediaAppConfig.nameDurationMS);
+            }
+        }
     }
 </script>
 
@@ -398,7 +411,7 @@
                     @click="onClick" @mousedown="onMouseDown" @update:modelValue="onUpdate">
             <v-carousel-item v-for="item in items" :key="item.DLNAID" :src="getUrl(item)" :alt="item.Name" :width="getWidth(item)" :height="getHeight(item)" 
                 @load="onLoad(item)" @loadstart="clearName()">
-                <h2 v-if="showName" class="imgtext">{{item.Name}}</h2>
+                <h2 v-if="showName" class="imgtext">{{itemName}}</h2>
             </v-carousel-item>
         </v-carousel>
         <v-dialog v-model="infoDialog" :fullscreen="isMobile" >

package/src/views/PhotosPage.vue

@@ -219,7 +219,7 @@
                 <template v-slot:activator="{ props }">
                     <v-list-item v-bind="props" :title="item.info" :value="item.info" density="compact"></v-list-item>
                 </template>
-                <v-list-item v-for="subItem in item.Folders" :key="subItem.DLNAID" :title="subItem.info" density="compact" @click.stop="showPictures(subItem)">
+                <v-list-item v-if="open.includes(item.Name)" v-for="subItem in item.Folders" :key="subItem.DLNAID" :title="subItem.info" density="compact" @click.stop="showPictures(subItem)">
                     <template v-slot:append>
                         <v-btn color="grey" variant="tonal" icon="$share" @click.stop.prevent="onShare(subItem)"></v-btn>
                         <v-btn color="grey" variant="tonal" icon="$download" @click.stop.prevent="onDownload(subItem)"></v-btn>