@christianriedl/media 1.0.297 → 1.0.298

package/package.json

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

package/src/components/PhotoMetaData.vue

@@ -3,7 +3,7 @@
     import { Dictionary, Helper } from '@christianriedl/utils';
     import { IPictureFile, EOrientation, EPictureFlags, getMediaSymbol } from '@christianriedl/media';
 
-    const props = defineProps<{ file: IPictureFile, all: boolean, splitxmp: boolean, metadata?: Dictionary<any> }>();
+    const props = defineProps<{ file: IPictureFile, all: boolean, splitxmp: boolean }>();
 
     interface ITree {
 	id: number;
@@ -19,31 +19,20 @@
     const treeColumns = computed(() => props.splitxmp ? 3 : 2);
     let metadata: Dictionary<any>;
     let allMetaData: Dictionary<any>;
-    if (props.metadata) {
-	if (props.all) {
-	    allMetaData = props.metadata;
-	    buildTree();
-	}
-	else {
-	    if (!metadata)
-		setMetaData(props.metadata, props.file);
-	    properties.value = metadata;
-	}
-    }
-    else {
-	watch(() => props.all, async () => await fetchMetaData(), { immediate: true });
-	watch(() => props.splitxmp, () => buildTree());
-    }
+
+    watch(() => props.all, async () => await fetchMetaData(), { immediate: true });
+    watch(() => props.splitxmp, () => buildTree());
+
     async function fetchMetaData() {
 	if (props.all) {
 	    if (!allMetaData) {
-		allMetaData = await mediaService!.getExifInfo(props.file.dlnaParentId, props.file.dlnaid, props.all, props.splitxmp);
+		allMetaData = await mediaService.getExifInfo(props.file.dlnaParentId, props.file.dlnaid, props.all, props.splitxmp);
 	    }
 	    buildTree();
 	}
 	else {
 	    if (!metadata) {
-		const data = await mediaService!.getExifInfo(props.file.dlnaParentId, props.file.dlnaid, props.all, props.splitxmp);
+		const data = await mediaService.getExifInfo(props.file.dlnaParentId, props.file.dlnaid, props.all, props.splitxmp);
 		setMetaData(data, props.file);
 	    }
 	    properties.value = metadata;

package/src/views/VideosPage.vue

@@ -99,8 +99,7 @@
 	    const videos: IVideoFile[] = [];
 	    for (let i = 0; i < foundVideos.length; i++) {				    // Use prepared videos from mediaservice folders
 		const foundVideo = foundVideos[i];
-		const folder = mediaService.folders[foundVideo.dlnaParentId];
-		mediaService.prepare(folder);
+		const folder = mediaService.getFolder(foundVideo.dlnaParentId);
 		const file = folder.files!.find(f => f.dlnaid == foundVideo.dlnaid) as IVideoFile;
 		videos.push(file);
 	    }