@christianriedl/media 1.0.109 → 1.0.111

package/dist/mediaServiceBin.d.ts

@@ -0,0 +1,58 @@
+import { IRest } from '@christianriedl/rest';
+import { ILogger, Dictionary, IStatistics, IStatisticsValue, ILocalStorage } from '@christianriedl/utils';
+import { IMediaFolder, IMediaRoot, IMediaListEntry, EMediaType, EItemType } from "./iMedia";
+interface ILastModifications {
+    list: number;
+    root: number;
+    mediaTypes: Dictionary<number>;
+    modified?: boolean;
+}
+export declare class MediaServiceBin {
+    rest: IRest;
+    mediaUrl: string;
+    log: ILogger;
+    user: string;
+    localStorage: ILocalStorage;
+    mainRoot?: IMediaRoot;
+    audioRoot?: IMediaRoot;
+    videoRoot?: IMediaRoot;
+    pictureRoot?: IMediaRoot;
+    onlineRoot?: IMediaRoot;
+    roots: Dictionary<IMediaRoot>;
+    folders: Dictionary<IMediaFolder>;
+    medialists: Dictionary<IMediaListEntry>;
+    lastModifications: ILastModifications;
+    listsInitialized: number;
+    foldersInitialized: number;
+    filesInitialized: number;
+    lastFolderId: string;
+    realFolderId: string;
+    privateIdx: number;
+    statistics: IStatistics;
+    bigEndian: boolean;
+    countFolders: IStatisticsValue;
+    countFiles: IStatisticsValue;
+    countList: IStatisticsValue;
+    countReferences: IStatisticsValue;
+    constructor(rest: IRest, user: string, localStorage: ILocalStorage, statistics: IStatistics, bigEndian: boolean, log: ILogger);
+    initialize(mediaType: EMediaType): Promise<boolean>;
+    getLists(): Promise<boolean>;
+    getFolders(): Promise<number>;
+    getFiles(mediaType: EMediaType): Promise<number>;
+    static toItemType(mediaType: EMediaType): EItemType;
+    private unMarshalItem;
+    private unMarshalFolder;
+    private unMarshalFile;
+    private unMarshalAudioFile;
+    private unMarshalVideoFile;
+    private unMarshalPictureFile;
+    private addRoot;
+    private addFolder;
+    private addSubFolder;
+    private addMediaReference;
+    private addMediaFile;
+    private addFile;
+    private saveModifications;
+    private loadModifications;
+}
+export {};

package/dist/mediaServiceBin.js

@@ -0,0 +1,379 @@
+import { MarshalLE } from '@christianriedl/utils';
+import { EState, EMediaType, EItemType } from "./iMedia";
+export class MediaServiceBin {
+    rest;
+    mediaUrl;
+    log;
+    user = "";
+    localStorage;
+    mainRoot;
+    audioRoot;
+    videoRoot;
+    pictureRoot;
+    onlineRoot;
+    roots = {};
+    folders = {};
+    medialists = {};
+    lastModifications;
+    listsInitialized = 0;
+    foldersInitialized = 0;
+    filesInitialized = 0;
+    lastFolderId = "";
+    realFolderId = "";
+    privateIdx = -100;
+    statistics;
+    bigEndian;
+    countFolders;
+    countFiles;
+    countList;
+    countReferences;
+    constructor(rest, user, localStorage, statistics, bigEndian, log) {
+        this.log = log;
+        this.user = user;
+        this.rest = rest;
+        this.localStorage = localStorage;
+        this.statistics = statistics;
+        this.bigEndian = bigEndian;
+        this.countFolders = statistics.searchOrCreate(log.name, "CountFolders");
+        this.countFiles = statistics.searchOrCreate(log.name, "CountFiles");
+        this.countList = statistics.searchOrCreate(log.name, "CountList");
+        this.countReferences = statistics.searchOrCreate(log.name, "CountReferences");
+        this.mediaUrl = rest.serviceUrl;
+        this.loadModifications();
+    }
+    async initialize(mediaType) {
+        if (!this.listsInitialized) {
+            if (!await this.getLists())
+                return false;
+        }
+        if (!this.foldersInitialized) {
+            if (!await this.getFolders())
+                return false;
+        }
+        if (!(this.filesInitialized & (1 << mediaType))) {
+            if (!await this.getFiles(mediaType))
+                return false;
+        }
+        if (this.lastModifications.modified) {
+            this.saveModifications();
+        }
+        return true;
+    }
+    async getLists() {
+        const res = await this.rest.getBlob('apimedia/medialistbin', "application/octet-stream", undefined, { "If-Modified-Since": this.lastModifications.list.toString() });
+        const arrayBuffer = await res.result.arrayBuffer();
+        const data = Buffer.from(arrayBuffer);
+        if (data) {
+            const marshal = this.bigEndian ? new MarshalLE(data) : new MarshalLE(data);
+            const lastModification = marshal.readUInt32();
+            if (lastModification != this.lastModifications.list) {
+                this.lastModifications.list = lastModification;
+                this.lastModifications.modified = true;
+            }
+            for (;;) {
+                const name = marshal.readString();
+                if (!name)
+                    break;
+                const values = [];
+                this.medialists[name] = { Name: name, Values: values };
+                const count = marshal.readInt16();
+                for (let i = 0; i < count; i++) {
+                    values.push(marshal.readString());
+                }
+                if (name == 'Picture.Creator' && this.user != 'ric@rts.co.at' && this.user != 'rih@rts.co.at') {
+                    this.privateIdx = values.indexOf("Christian Riedl Privat");
+                }
+                this.statistics.increment(this.countList, values.length);
+                this.listsInitialized++;
+            }
+            this.log.trace(`getListsBin get ${this.listsInitialized} lists`);
+        }
+        return true;
+    }
+    async getFolders() {
+        const res = await this.rest.getBlob('apimedia/mediafoldersbin', "application/octet-stream", undefined, { "If-Modified-Since": this.lastModifications.root.toString() });
+        const arrayBuffer = await res.result.arrayBuffer();
+        const data = Buffer.from(arrayBuffer);
+        let count = 0;
+        if (data) {
+            const marshal = this.bigEndian ? new MarshalLE(data) : new MarshalLE(data);
+            const lastModification = marshal.readUInt32();
+            if (lastModification != this.lastModifications.root) {
+                this.lastModifications.root = lastModification;
+                this.lastModifications.modified = true;
+            }
+            let itemType;
+            while ((itemType = marshal.readUInt8()) != EItemType.End) {
+                if ((itemType & EItemType.Folder) == 0)
+                    return 0;
+                const item = {};
+                this.unMarshalFolder(marshal, item, itemType);
+                if ((item.ItemType & EItemType.LevelMask) == EItemType.RootLevel)
+                    this.addRoot(item);
+                else if (!this.addSubFolder(item))
+                    return 0;
+                count++;
+            }
+            this.log.trace(`getFoldersBin get ${count} folders`);
+        }
+        this.statistics.increment(this.countFolders, count);
+        this.foldersInitialized = count;
+        return count;
+    }
+    async getFiles(mediaType) {
+        const res = await this.rest.getBlob('apimedia/mediafilesbin', "application/octet-stream", { mediaType: mediaType }, { "If-Modified-Since": this.lastModifications.root.toString() });
+        const arrayBuffer = await res.result.arrayBuffer();
+        const data = Buffer.from(arrayBuffer);
+        let count = 0;
+        let countref = 0;
+        if (data) {
+            if (res.headers) {
+                const lastModified = res.headers.get("Last-Modified");
+                if (lastModified) {
+                    const modifiedRoot = this.lastModifications.mediaTypes[mediaType];
+                    if (modifiedRoot != Number(lastModified)) {
+                        this.lastModifications.mediaTypes[mediaType] = Number(lastModified);
+                        this.lastModifications.modified = true;
+                    }
+                }
+            }
+            const marshal = this.bigEndian ? new MarshalLE(data) : new MarshalLE(data);
+            const files = {};
+            let itemType;
+            while ((itemType = marshal.readUInt8()) != EItemType.End) {
+                {
+                    if (itemType == EItemType.Reference) {
+                        // Got a referenced
+                        const folderId = marshal.readString();
+                        const fileId = marshal.readString();
+                        if (this.addMediaReference(folderId, fileId, files)) {
+                            countref++;
+                        }
+                    }
+                    else {
+                        // Got a file
+                        const item = {};
+                        this.unMarshalItem(marshal, item, itemType);
+                        if (itemType & MediaServiceBin.toItemType(mediaType)) {
+                            if (this.addMediaFile(item)) {
+                                files[item.DLNAID] = item;
+                                count++;
+                            }
+                        }
+                    }
+                }
+            }
+            this.statistics.increment(this.countFiles, count);
+            this.filesInitialized |= (1 << mediaType);
+            this.log.trace(`getFilesBin get ${count} ${mediaType} files`);
+            return count;
+        }
+    }
+    static toItemType(mediaType) {
+        switch (mediaType) {
+            case EMediaType.Audio: return EItemType.Audio;
+            case EMediaType.Video: return EItemType.Video;
+            case EMediaType.Picture: return EItemType.Picture;
+            case EMediaType.Online: return EItemType.Broadcast;
+        }
+        return EItemType.None;
+    }
+    unMarshalItem(m, item, itemType) {
+        item.ItemType = itemType;
+        item.State = m.readUInt8();
+        item.Rating = m.readUInt8();
+        item.GenreIdx = m.readInt16();
+        item.CreatorIdx = m.readInt16();
+        item.Year = m.readInt16();
+        item.Name = m.readString();
+        item.DLNAID = m.readString();
+        item.DLNAParentID = m.readString();
+        const path = m.readString();
+        const thumbNailPath = m.readString();
+        item.Url = m.readString();
+        item.ThumbnailUrl = m.readString();
+    }
+    unMarshalFolder(m, folder, itemType) {
+        this.unMarshalItem(m, folder, itemType);
+        const dlnaUpdateID = m.readUInt32();
+        const folderModifyTime = m.readUInt32();
+        folder.ChildCount = m.readInt32();
+        const searchable = m.readBoolean();
+        const dlnaSearchClasses = m.readUInt8();
+        const referenceIndex = m.readInt16();
+    }
+    unMarshalFile(m, file, itemType) {
+        this.unMarshalItem(m, file, itemType);
+        switch (itemType) {
+            case EItemType.AudioBroadcast:
+            case EItemType.AudioTrack:
+                this.unMarshalAudioFile(m, file);
+                break;
+            case EItemType.PictureItem:
+                this.unMarshalPictureFile(m, file);
+                break;
+            case EItemType.VideoBroadcast:
+            case EItemType.VideoItem:
+                this.unMarshalVideoFile(m, file);
+                break;
+        }
+    }
+    unMarshalAudioFile(m, file) {
+        file.Size = m.readUInt32();
+        file.Date = new Date(m.readUInt32()); // Check !!!!!!!!!!!!!!!!!!!!!!
+        file.Extension = m.readUInt8();
+        file.Description = m.readString();
+        file.CreatorIdx = m.readInt16();
+        const composerIdx = m.readInt16();
+        file.Duration = m.readInt16();
+        file.TrackNo = m.readInt16();
+        file.SampleRate = m.readInt32();
+        file.BitRate = m.readInt32();
+    }
+    unMarshalVideoFile(m, file) {
+        file.Size = m.readUInt32();
+        file.Date = new Date(m.readUInt32()); // Check !!!!!!!!!!!!!!!!!!!!!!
+        file.Extension = m.readUInt8();
+        file.Description = m.readString();
+        file.BitRate = m.readInt16();
+        file.FrameRate = m.readInt16();
+        file.Duration = m.readInt16();
+        file.Width = m.readUInt16();
+        file.Height = m.readUInt16();
+        file.CountryIdx = m.readInt16();
+        file.AudioStreams = m.readString();
+        let count = m.readInt16();
+        file.ActorIdxs = null;
+        if (count > 0) {
+            file.ActorIdxs = [];
+            for (let i = 0; i < count; i++)
+                file.ActorIdxs.push(m.readInt16());
+        }
+    }
+    unMarshalPictureFile(m, file) {
+        file.Size = m.readUInt32();
+        file.Date = new Date(m.readUInt32()); // Check !!!!!!!!!!!!!!!!!!!!!!
+        file.Extension = m.readUInt8();
+        file.Description = m.readString();
+        file.Width = m.readUInt16();
+        file.Height = m.readUInt16();
+        file.ThumbWidth = m.readUInt16();
+        file.ThumbHeight = m.readUInt16();
+        file.Orientation = m.readUInt8();
+        file.LocationIdx = m.readInt16();
+        file.EventIdx = m.readInt16();
+        let count = m.readInt16();
+        file.PersonIdxs = null;
+        if (count > 0) {
+            file.PersonIdxs = [];
+            for (let i = 0; i < count; i++)
+                file.PersonIdxs.push(m.readInt16());
+        }
+    }
+    addRoot(root) {
+        if (root.DLNAID == "0")
+            this.mainRoot = root;
+        else {
+            this.roots[root.DLNAID] = root;
+            this.addFolder(this.mainRoot, root);
+            switch (root.ItemType) {
+                case EItemType.AudioRoot:
+                    this.audioRoot = root;
+                    break;
+                case EItemType.VideoRoot:
+                    this.videoRoot = root;
+                    break;
+                case EItemType.PictureRoot:
+                    this.pictureRoot = root;
+                    break;
+                case EItemType.OnlineRoot:
+                    this.onlineRoot = root;
+                    break;
+            }
+        }
+    }
+    addFolder(parent, folder) {
+        folder.DLNAParentID = parent.DLNAID;
+        if (!parent.Folders)
+            parent.Folders = [];
+        if (folder.DLNAID == null)
+            folder.DLNAID = "_" + Object.keys(this.folders).length;
+        const oldFolder = this.folders[folder.DLNAID];
+        if (!oldFolder) {
+            this.folders[folder.DLNAID] = folder;
+            const idx = parent.Folders.findIndex((f) => f.DLNAID == folder.DLNAID);
+            if (idx >= 0)
+                parent.Folders[idx] = folder;
+            else
+                parent.Folders.push(folder);
+        }
+        else {
+            this.folders[folder.DLNAID] = folder;
+            parent.Folders.push(folder);
+        }
+        return true;
+    }
+    addSubFolder(folder) {
+        if (folder.DLNAParentID) {
+            let parentFolder = this.folders[folder.DLNAParentID];
+            if (!parentFolder)
+                parentFolder = this.roots[folder.DLNAParentID];
+            if (parentFolder)
+                return this.addFolder(parentFolder, folder);
+        }
+        return false;
+    }
+    addMediaReference(folderId, fileId, files) {
+        const file = files[fileId];
+        if (!file) {
+            this.log.warning(`add MediaReference ${folderId}/${fileId} : not found`);
+            return false;
+        }
+        if (folderId) {
+            const parentFolder = this.folders[folderId];
+            if (parentFolder) {
+                return this.addFile(parentFolder, file);
+            }
+        }
+        this.log.warning(`add MediaReference ${file.Name} : no folder found`);
+        return false;
+    }
+    addMediaFile(file) {
+        if (file.DLNAParentID) {
+            const parentFolder = this.folders[file.DLNAParentID];
+            if (parentFolder)
+                return this.addFile(parentFolder, file);
+        }
+        this.log.warning(`add File ${file.Name} : no parent found`);
+        return false;
+    }
+    addFile(parent, file) {
+        if (!(parent.State & EState.FolderVirtual)) {
+            file.DLNAParentID = parent.DLNAID;
+        }
+        if (parent.Files == null)
+            parent.Files = [];
+        if (file.DLNAID == null)
+            file.DLNAID = file.DLNAParentID + "." + parent.Files.length;
+        parent.Files.push(file);
+        return true;
+    }
+    saveModifications() {
+        const lm = this.lastModifications;
+        this.localStorage.setItem("lastMediaModifications", `${lm.list}|${lm.root}|${lm.mediaTypes[EMediaType.Audio]}|${lm.mediaTypes[EMediaType.Video]}|${lm.mediaTypes[EMediaType.Picture]}|${lm.mediaTypes[EMediaType.Online]}`);
+        lm.modified = false;
+    }
+    loadModifications() {
+        const lastM = this.localStorage.getItemString("lastMediaModifications", "0|0|0|0|0|0").split("|");
+        this.lastModifications = {
+            list: Number(lastM[0]), root: Number(lastM[1]),
+            mediaTypes: {
+                Audio: Number(lastM[2]),
+                Video: Number(lastM[3]),
+                Picture: Number(lastM[4]),
+                Online: Number(lastM[5])
+            }
+        };
+    }
+}
+//# sourceMappingURL=mediaServiceBin.js.map

package/dist/mediaServiceBin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mediaServiceBin.js","sourceRoot":"","sources":["../src/mediaServiceBin.ts"],"names":[],"mappings":"AACA,OAAO,EACsC,SAAS,EACrD,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEqD,MAAM,EAAE,UAAU,EAAE,SAAS,EACxF,MAAM,UAAU,CAAC;AASlB,MAAM,OAAO,eAAe;IACxB,IAAI,CAAQ;IACZ,QAAQ,CAAS;IACjB,GAAG,CAAU;IACb,IAAI,GAAW,EAAE,CAAC;IAClB,YAAY,CAAgB;IAC5B,QAAQ,CAAc;IACtB,SAAS,CAAc;IACvB,SAAS,CAAc;IACvB,WAAW,CAAc;IACzB,UAAU,CAAc;IACxB,KAAK,GAA2B,EAAE,CAAA;IAClC,OAAO,GAA6B,EAAE,CAAA;IACtC,UAAU,GAAgC,EAAE,CAAC;IAC7C,iBAAiB,CAAqB;IACtC,gBAAgB,GAAG,CAAC,CAAC;IACrB,kBAAkB,GAAG,CAAC,CAAC;IACvB,gBAAgB,GAAG,CAAC,CAAC;IACrB,YAAY,GAAG,EAAE,CAAC;IAClB,YAAY,GAAG,EAAE,CAAC;IAClB,UAAU,GAAW,CAAC,GAAG,CAAC;IAC1B,UAAU,CAAc;IACxB,SAAS,CAAU;IACnB,YAAY,CAAmB;IAC/B,UAAU,CAAmB;IAC7B,SAAS,CAAmB;IAC5B,eAAe,CAAmB;IAElC,YAAY,IAAW,EAAE,IAAY,EAAE,YAA2B,EAAE,UAAuB,EAAE,SAAkB,EAAE,GAAY;QACzH,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC9E,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC;QAEhC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAqB;QAClC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACxB,IAAI,CAAE,MAAM,IAAI,CAAC,QAAQ,EAAE;gBACvB,OAAO,KAAK,CAAC;SACpB;QACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,IAAI,CAAE,MAAM,IAAI,CAAC,UAAU,EAAE;gBACzB,OAAO,KAAK,CAAC;SACpB;QACD,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE;YAC7C,IAAI,CAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAChC,OAAO,KAAK,CAAC;SACpB;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YACjC,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,0BAA0B,EAAE,SAAS,EAAE,EAAE,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACrK,MAAM,WAAW,GAAG,MAAO,GAAG,CAAC,MAAe,CAAC,WAAW,EAAE,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,IAAI,EAAE;YACN,MAAM,OAAO,GAAa,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;YACrF,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,gBAAgB,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE;gBACjD,IAAI,CAAC,iBAAiB,CAAC,IAAI,GAAG,gBAAgB,CAAC;gBAC/C,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC;aAC1C;YACD,SAAU;gBACN,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gBAClC,IAAI,CAAC,IAAI;oBACL,MAAM;gBACV,MAAM,MAAM,GAAa,EAAE,CAAC;gBAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;gBACvD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;gBAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC5B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;iBACrC;gBACD,IAAI,IAAI,IAAI,iBAAiB,IAAI,IAAI,CAAC,IAAI,IAAI,eAAe,IAAI,IAAI,CAAC,IAAI,IAAI,eAAe,EAAE;oBAC3F,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;iBAC9D;gBACD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBACzD,IAAI,CAAC,gBAAgB,EAAE,CAAC;aAC3B;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,gBAAgB,QAAQ,CAAC,CAAC;SACpE;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,KAAK,CAAC,UAAU;QACZ,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,0BAA0B,EAAE,SAAS,EAAE,EAAE,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACxK,MAAM,WAAW,GAAG,MAAO,GAAG,CAAC,MAAe,CAAC,WAAW,EAAE,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,IAAI,EAAE;YACN,MAAM,OAAO,GAAa,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;YACrF,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;YAC9C,IAAI,gBAAgB,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE;gBACjD,IAAI,CAAC,iBAAiB,CAAC,IAAI,GAAG,gBAAgB,CAAC;gBAC/C,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC;aAC1C;YACD,IAAI,QAAmB,CAAC;YACxB,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,EAAE;gBACtD,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;oBAClC,OAAO,CAAC,CAAC;gBACb,MAAM,IAAI,GAAG,EAAkB,CAAA;gBAC/B,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,SAAS;oBAC5D,IAAI,CAAC,OAAO,CAAC,IAAkB,CAAC,CAAC;qBAChC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAoB,CAAC;oBAC7C,OAAO,CAAC,CAAC;gBACb,KAAK,EAAE,CAAC;aACX;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,KAAK,UAAU,CAAC,CAAC;SACxD;QACD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,SAAqB;QAChC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,0BAA0B,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,EAAE,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACrL,MAAM,WAAW,GAAG,MAAO,GAAG,CAAC,MAAe,CAAC,WAAW,EAAE,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,IAAI,EAAE;YACN,IAAI,GAAG,CAAC,OAAO,EAAE;gBACb,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBACtD,IAAI,YAAY,EAAE;oBACd,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;oBAClE,IAAI,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,EAAE;wBACtC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;wBACpE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC;qBAC1C;iBACJ;aACJ;YACD,MAAM,OAAO,GAAa,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;YACrF,MAAM,KAAK,GAA2B,EAAE,CAAC;YACzC,IAAI,QAAmB,CAAC;YACxB,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,EAAE;gBACtD;oBACI,IAAI,QAAQ,IAAI,SAAS,CAAC,SAAS,EAAE;wBACjC,mBAAmB;wBACnB,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;wBACtC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;wBACpC,IAAI,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;4BACjD,QAAQ,EAAE,CAAC;yBACd;qBACJ;yBACI;wBACf,aAAa;wBACC,MAAM,IAAI,GAAG,EAAgB,CAAC;wBAC9B,IAAI,CAAC,aAAa,CAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;wBAC7C,IAAI,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;4BAClD,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gCACzB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;gCAC1B,KAAK,EAAE,CAAC;6BACX;yBACJ;qBACJ;iBACJ;aACJ;YACD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAClD,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,KAAK,IAAI,SAAS,QAAQ,CAAC,CAAC;YAC9D,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,SAAqB;QACnC,QAAQ,SAAS,EAAE;YACf,KAAK,UAAU,CAAC,KAAK,CAAC,CAAM,OAAO,SAAS,CAAC,KAAK,CAAC;YACnD,KAAK,UAAU,CAAC,KAAK,CAAC,CAAM,OAAO,SAAS,CAAC,KAAK,CAAC;YACnD,KAAK,UAAU,CAAC,OAAO,CAAC,CAAI,OAAO,SAAS,CAAC,OAAO,CAAC;YACrD,KAAK,UAAU,CAAC,MAAM,CAAC,CAAK,OAAO,SAAS,CAAC,SAAS,CAAC;SAC1D;QACD,OAAO,SAAS,CAAC,IAAI,CAAC;IAC1B,CAAC;IAEO,aAAa,CAAC,CAAW,EAAE,IAAgB,EAAE,QAAmB;QACpE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QACrC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;IACvC,CAAC;IACO,eAAe,CAAC,CAAW,EAAE,MAAoB,EAAE,QAAmB;QAC1E,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxC,MAAM,YAAY,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,gBAAgB,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,iBAAiB,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QACxC,MAAM,cAAc,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;IACzC,CAAC;IACO,aAAa,CAAE,CAAW,EAAE,IAAgB,EAAE,QAAmB;QACrE,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtC,QAAQ,QAAQ,EAAE;YACd,KAAK,SAAS,CAAC,cAAc,CAAC;YAC9B,KAAK,SAAS,CAAC,UAAU;gBACrB,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAkB,CAAC,CAAC;gBAC/C,MAAM;YACV,KAAK,SAAS,CAAC,WAAW;gBACtB,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,IAAoB,CAAC,CAAC;gBACnD,MAAM;YACV,KAAK,SAAS,CAAC,cAAc,CAAC;YAC9B,KAAK,SAAS,CAAC,SAAS;gBACpB,IAAI,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAkB,CAAC,CAAC;gBAC/C,MAAM;SACb;IACL,CAAC;IACO,kBAAkB,CAAC,CAAW,EAAE,IAAgB;QACpD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAO,+BAA+B;QAC3E,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;IACjC,CAAC;IACO,kBAAkB,CAAC,CAAW,EAAE,IAAgB;QACpD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAO,+BAA+B;QAC3E,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1C,IAAI,KAAK,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;YACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE;gBAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;SAC1C;IACL,CAAC;IACO,oBAAoB,CAAC,CAAW,EAAE,IAAkB;QACxD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAO,+BAA+B;QAC3E,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE;gBAC1B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;SAC3C;IACL,CAAC;IAEO,OAAO,CAAC,IAAgB;QAC5B,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG;YAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;aACpB;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACrC,QAAQ,IAAI,CAAC,QAAQ,EAAE;gBACnB,KAAK,SAAS,CAAC,SAAS;oBAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;oBAAC,MAAM;gBACzD,KAAK,SAAS,CAAC,SAAS;oBAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;oBAAC,MAAM;gBACzD,KAAK,SAAS,CAAC,WAAW;oBAAE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;oBAAC,MAAM;gBAC3D,KAAK,SAAS,CAAC,UAAU;oBAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;oBAAC,MAAM;aAC7D;SACJ;IACL,CAAC;IACO,SAAS,CAAC,MAAoB,EAAE,MAAoB;QACxD,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,OAAO;YACf,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,MAAM,IAAI,IAAI;YACrB,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,SAAS,EAAE;YACZ,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;YACrC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;YACvE,IAAI,GAAG,IAAI,CAAC;gBACR,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;;gBAE7B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACnC;aACI;YACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;YACrC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACO,YAAY,CAAC,MAAoB;QACrC,IAAI,MAAM,CAAC,YAAY,EAAE;YACrB,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACrD,IAAI,CAAC,YAAY;gBACb,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACnD,IAAI,YAAY;gBACZ,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACnD;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IACO,iBAAiB,CAAC,QAAgB,EAAE,MAAc,EAAE,KAA6B;QAErF,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,EAAE;YACP,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,QAAQ,IAAI,MAAM,cAAc,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC;SAEhB;QACD,IAAI,QAAQ,EAAE;YACV,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,YAAY,EAAE;gBACd,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;aAC3C;SACJ;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,IAAI,CAAC,IAAI,oBAAoB,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC;IACjB,CAAC;IACO,YAAY,CAAC,IAAgB;QACjC,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACrD,IAAI,YAAY;gBACZ,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;SAC/C;QACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,IAAI,oBAAoB,CAAC,CAAC;QAC5D,OAAO,KAAK,CAAC;IACjB,CAAC;IACO,OAAO,CAAC,MAAoB,EAAE,IAAgB;QAClD,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,EAAE;YACxC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;SACrC;QACD,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI;YACpB,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;QACtB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI;YACnB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,GAAG,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAChE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IAChB,CAAC;IACO,iBAAiB;QACrB,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,wBAAwB,EAC9C,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5K,EAAE,CAAC,QAAQ,GAAG,KAAK,CAAC;IACxB,CAAC;IACO,iBAAiB;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClG,IAAI,CAAC,iBAAiB,GAAG;YACrB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9C,UAAU,EAAE;gBACR,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACzB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC3B;SACJ,CAAA;IACL,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/media",
-  "version": "1.0.109",
+  "version": "1.0.111",
   "description": "RIC media interfaces",
 
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
   "license": "ISC",
   "dependencies": {
     "@christianriedl/utils": "^1.0.86",
-    "@christianriedl/rest": "^1.0.49",
+    "@christianriedl/rest": "^1.0.51",
     "@christianriedl/epg": "^1.0.30"
   },
   "devDependencies": {

package/src/views/OnlineTVsPage.vue

@@ -60,7 +60,7 @@
             url = `${mediaService.rest.serviceUrl}apistream/satipstream?channelName=${selected.value.Name}&url=${encodeURIComponent(selected.value.Url)}`;
             if (audioStream.value)
                 url += `&audioStream=${audioStream.value}`;
-            if (params && params.set)
+            if (params)
                 url += `&width=${params.width}&height=${params.height}&videoBitRate=${params.videoBitRate}&audioBitRate=${params.audioBitRate}`;
         }
         else {

package/src/views/RecordedVideosPage.vue

@@ -24,7 +24,7 @@
     const audioStream = ref(0);
     const qualities = mediaService.getVideoQualities();
     const quality = ref(0);
-    let params: ITranscodeParams;
+    let params: ITranscodeParams|null = null;
     const paramsText = ref('');
 
     const backVisible = computed(() => selected.value.ItemType != EItemType.VideoRoot);
@@ -57,7 +57,7 @@
             url += `?audioStream=${audioStream.value}`;
             parSet = true;
         }
-        if (params && params.set) {
+        if (params) {
             url += parSet ? '&' : '?';
             url += `width=${params.width}&height=${params.height}&videoBitRate=${params.videoBitRate}&audioBitRate=${params.audioBitRate}`;
             parSet = true;
@@ -66,12 +66,13 @@
     }
     function listItem(item: IMediaItem) {
         if (item.ItemType == EItemType.VideoItem || item.ItemType == EItemType.VideoBroadcast) {
+            quality.value = 0;
             selected.value = item;
             computeListHeight();
             const video = item as IVideoFile;
             const as = mediaService.splitAudioStreams(video.AudioStreams);
             audioStreams.splice(0, audioStreams.length, ...as);
-            paramsText.value = `${video.Width}x${video.Height}, ${Math.floor(video.BitRate / 1000)} kbit/s`;
+            paramsText.value = `${video.Width}x${video.Height}, ${video.FrameRate} /s, ${Math.floor(video.BitRate / 1000)} kbit/s`;
             return;
         }
     }
@@ -96,8 +97,9 @@
         items.splice(0, items.length, ...root.Files);
         computeListHeight();
     }
-    async function onShare(item: IVideoFile) {
-        const url = `https://www.christian-riedl.com/photos/video?media=${item.Url}&width=${item.Width}&height=${item.Height}&videobitrate=`;
+    async function onShare(item: IMediaItem) {
+        const file = items as IVideoFile;
+        const url = `https://www.christian-riedl.com/photos/video?media=${file.Url}&width=${file.Width}&height=${file.Height}&videobitrate=`;
         await window.navigator.clipboard.writeText(url);
         window.alert(`Created and Pasted : ${url} !`);
     }

package/src/views/VideosPage.vue

@@ -115,13 +115,14 @@
     }
     function listItem(item: IMediaItem) {
         if (item.ItemType == EItemType.VideoItem) {
+            quality.value = 0;
             selected.value = item;
             getPlayer();
             computeListHeight();
             const video = item as IVideoFile;
             const as = mediaService.splitAudioStreams(video.AudioStreams);
             audioStreams.splice(0, audioStreams.length, ...as);
-            paramsText.value = `${video.Width}x${video.Height}, ${Math.floor(video.BitRate / 1000)} kbit/s`;
+            paramsText.value = `${video.Width}x${video.Height}, ${video.FrameRate} /s, ${Math.floor(video.BitRate / 1000)} kbit/s`;
             return;
         }
         const folder = item as IMediaFolder;
@@ -203,8 +204,9 @@
             }
         }
     }
-    async function onShare(item: IVideoFile) {
-        const url = `https://www.christian-riedl.com/photos/video?media=${item.Url}&width=${item.Width}&height=${item.Height}&videobitrate=`;
+    async function onShare(item: IMediaItem) {
+        const file = items as IVideoFile;
+        const url = `https://www.christian-riedl.com/photos/video?media=${file.Url}&width=${file.Width}&height=${file.Height}&videobitrate=`;
         await window.navigator.clipboard.writeText(url);
         window.alert(`Created and Pasted : ${url} !`);
     }