@christianriedl/media 1.0.148 → 1.0.149

package/dist/iMedia.d.ts

@@ -96,38 +96,38 @@ export declare enum EState {
     MarkedForDownload = 128
 }
 export interface IMediaItem {
-    ItemType: EItemType;
-    State: EState;
-    Rating: number;
-    GenreIdx: number;
-    CreatorIdx: number;
-    Name: string;
-    Description: string;
-    DLNAID: string;
-    DLNAParentID: string;
-    Year: number;
-    Date: Date;
-    Url: string;
-    ThumbnailUrl: string;
+    itemType: EItemType;
+    state: EState;
+    rating: number;
+    genreIdx: number;
+    creatorIdx: number;
+    name: string;
+    description: string;
+    dlnaid: string;
+    dlnaParentId: string;
+    year: number;
+    date: Date;
+    url: string;
+    thumbnailUrl: string;
     title?: string;
     subTitle?: string;
     info?: string;
 }
 export interface IMediaListEntry {
-    Name: string;
-    Values: string[];
-    Parents?: number[];
-    Children?: number[][];
+    name: string;
+    values: string[];
+    parents?: number[];
+    children?: number[][];
 }
 export interface IMediaLists {
-    ModificationTime: Date;
-    PrivateCreatorIdx: number;
-    Lists: IMediaListEntry[];
+    modificationTime: Date;
+    privateCreatorIdx: number;
+    lists: IMediaListEntry[];
 }
 export interface IMediaFolder extends IMediaItem {
-    ChildCount: number;
-    Folders: IMediaFolder[];
-    Files: IMediaFile[];
+    childCount: number;
+    folders: IMediaFolder[];
+    files: IMediaFile[];
     prepared?: boolean;
     subfolderPrepared?: boolean;
     altColor?: boolean;
@@ -135,8 +135,8 @@ export interface IMediaFolder extends IMediaItem {
     populated?: boolean;
 }
 export interface IMediaFile extends IMediaItem {
-    Extension: number;
-    Size: number;
+    extension: number;
+    size: number;
 }
 export declare enum EOrientation {
     None = 0,
@@ -161,37 +161,37 @@ export declare enum EPictureFlags {
     Mask = 240
 }
 export interface IPictureFile extends IMediaFile {
-    EventIdx: number;
-    LocationIdx: number;
-    PersonIdxs: number[];
-    Height: number;
-    Width: number;
-    Orientation: EOrientation;
-    Flags: EPictureFlags;
-    ThumbHeight: number;
-    ThumbWidth: number;
+    eventIdx: number;
+    locationIdx: number;
+    personIdxs: number[];
+    height: number;
+    width: number;
+    orientation: EOrientation;
+    flags: EPictureFlags;
+    thumbHeight: number;
+    thumbWidth: number;
     selected?: boolean;
     blob?: string;
 }
 export interface IAudioFile extends IMediaFile {
-    BitRate: number;
-    Duration: number;
-    Extension: number;
-    SampleRate: number;
-    Size: number;
-    TrackNo: number;
+    bitRate: number;
+    duration: number;
+    extension: number;
+    sampleRate: number;
+    size: number;
+    trackNo: number;
 }
 export interface IVideoFile extends IMediaFile {
-    ActorIdxs: number[];
-    BitRate: number;
-    FrameRate: number;
-    CountryIdx: number;
-    Duration: number;
-    Extension: number;
-    Size: number;
-    Height: number;
-    Width: number;
-    AudioStreams: string;
+    actorIdxs: number[];
+    bitRate: number;
+    frameRate: number;
+    countryIdx: number;
+    duration: number;
+    extension: number;
+    size: number;
+    height: number;
+    width: number;
+    audioStreams: string;
 }
 export interface IAudioInfo {
     codec: string;

package/dist/locationHelper.js

@@ -8,15 +8,15 @@ export class LocationHelper {
     }
     static addLocationParents(mediaService, list, rating, ratingMap) {
         const parentFolder = mediaService.getFolder(`ph.${rating}.lo`);
-        parentFolder.Folders.length = 0;
-        for (let i = 0; i < list.Parents.length; i++) {
-            if (list.Parents[i] < 0)
-                LocationHelper.addLocationParent(mediaService, parentFolder, i, list.Values[i], list.Children[i], rating, ratingMap);
+        parentFolder.folders.length = 0;
+        for (let i = 0; i < list.parents.length; i++) {
+            if (list.parents[i] < 0)
+                LocationHelper.addLocationParent(mediaService, parentFolder, i, list.values[i], list.children[i], rating, ratingMap);
         }
-        parentFolder.Folders.sort((x1, x2) => x1.Name.localeCompare(x2.Name));
-        for (let i = 0; i < parentFolder.Folders.length; i++) {
+        parentFolder.folders.sort((x1, x2) => x1.name.localeCompare(x2.name));
+        for (let i = 0; i < parentFolder.folders.length; i++) {
             if ((i % 2) != 0)
-                parentFolder.Folders[i].altColor = true;
+                parentFolder.folders[i].altColor = true;
         }
     }
     static addLocationParent(mediaService, parentFolder, index, name, children, rating, ratingMap) {
@@ -26,58 +26,58 @@ export class LocationHelper {
         if (!folder) {
             folder =
                 {
-                    CreatorIdx: -1,
-                    GenreIdx: -1,
-                    ChildCount: 0,
-                    Description: "",
-                    Files: null,
-                    Url: null,
-                    ThumbnailUrl: null,
-                    Year: 1970,
-                    Date: new Date(1970, 0, 1),
-                    ItemType: EItemType.PictureCategory,
-                    DLNAParentID: `ph.${rating}.lo`,
-                    DLNAID: folderId,
-                    Name: name,
-                    Rating: ratingMap,
-                    Folders: [],
-                    State: EState.FolderVirtual
+                    creatorIdx: -1,
+                    genreIdx: -1,
+                    childCount: 0,
+                    description: "",
+                    files: null,
+                    url: null,
+                    thumbnailUrl: null,
+                    year: 1970,
+                    date: new Date(1970, 0, 1),
+                    itemType: EItemType.PictureCategory,
+                    dlnaParentId: `ph.${rating}.lo`,
+                    dlnaid: folderId,
+                    name: name,
+                    rating: ratingMap,
+                    folders: [],
+                    state: EState.FolderVirtual
                 };
-            allFolders[folder.DLNAID] = folder;
+            allFolders[folder.dlnaid] = folder;
         }
-        folder.info = folder.Name;
-        folder.CreatorIdx = index; // !! used to store Location Index
+        folder.info = folder.name;
+        folder.creatorIdx = index; // !! used to store Location Index
         if (children && children.length > 0)
             folder.mustExpand = true;
-        parentFolder.Folders.push(folder);
+        parentFolder.folders.push(folder);
     }
     static expandLocationFolder(mediaService, parentFolder, expandFolder) {
         const altColor = expandFolder.altColor;
         const pictureLocations = mediaService.pictureLocation;
-        const locationIdx = expandFolder.CreatorIdx; // Used to store locationIdx !!
+        const locationIdx = expandFolder.creatorIdx; // Used to store locationIdx !!
         if (locationIdx >= 0) {
-            const children = pictureLocations.Children[locationIdx];
+            const children = pictureLocations.children[locationIdx];
             if (!children || !children.length)
                 return;
             const expandedList = [];
             const hasChildrenList = [];
             for (let i = 0; i < children.length; i++) {
                 const childIdx = children[i];
-                var folder = mediaService.getFolder(`${expandFolder.DLNAParentID}.${childIdx}|`);
+                var folder = mediaService.getFolder(`${expandFolder.dlnaParentId}.${childIdx}|`);
                 if (folder) {
-                    if (pictureLocations.Children[childIdx] && pictureLocations.Children[childIdx].length)
+                    if (pictureLocations.children[childIdx] && pictureLocations.children[childIdx].length)
                         hasChildrenList.push(folder);
-                    folder.CreatorIdx = childIdx; // used to store location index !!
+                    folder.creatorIdx = childIdx; // used to store location index !!
                     expandedList.push(folder);
-                    expandFolder.Folders.push(folder);
+                    expandFolder.folders.push(folder);
                     folder.altColor = altColor;
                 }
             }
             expandFolder.mustExpand = false;
-            expandFolder.ChildCount = expandFolder.Folders.length;
-            expandFolder.info = `${expandFolder.Name} (${expandFolder.ChildCount})`;
-            const idx = parentFolder.Folders.indexOf(expandFolder);
-            parentFolder.Folders.splice(idx + 1, 0, ...expandedList);
+            expandFolder.childCount = expandFolder.folders.length;
+            expandFolder.info = `${expandFolder.name} (${expandFolder.childCount})`;
+            const idx = parentFolder.folders.indexOf(expandFolder);
+            parentFolder.folders.splice(idx + 1, 0, ...expandedList);
             for (let i = 0; i < hasChildrenList.length; i++) {
                 LocationHelper.expandLocationFolder(mediaService, parentFolder, hasChildrenList[i]);
             }
@@ -88,12 +88,12 @@ export class LocationHelper {
         const childAlbums = {};
         var childYears = new Set();
         // Take direct subfolders
-        if (folder.Folders) {
+        if (folder.folders) {
             LocationHelper.collectAlbums(childAlbums, childYears, folder);
-            folder.Folders.length = 0;
+            folder.folders.length = 0;
         }
         else
-            folder.Folders = [];
+            folder.folders = [];
         if (Object.keys(childAlbums).length < maxAlbums) {
             // Create Direct Album Children
             const albumNames = Object.keys(childAlbums);
@@ -101,40 +101,40 @@ export class LocationHelper {
             for (let i = 0; i < albumNames.length; i++) {
                 const albumName = albumNames[i];
                 const album = {
-                    CreatorIdx: -1,
-                    GenreIdx: -1,
-                    ChildCount: 0,
-                    Description: "",
-                    Folders: null,
-                    Url: "",
-                    ThumbnailUrl: null,
-                    Year: 1970,
-                    Date: new Date(1970, 0, 1),
-                    ItemType: EItemType.PictureAlbum,
-                    DLNAParentID: folder.DLNAID,
-                    DLNAID: `${folder.DLNAID}v${i}`,
-                    Name: albumName,
-                    Rating: 0,
-                    Files: [],
-                    State: EState.FolderVirtual
+                    creatorIdx: -1,
+                    genreIdx: -1,
+                    childCount: 0,
+                    description: "",
+                    folders: null,
+                    url: "",
+                    thumbnailUrl: null,
+                    year: 1970,
+                    date: new Date(1970, 0, 1),
+                    itemType: EItemType.PictureAlbum,
+                    dlnaParentId: folder.dlnaid,
+                    dlnaid: `${folder.dlnaid}v${i}`,
+                    name: albumName,
+                    rating: 0,
+                    files: [],
+                    state: EState.FolderVirtual
                 };
                 var folders = childAlbums[albumName];
                 for (let j = 0; j < folders.length; j++) {
                     const subFolder = folders[j];
-                    album.Rating |= subFolder.Rating;
-                    album.Files.splice(0, 0, ...subFolder.Files);
+                    album.rating |= subFolder.rating;
+                    album.files.splice(0, 0, ...subFolder.files);
                 }
-                album.Files.sort((x1, x2) => {
-                    if (x1.Date < x2.Date)
+                album.files.sort((x1, x2) => {
+                    if (x1.date < x2.date)
                         return -1;
-                    if (x1.Date > x2.Date)
+                    if (x1.date > x2.date)
                         return 1;
                     return 0;
                 });
-                album.ChildCount = album.Files.length;
-                album.info = `${album.Name} (${album.ChildCount})`;
-                allFolders[album.DLNAID] = album;
-                folder.Folders.push(album);
+                album.childCount = album.files.length;
+                album.info = `${album.name} (${album.childCount})`;
+                allFolders[album.dlnaid] = album;
+                folder.folders.push(album);
             }
         }
         else {
@@ -145,18 +145,18 @@ export class LocationHelper {
                 const childAlbumGroup = childAlbums[key];
                 for (let i = 0; i < childAlbumGroup.length; i++) {
                     const childAlbum = childAlbumGroup[i];
-                    let yearAlbums = yearDict[childAlbum.Year];
+                    let yearAlbums = yearDict[childAlbum.year];
                     if (yearAlbums) {
-                        albums = yearAlbums[childAlbum.Name];
+                        albums = yearAlbums[childAlbum.name];
                         if (albums)
                             albums.push(childAlbum);
                         else
-                            yearAlbums[childAlbum.Name] = [childAlbum];
+                            yearAlbums[childAlbum.name] = [childAlbum];
                     }
                     else {
                         yearAlbums = {};
-                        yearAlbums[childAlbum.Name] = [childAlbum];
-                        yearDict[childAlbum.Year] = yearAlbums;
+                        yearAlbums[childAlbum.name] = [childAlbum];
+                        yearDict[childAlbum.year] = yearAlbums;
                     }
                 }
             }
@@ -164,89 +164,89 @@ export class LocationHelper {
             years.sort();
             for (let i = 0; i < years.length; i++) {
                 var yearCategory = {
-                    CreatorIdx: -1,
-                    GenreIdx: -1,
-                    ChildCount: 0,
-                    Description: "",
-                    Url: null,
-                    ThumbnailUrl: null,
-                    Year: 1970,
-                    Date: new Date(1970, 0, 1),
-                    Files: null,
-                    ItemType: EItemType.PictureCategory,
-                    DLNAParentID: folder.DLNAID,
-                    DLNAID: `${folder.DLNAID}y${i}`,
-                    Name: years[i].toString(),
-                    Rating: 0,
-                    Folders: [],
-                    State: EState.FolderVirtual
+                    creatorIdx: -1,
+                    genreIdx: -1,
+                    childCount: 0,
+                    description: "",
+                    url: null,
+                    thumbnailUrl: null,
+                    year: 1970,
+                    date: new Date(1970, 0, 1),
+                    files: null,
+                    itemType: EItemType.PictureCategory,
+                    dlnaParentId: folder.dlnaid,
+                    dlnaid: `${folder.dlnaid}y${i}`,
+                    name: years[i].toString(),
+                    rating: 0,
+                    folders: [],
+                    state: EState.FolderVirtual
                 };
-                allFolders[yearCategory.DLNAID] = yearCategory;
-                folder.Folders.push(yearCategory);
+                allFolders[yearCategory.dlnaid] = yearCategory;
+                folder.folders.push(yearCategory);
                 const yearAlbums = yearDict[years[i]];
                 let j = 0;
                 for (const yearAlbumKey in yearAlbums) {
                     var album = {
-                        CreatorIdx: -1,
-                        GenreIdx: -1,
-                        ChildCount: 0,
-                        Description: "",
-                        Folders: null,
-                        Url: "",
-                        ThumbnailUrl: null,
-                        Year: 1970,
-                        Date: new Date(1970, 0, 1),
-                        ItemType: EItemType.PictureAlbum,
-                        DLNAParentID: yearCategory.DLNAID,
-                        DLNAID: `${yearCategory.DLNAID}v${j}`,
-                        Name: yearAlbumKey,
-                        Rating: 0,
-                        Files: [],
-                        State: EState.FolderVirtual
+                        creatorIdx: -1,
+                        genreIdx: -1,
+                        childCount: 0,
+                        description: "",
+                        folders: null,
+                        url: "",
+                        thumbnailUrl: null,
+                        year: 1970,
+                        date: new Date(1970, 0, 1),
+                        itemType: EItemType.PictureAlbum,
+                        dlnaParentId: yearCategory.dlnaid,
+                        dlnaid: `${yearCategory.dlnaid}v${j}`,
+                        name: yearAlbumKey,
+                        rating: 0,
+                        files: [],
+                        state: EState.FolderVirtual
                     };
                     const subFolders = yearAlbums[yearAlbumKey];
                     for (let k = 0; k < subFolders.length; k++) {
                         const subFolder = subFolders[k];
-                        album.Rating |= subFolder.Rating;
-                        album.Files.splice(0, 0, ...subFolder.Files);
+                        album.rating |= subFolder.rating;
+                        album.files.splice(0, 0, ...subFolder.files);
                     }
-                    album.Files.sort((x1, x2) => {
-                        if (x1.Date < x2.Date)
+                    album.files.sort((x1, x2) => {
+                        if (x1.date < x2.date)
                             return -1;
-                        if (x1.Date > x2.Date)
+                        if (x1.date > x2.date)
                             return 1;
                         return 0;
                     });
-                    album.ChildCount = album.Files.length;
-                    album.info = `${album.Name} (${album.ChildCount})`;
-                    yearCategory.Rating |= album.Rating;
-                    allFolders[album.DLNAID] = album;
-                    yearCategory.Folders.push(album);
+                    album.childCount = album.files.length;
+                    album.info = `${album.name} (${album.childCount})`;
+                    yearCategory.rating |= album.rating;
+                    allFolders[album.dlnaid] = album;
+                    yearCategory.folders.push(album);
                     j++;
                 }
-                yearCategory.ChildCount = yearCategory.Folders.length;
-                yearCategory.info = `${yearCategory.Name} (${yearCategory.ChildCount})`;
+                yearCategory.childCount = yearCategory.folders.length;
+                yearCategory.info = `${yearCategory.name} (${yearCategory.childCount})`;
             }
         }
-        folder.ChildCount = folder.Folders.length;
-        folder.info = `${folder.Name} (${folder.ChildCount})`;
+        folder.childCount = folder.folders.length;
+        folder.info = `${folder.name} (${folder.childCount})`;
         folder.mustExpand = false;
         folder.populated = true;
         return true;
     }
     static collectAlbums(albums, years, folder) {
-        for (let i = 0; i < folder.Folders.length; i++) {
-            const album = folder.Folders[i];
-            if (album.ItemType == EItemType.PictureAlbum) {
+        for (let i = 0; i < folder.folders.length; i++) {
+            const album = folder.folders[i];
+            if (album.itemType == EItemType.PictureAlbum) {
                 LocationHelper.collectAlbum(albums, years, album);
             }
-            else if (album.Folders != null) {
-                for (let j = 0; j < album.Folders.length; j++) {
-                    const subalbum = album.Folders[j];
-                    if (subalbum.ItemType == EItemType.PictureAlbum) {
+            else if (album.folders != null) {
+                for (let j = 0; j < album.folders.length; j++) {
+                    const subalbum = album.folders[j];
+                    if (subalbum.itemType == EItemType.PictureAlbum) {
                         LocationHelper.collectAlbum(albums, years, subalbum);
                     }
-                    else if (subalbum.ItemType == EItemType.PictureCategory) {
+                    else if (subalbum.itemType == EItemType.PictureCategory) {
                         LocationHelper.collectAlbums(albums, years, subalbum);
                     }
                 }
@@ -254,18 +254,18 @@ export class LocationHelper {
         }
     }
     static collectAlbum(albums, years, album) {
-        const folders = albums[album.Name];
+        const folders = albums[album.name];
         if (folders)
             folders.push(album);
         else
-            albums[album.Name] = [album];
-        years.add(album.Year);
-        if (album.Files) {
+            albums[album.name] = [album];
+        years.add(album.year);
+        if (album.files) {
             // This required because different albums are collected
-            for (let i = 0; i < album.Files.length; i++) {
-                album.Files[i].Url = album.Url + album.Files[i].Url;
+            for (let i = 0; i < album.files.length; i++) {
+                album.files[i].url = album.url + album.files[i].url;
             }
-            album.Url = "";
+            album.url = "";
         }
     }
 }

package/dist/mediaHelper.js

@@ -61,14 +61,14 @@ export class MediaHelper {
     }
     static getPhotoDisplayName(folder, pictureFile, pictureLocations, album) {
         let emptyName = "|";
-        const url = folder.Url + pictureFile.Url;
-        const name = pictureFile.Name;
+        const url = folder.url + pictureFile.url;
+        const name = pictureFile.name;
         if (!url.includes(name)) {
             return name;
         }
-        if (pictureFile.LocationIdx >= 0 && pictureLocations) {
-            let location = pictureLocations.Values[pictureFile.LocationIdx];
-            if (!album || !album.Name.includes(location)) {
+        if (pictureFile.locationIdx >= 0 && pictureLocations) {
+            let location = pictureLocations.values[pictureFile.locationIdx];
+            if (!album || !album.name.includes(location)) {
                 return location;
             }
         }