@christianriedl/media 1.0.135 → 1.0.136

package/package.json

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

package/src/views/PhotosGridPage.vue

@@ -168,7 +168,7 @@
         let nameLength = 9;
         if (folder) {
             const dlnaid = folder.DLNAID;
-            if (dlnaid.endsWith('|'))
+            if (dlnaid.endsWith('ye|'))
 		        nameLength = 9;        // Year
 	        else if (dlnaid.endsWith(".ev"))
 		        nameLength = 18;       // Event
@@ -178,8 +178,11 @@
 		        nameLength = 12;       // Person
 	        else {
 	            //nameLength = 32;       // Album
-                showAlbums.value = true;
-                return 12;
+                if (folder.Folders && folder.Folders[0].ItemType == EItemType.PictureAlbum) {
+                    showAlbums.value = true;
+                    return 12;
+                }
+                nameLength = 9;         // Year ?
             }
         }
 	    let numColumns = appState.pageWidth.value / (nameLength * 10);

package/src/views/PhotosPage.vue

@@ -6,6 +6,7 @@
     import { EItemType, EMediaType, IMediaFolder, IMediaItem, IPhotoSelection, MediaService, IMediaService, getMediaSymbol, getMediaBinSymbol, IMediaAppConfig } from '@christianriedl/media';
     import FileUpload from '../components/FileUpload.vue';
     import PhotoDownload from '../components/PhotoDownload.vue';
+import { isTSMappedType } from '@babel/types';
 
     const appState = inject(appStateSymbol)!;
     const appConfig = inject(appConfigSymbol)!;
@@ -95,12 +96,22 @@
         computeListHeight();
     }
     function listExpand(folder: IMediaFolder) {
-        if (folder.Year && folder.Year > 0)
+        if (folder.Folders && folder.Folders[0].ItemType == EItemType.PictureYear) {
+            showFolder(folder);    
+        }
+        else {
+            if (folder.Year && folder.Year > 0)
             selectedYear.value = folder.Year;
+        }
     }
     function showPictures(folder: IMediaFolder) {
-        selected.selectedAlbum = folder;
-        router.push({ path: 'photoalbum', query: { id: folder.DLNAID } });
+        if (folder.Files) {
+            selected.selectedAlbum = folder;
+            router.push({ path: 'photoalbum', query: { id: folder.DLNAID } });
+        }
+        else {
+            showFolder(folder);
+        }
     }
     function listBack() {
         const parent = mediaService.getFolder(selected.selected.DLNAParentID);
@@ -177,6 +188,7 @@
         return folder.Folders;
     }
     function setGrouped(folders: IMediaFolder[], group: boolean, year?: number) {
+        group = true; // all is grouped
         grouped.value = group;
         // const grouped = (group && folders.length <= 6); ???
         for (let i = 0; i < folders.length; i++) {
@@ -228,7 +240,7 @@
                     <v-list-item v-bind="props" :title="item.info" :value="item.info" density="compact"></v-list-item>
                 </template>
                 <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>
+                    <template v-if="subItem.ItemType == EItemType.PictureAlbum" 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>
                         <v-btn color="grey" variant="tonal" icon="$grid" @click.stop.prevent="onLightbox(subItem)"></v-btn>