@christianriedl/media 1.0.134 → 1.0.136

package/dist/iMedia.d.ts

@@ -143,10 +143,15 @@ export declare enum EOrientation {
 }
 export declare enum EPictureFlags {
     None = 0,
-    Has_Gps = 16,
-    Res_1 = 32,
-    Res_2 = 64,
-    Res_3 = 128,
+    Has_Gps = 128,
+    Red = 16,
+    Yellow = 32,
+    Green = 48,
+    Blue = 64,
+    Orange = 80,
+    Res_6 = 96,
+    Res_7 = 112,
+    ColorMask = 112,
     Mask = 240
 }
 export interface IPictureFile extends IMediaFile {

package/dist/iMedia.js

@@ -101,10 +101,15 @@ export var EOrientation;
 export var EPictureFlags;
 (function (EPictureFlags) {
     EPictureFlags[EPictureFlags["None"] = 0] = "None";
-    EPictureFlags[EPictureFlags["Has_Gps"] = 16] = "Has_Gps";
-    EPictureFlags[EPictureFlags["Res_1"] = 32] = "Res_1";
-    EPictureFlags[EPictureFlags["Res_2"] = 64] = "Res_2";
-    EPictureFlags[EPictureFlags["Res_3"] = 128] = "Res_3";
+    EPictureFlags[EPictureFlags["Has_Gps"] = 128] = "Has_Gps";
+    EPictureFlags[EPictureFlags["Red"] = 16] = "Red";
+    EPictureFlags[EPictureFlags["Yellow"] = 32] = "Yellow";
+    EPictureFlags[EPictureFlags["Green"] = 48] = "Green";
+    EPictureFlags[EPictureFlags["Blue"] = 64] = "Blue";
+    EPictureFlags[EPictureFlags["Orange"] = 80] = "Orange";
+    EPictureFlags[EPictureFlags["Res_6"] = 96] = "Res_6";
+    EPictureFlags[EPictureFlags["Res_7"] = 112] = "Res_7";
+    EPictureFlags[EPictureFlags["ColorMask"] = 112] = "ColorMask";
     EPictureFlags[EPictureFlags["Mask"] = 240] = "Mask";
 })(EPictureFlags || (EPictureFlags = {}));
 //# sourceMappingURL=iMedia.js.map

package/dist/iMedia.js.map

@@ -1 +1 @@
-{"version":3,"file":"iMedia.js","sourceRoot":"","sources":["../src/iMedia.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"iMedia.js","sourceRoot":"","sources":["../src/iMedia.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/media",
-  "version": "1.0.134",
+  "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>