@christianriedl/media 1.0.240 → 1.0.242

package/dist/iMedia.d.ts

@@ -32,7 +32,6 @@ export interface IMediaAppConfig {
     linkDaysValid: number;
     useImagePreload: boolean;
     useSatIp: boolean;
-    useMediaBin: boolean;
     showThumbnailText: boolean;
     pictureParentLimit: number;
     pictureSearchLimit: number;

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 export * from './iMedia';
 export * from './iMediaInstance';
-export * from './mediaService';
 export * from './mediaHelper';
 export * from './locationHelper';
 export * from './mediaInstanceService';

package/dist/index.js

@@ -1,6 +1,6 @@
 export * from './iMedia';
 export * from './iMediaInstance';
-export * from './mediaService';
+//export * from './mediaService';
 export * from './mediaHelper';
 export * from './locationHelper';
 export * from './mediaInstanceService';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,iCAAiC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC"}

package/package.json

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

package/src/components/FileUpload.vue

@@ -2,11 +2,11 @@
     import { inject, ref, computed, onMounted, onUnmounted } from 'vue';
     import { Helper } from '@christianriedl/utils';    
     import { IRest, IRestResult, IValueResult, Rest } from '@christianriedl/rest';
-    import { MediaService, getMediaSymbol } from '@christianriedl/media';
+    import { MediaServiceBin, getMediaBinSymbol } from '@christianriedl/media';
 
     const props = defineProps<{ accept: string }>();
 
-    const getMediaService = inject(getMediaSymbol)!;
+    const getMediaService = inject(getMediaBinSymbol)!;
     const mediaService = getMediaService();
     const feedBack = ref("");
     const name = ref("");

package/src/components/PhotoDownload.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
     import { inject, ref } from 'vue';
     import { Helper } from '@christianriedl/utils';
-    import { IMediaFolder, MediaService, IPictureFile, getMediaSymbol } from '@christianriedl/media';
+    import { IMediaFolder, MediaServiceBin, IPictureFile, getMediaBinSymbol } from '@christianriedl/media';
 
     const props = defineProps<{ folder: IMediaFolder, photos?: IPictureFile[] }>();
     const emits = defineEmits<{ (e: 'close'): void }>();
 
     const title = getTitle();
-    const getMedia = inject(getMediaSymbol)!;
+    const getMedia = inject(getMediaBinSymbol)!;
     const mediaService = getMedia();
 
     enum Quality {

package/src/views/MusicPage.vue

@@ -4,15 +4,15 @@
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, Helper, EDevice, EScope, appStateSymbol, IAppConfig, appConfigSymbol } from '@christianriedl/utils';
     import { Authorize, authorizeSymbol } from '@christianriedl/rest';
-    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IAudioFile, MediaService, IMediaService, EPlayState, PlayerService, 
-             IMediaAppConfig, getMediaSymbol, getMediaBinSymbol, getPlayerSymbol } from '@christianriedl/media';
+    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IAudioFile, IMediaService, EPlayState, PlayerService, 
+             IMediaAppConfig, getMediaBinSymbol, getPlayerSymbol } from '@christianriedl/media';
     import FileUpload from '../components/FileUpload.vue';
 
     const appState = inject(appStateSymbol)!;
     const authorize = inject(authorizeSymbol)!;
     const mediaAppConfig = inject(appConfigSymbol)! as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     const getPlayerService = inject(getPlayerSymbol)!;
     const playerService = getPlayerService();
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });

package/src/views/OnlineRadiosPage.vue

@@ -3,12 +3,12 @@
     import type { ComponentPublicInstance } from 'vue';
     import { useRouter } from 'vue-router';
     import { IAppState, EScope, EDevice, appStateSymbol, appConfigSymbol } from '@christianriedl/utils';
-    import { EItemType, EMediaType, IMediaFolder, IMediaItem, MediaService, IMediaService, IMediaAppConfig, getMediaSymbol, getMediaBinSymbol } from '@christianriedl/media';
+    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IMediaService, IMediaAppConfig, getMediaBinSymbol } from '@christianriedl/media';
 
     const appState = inject(appStateSymbol)!;
     const mediaAppConfig = inject(appConfigSymbol)! as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
     const isMobile = appState.isMobile && (appState.device != EDevice.iPad);
     const avatarSize = isMobile ? 64 : 128;
@@ -26,9 +26,8 @@
 
     onMounted(async () => {
         mediaService.log.info('OnlineRadios created');
-        if (mediaAppConfig.useMediaBin) {
-            const rc = await mediaService.initialize(EMediaType.Online);
-        }
+        //if (mediaAppConfig.useMediaBin) 
+        const rc = await mediaService.initialize(EMediaType.Online);
         const root = await mediaService.getOnlineRadios();
         for (var i = 0; i < root.files.length; i++) {
             const audio = root.files[i];

package/src/views/OnlineTVsPage.vue

@@ -4,12 +4,12 @@
     import { useRouter } from 'vue-router';
     import { IAppState, EScope, EDevice, appStateSymbol, appConfigSymbol, IValueText } from '@christianriedl/utils';
     import { EpgCache, getEpgCacheSymbol } from '@christianriedl/epg';
-    import { EItemType, EMediaType, IMediaFolder, IMediaItem, MediaService, IMediaService, getMediaSymbol, getMediaBinSymbol, IMediaAppConfig, MediaHelper, ITranscodeParams, IVideoFile } from '@christianriedl/media';
+    import { EItemType, EMediaType, IMediaFolder, IMediaItem, MediaServiceBin, IMediaService, getMediaBinSymbol, IMediaAppConfig, MediaHelper, ITranscodeParams, IVideoFile } from '@christianriedl/media';
 
     const appState = inject(appStateSymbol)!;
     const mediaAppConfig = inject(appConfigSymbol)! as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     const getEpgCache = inject(getEpgCacheSymbol)!;
     const epgCache = getEpgCache()!; 
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
@@ -34,9 +34,8 @@
 
     onMounted(async () => {
         mediaService.log.info('OnlineTVs created');
-        if (mediaAppConfig.useMediaBin) {
-            const rc = await mediaService.initialize(EMediaType.Online);
-        }
+        //if (mediaAppConfig.useMediaBin) 
+        const rc = await mediaService.initialize(EMediaType.Online);
         if (mediaAppConfig.useSatIp) {
             await getActiveStreams();
         }
@@ -67,7 +66,7 @@
         if (!selected.value)
             return;
         if (mediaAppConfig.useSatIp) {
-            url = `${(mediaService as MediaService).rest.serviceUrl}apistream/satipstream?channelName=${selected.value.name}&url=${encodeURIComponent(selected.value.url)}`;
+            url = `${(mediaService as MediaServiceBin).rest.serviceUrl}apistream/satipstream?channelName=${selected.value.name}&url=${encodeURIComponent(selected.value.url)}`;
             if (audioStream.value != null)
                 url += `&audioStream=${audioStream.value}`;
             if (params)

package/src/views/PhotoAlbumPage.vue

@@ -3,16 +3,16 @@
     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, IMediaFolder, MediaService, IMediaService, IMediaAppConfig, EPictureQuality, 
-             MediaHelper, getMediaSymbol, getMediaBinSymbol } from '@christianriedl/media';
+    import { EMediaType, EOrientation, EPictureFlags, IPictureFile, IMediaFolder, IMediaService, IMediaAppConfig, EPictureQuality, 
+             MediaHelper, getMediaBinSymbol } from '@christianriedl/media';
 
     const router = useRouter();
     const route = useRoute();
     const appState = inject(appStateSymbol)!;
     const appConfig = inject(appConfigSymbol)!;
     const mediaAppConfig = appConfig as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'hidden' } });
     const isMobile = appState.isMobile;
     const infoDialog = ref(false);
@@ -52,15 +52,14 @@
         if (carousel.value)
             appState.fullScreenElement.value = carousel.value.$el as HTMLElement;
 
-        if (mediaAppConfig.useMediaBin) {
-            const rc = await mediaService.initialize(EMediaType.Picture);
-            if (!rc)
-                return false;
-        }
-        else {
-            if (!mediaService.medialists["Picture.Event"])
-                await (mediaService as MediaService).getLists(EMediaType.Picture);
-        }
+        //if (mediaAppConfig.useMediaBin) {
+        const rc = await mediaService.initialize(EMediaType.Picture);
+        if (!rc)
+            return false;
+        //else {
+        //    if (!mediaService.medialists["Picture.Event"])
+        //        await (mediaService as MediaService).getLists(EMediaType.Picture);
+        //}
         let list: IPictureFile[] = [];
         if (route.query!.id) {
             // by id usafe

package/src/views/PhotosGridPage.vue

@@ -4,7 +4,7 @@
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, IAppConfig, EDevice, EBrowser, appStateSymbol, appConfigSymbol, Helper } from '@christianriedl/utils';
     import { IRestResult, IValueResult } from '@christianriedl/rest';
-    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IPhotoSelection, MediaService, IMediaService, getMediaSymbol,
+    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IPhotoSelection, IMediaService, 
              getMediaBinSymbol, IMediaAppConfig, MediaHelper, LocationHelper
     } from '@christianriedl/media';
     import FileUpload from '../components/FileUpload.vue';
@@ -13,8 +13,8 @@
     const appState = inject(appStateSymbol)!;
     const appConfig = inject(appConfigSymbol)!;
     const mediaAppConfig = appConfig as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     //const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
     const isMobile = appState.isMobile && (appState.device != EDevice.iPad);
     const router = useRouter();
@@ -43,12 +43,10 @@
     onMounted(async () => {
         mediaService.log.trace('Photos created');
         let root: IMediaFolder;
-        if (mediaAppConfig.useMediaBin) {
-            const rc = await mediaService.initialize(EMediaType.Picture);
-        }
-        else {
-            const rc = await (mediaService as MediaService).getLists(EMediaType.Picture);
-        }
+        //if (mediaAppConfig.useMediaBin) 
+        const rc = await mediaService.initialize(EMediaType.Picture);
+        //else 
+        //const rc = await (mediaService as MediaService).getLists(EMediaType.Picture);
         start();
     })
     async function start() {

package/src/views/PhotosPage.vue

@@ -4,7 +4,7 @@
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, IAppConfig, EDevice, EBrowser, appStateSymbol, appConfigSymbol, Helper } from '@christianriedl/utils';
     import { IRestResult, IValueResult } from '@christianriedl/rest';
-    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IPhotoSelection, MediaService, IMediaService, getMediaSymbol, getMediaBinSymbol, IMediaAppConfig, MediaHelper } from '@christianriedl/media';
+    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IPhotoSelection, MediaService, IMediaService, getMediaBinSymbol, IMediaAppConfig, MediaHelper } from '@christianriedl/media';
     import FileUpload from '../components/FileUpload.vue';
     import PhotoDownload from '../components/PhotoDownload.vue';
     //import { isTSMappedType } from '@babel/types';
@@ -12,8 +12,8 @@
     const appState = inject(appStateSymbol)!;
     const appConfig = inject(appConfigSymbol)!;
     const mediaAppConfig = appConfig as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService();
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
     const isMobile = appState.isMobile && (appState.device != EDevice.iPad);
     const router = useRouter();

package/src/views/RecordedVideosPage.vue

@@ -4,13 +4,13 @@
     import { useRouter } from 'vue-router';
     import { IAppState, EScope, appStateSymbol, appConfigSymbol, IValueText } from '@christianriedl/utils';
     import { DvbService, getDvbServiceSymbol } from '@christianriedl/epg';
-    import { EItemType, EMediaType, IMediaFolder, IMediaItem, MediaHelper, getMediaSymbol, getMediaBinSymbol, IMediaService, IMediaAppConfig, ITranscodeParams, IVideoFile } from '@christianriedl/media';
+    import { EItemType, EMediaType, IMediaFolder, IMediaItem, MediaHelper, getMediaBinSymbol, IMediaService, IMediaAppConfig, ITranscodeParams, IVideoFile } from '@christianriedl/media';
 
     const appState = inject(appStateSymbol)!;
     const appConfig = inject(appConfigSymbol)!;
     const mediaAppConfig = appConfig as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService();
     const getDvbService = inject(getDvbServiceSymbol)!;
     const dvbService = getDvbService()!; 
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
@@ -35,9 +35,8 @@
 
     onMounted(async () => {
         mediaService.log.info('RecordedTVs created');
-        if (mediaAppConfig.useMediaBin) {
-            const rc = await mediaService.initialize(EMediaType.Video);
-        }
+        //if (mediaAppConfig.useMediaBin) 
+        const rc = await mediaService.initialize(EMediaType.Video);
         const root = await mediaService.getRecordedTVs();
         selected.value = root;
         items.splice(0, items.length, ...root.files);

package/src/views/ThumbnailsPage.vue

@@ -3,16 +3,16 @@
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, appStateSymbol, IAppConfig, appConfigSymbol, EDevice, Helper } from '@christianriedl/utils';
     import { IRestResult, IValueResult } from '@christianriedl/rest';
-    import { EOrientation, EMediaType, IMediaFolder, IPictureFile, IMediaService, MediaService, IMediaAppConfig,
-             EPictureFlags, getMediaSymbol, getMediaBinSymbol, MediaHelper
+    import { EOrientation, EMediaType, IMediaFolder, IPictureFile, IMediaService, IMediaAppConfig,
+             EPictureFlags, getMediaBinSymbol, MediaHelper
     } from '@christianriedl/media';
     import PhotoDownload from '../components/PhotoDownload.vue';
 
     const appState = inject(appStateSymbol)!;
     const appConfig = inject(appConfigSymbol)!;
     const mediaAppConfig = appConfig as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
     const isMobile = appState.isMobile && appState.device !== EDevice.iPad;
     const router = useRouter();
@@ -35,13 +35,12 @@
     const showText = ref("SHOW");
 
     onMounted(async () => { 
-        if (mediaAppConfig.useMediaBin) {
-            const rc = await mediaService.initialize(EMediaType.Picture);
-        }
-        else {
-            if (!mediaService.medialists["Picture.Event"])
-                await (mediaService as MediaService).getLists(EMediaType.Picture);
-        }
+        //if (mediaAppConfig.useMediaBin) {
+        const rc = await mediaService.initialize(EMediaType.Picture);
+        //else {
+        //    if (!mediaService.medialists["Picture.Event"])
+        //        await (mediaService as MediaService).getLists(EMediaType.Picture);
+        //}
         if (route.query) {
             if (route.query.id) {
                 const folderId = decodeURIComponent(route.query.id.toString());

package/src/views/VideoPage.vue

@@ -2,12 +2,12 @@
     import { inject, ref, onMounted, onUnmounted, watch } from 'vue';
     import { useRoute, useRouter } from 'vue-router';
     import { appStateSymbol, appConfigSymbol } from '@christianriedl/utils';
-    import { getMediaSymbol, getMediaBinSymbol, IMediaService, IMediaAppConfig } from '@christianriedl/media';
+    import { getMediaBinSymbol, IMediaService, IMediaAppConfig } from '@christianriedl/media';
 
     const appState = inject(appStateSymbol)!;
     const mediaAppConfig = inject(appConfigSymbol)! as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     const route = useRoute();
     const router = useRouter();
 

package/src/views/VideosPage.vue

@@ -4,8 +4,8 @@
     import { useRouter, useRoute } from 'vue-router';
     import { IAppState, EDevice, EScope, appStateSymbol, appConfigSymbol, IValueText } from '@christianriedl/utils';
     import { Authorize, authorizeSymbol } from '@christianriedl/rest';
-    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IVideoFile, MediaService, IMediaService, MediaHelper,
-             getMediaSymbol, getMediaBinSymbol, getPlayerSymbol, IMediaAppConfig, ITranscodeParams
+    import { EItemType, EMediaType, IMediaFolder, IMediaItem, IVideoFile, IMediaService, MediaHelper,
+             getMediaBinSymbol, getPlayerSymbol, IMediaAppConfig, ITranscodeParams
     } from '@christianriedl/media';
     import { ISensorsState, sensorsStateSymbol } from '@christianriedl/smarthome';
     import FileUpload from '../components/FileUpload.vue';
@@ -14,8 +14,8 @@
     const sensors = inject(sensorsStateSymbol)!;
     const authorize = inject(authorizeSymbol)!;
     const mediaAppConfig = inject(appConfigSymbol)! as unknown as IMediaAppConfig;
-    const getMediaService = inject(mediaAppConfig.useMediaBin ? getMediaBinSymbol : getMediaSymbol)!;
-    const mediaService = getMediaService() as unknown as IMediaService;
+    const getMediaService = inject(getMediaBinSymbol)!;
+    const mediaService = getMediaService() ;
     const getPlayerService = inject(getPlayerSymbol)!;
     const playerService = getPlayerService();
     const rendererName = "[TV] Samsung Q9 Series (75)";