@christianriedl/media 1.0.139 → 1.0.140
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/locationHelper.d.ts
CHANGED
|
@@ -7,4 +7,5 @@ export declare class LocationHelper {
|
|
|
7
7
|
static expandLocationFolder(mediaService: IMediaService, parentFolder: IMediaFolder, expandFolder: IMediaFolder): void;
|
|
8
8
|
static populateParentFolder(mediaService: IMediaService, folder: IMediaFolder, maxAlbums?: number): boolean;
|
|
9
9
|
static collectAlbums(albums: Dictionary<IMediaFolder[]>, years: Set<number>, folder: IMediaFolder): void;
|
|
10
|
+
static collectAlbum(albums: Dictionary<IMediaFolder[]>, years: Set<number>, album: IMediaFolder): void;
|
|
10
11
|
}
|
package/dist/locationHelper.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { EItemType, EState } from "./iMedia";
|
|
2
2
|
export class LocationHelper {
|
|
3
3
|
static addAllLocationParents(mediaService) {
|
|
4
|
-
const pictureLocations = mediaService.medialists["Picture.
|
|
4
|
+
const pictureLocations = mediaService.medialists["Picture.Location"];
|
|
5
5
|
LocationHelper.addLocationParents(mediaService, pictureLocations, "all", (1 << 2) | (1 << 1) | 1);
|
|
6
6
|
LocationHelper.addLocationParents(mediaService, pictureLocations, "*", (1 << 2) | (1 << 1));
|
|
7
7
|
LocationHelper.addLocationParents(mediaService, pictureLocations, "**", 1 << 2);
|
|
@@ -45,6 +45,7 @@ export class LocationHelper {
|
|
|
45
45
|
};
|
|
46
46
|
allFolders[folder.DLNAID] = folder;
|
|
47
47
|
}
|
|
48
|
+
folder.info = folder.Name;
|
|
48
49
|
folder.CreatorIdx = index; // !! used to store Location Index
|
|
49
50
|
if (children && children.length > 0)
|
|
50
51
|
folder.mustExpand = true;
|
|
@@ -52,7 +53,7 @@ export class LocationHelper {
|
|
|
52
53
|
}
|
|
53
54
|
static expandLocationFolder(mediaService, parentFolder, expandFolder) {
|
|
54
55
|
const altColor = expandFolder.altColor;
|
|
55
|
-
const pictureLocations = mediaService.medialists["Picture.
|
|
56
|
+
const pictureLocations = mediaService.medialists["Picture.Location"];
|
|
56
57
|
const locationIdx = expandFolder.CreatorIdx; // Used to store locationIdx !!
|
|
57
58
|
if (locationIdx >= 0) {
|
|
58
59
|
const children = pictureLocations.Children[locationIdx];
|
|
@@ -84,7 +85,7 @@ export class LocationHelper {
|
|
|
84
85
|
static populateParentFolder(mediaService, folder, maxAlbums = 20) {
|
|
85
86
|
if (folder.CreatorIdx < 0) // Location index
|
|
86
87
|
return false;
|
|
87
|
-
const pictureLocations = mediaService.medialists["Picture.
|
|
88
|
+
const pictureLocations = mediaService.medialists["Picture.Location"];
|
|
88
89
|
if (!pictureLocations.Children[folder.CreatorIdx] || pictureLocations.Children[folder.CreatorIdx].length == 0)
|
|
89
90
|
return false;
|
|
90
91
|
const allFolders = mediaService.folders;
|
|
@@ -135,6 +136,7 @@ export class LocationHelper {
|
|
|
135
136
|
return 0;
|
|
136
137
|
});
|
|
137
138
|
album.ChildCount = album.Files.length;
|
|
139
|
+
album.info = `${album.Name} (${album.ChildCount})`;
|
|
138
140
|
allFolders[album.DLNAID] = album;
|
|
139
141
|
folder.Folders.push(album);
|
|
140
142
|
}
|
|
@@ -221,15 +223,17 @@ export class LocationHelper {
|
|
|
221
223
|
return 0;
|
|
222
224
|
});
|
|
223
225
|
album.ChildCount = album.Files.length;
|
|
226
|
+
album.info = `${album.Name} (${album.ChildCount})`;
|
|
224
227
|
yearCategory.Rating |= album.Rating;
|
|
225
228
|
allFolders[album.DLNAID] = album;
|
|
226
229
|
yearCategory.Folders.push(album);
|
|
227
230
|
j++;
|
|
228
231
|
}
|
|
229
232
|
yearCategory.ChildCount = yearCategory.Folders.length;
|
|
233
|
+
yearCategory.info = `${yearCategory.Name} (${yearCategory.ChildCount})`;
|
|
230
234
|
}
|
|
231
|
-
folder.ChildCount = folder.Folders.length;
|
|
232
235
|
}
|
|
236
|
+
folder.ChildCount = folder.Folders.length;
|
|
233
237
|
folder.info = `${folder.Name} (${folder.ChildCount})`;
|
|
234
238
|
folder.mustExpand = false;
|
|
235
239
|
return true;
|
|
@@ -238,23 +242,13 @@ export class LocationHelper {
|
|
|
238
242
|
for (let i = 0; i < folder.Folders.length; i++) {
|
|
239
243
|
const album = folder.Folders[i];
|
|
240
244
|
if (album.ItemType == EItemType.PictureAlbum) {
|
|
241
|
-
|
|
242
|
-
if (folders)
|
|
243
|
-
folders.push(album);
|
|
244
|
-
else
|
|
245
|
-
albums[album.Name] = [album];
|
|
246
|
-
years.add(album.Year);
|
|
245
|
+
LocationHelper.collectAlbum(albums, years, album);
|
|
247
246
|
}
|
|
248
247
|
else if (album.Folders != null) {
|
|
249
248
|
for (let j = 0; j < album.Folders.length; j++) {
|
|
250
249
|
const subalbum = album.Folders[j];
|
|
251
250
|
if (subalbum.ItemType == EItemType.PictureAlbum) {
|
|
252
|
-
|
|
253
|
-
if (folders)
|
|
254
|
-
folders.push(subalbum);
|
|
255
|
-
else
|
|
256
|
-
albums[subalbum.Name] = [subalbum];
|
|
257
|
-
years.add(subalbum.Year);
|
|
251
|
+
LocationHelper.collectAlbum(albums, years, subalbum);
|
|
258
252
|
}
|
|
259
253
|
else if (subalbum.ItemType == EItemType.PictureCategory) {
|
|
260
254
|
LocationHelper.collectAlbums(albums, years, subalbum);
|
|
@@ -263,5 +257,20 @@ export class LocationHelper {
|
|
|
263
257
|
}
|
|
264
258
|
}
|
|
265
259
|
}
|
|
260
|
+
static collectAlbum(albums, years, album) {
|
|
261
|
+
const folders = albums[album.Name];
|
|
262
|
+
if (folders)
|
|
263
|
+
folders.push(album);
|
|
264
|
+
else
|
|
265
|
+
albums[album.Name] = [album];
|
|
266
|
+
years.add(album.Year);
|
|
267
|
+
if (album.Files) {
|
|
268
|
+
// This required because different albums are collected
|
|
269
|
+
for (let i = 0; i < album.Files.length; i++) {
|
|
270
|
+
album.Files[i].Url = album.Url + album.Files[i].Url;
|
|
271
|
+
}
|
|
272
|
+
album.Url = "";
|
|
273
|
+
}
|
|
274
|
+
}
|
|
266
275
|
}
|
|
267
276
|
//# sourceMappingURL=locationHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locationHelper.js","sourceRoot":"","sources":["../src/locationHelper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"locationHelper.js","sourceRoot":"","sources":["../src/locationHelper.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
function getClass(folder: IMediaFolder): string[] {
|
|
89
89
|
let classes: string[] = [];
|
|
90
90
|
if (folder.CreatorIdx >= 0) {
|
|
91
|
-
const pictureLocations = mediaService.medialists["Picture.
|
|
91
|
+
const pictureLocations = mediaService.medialists["Picture.Location"];
|
|
92
92
|
if (folder.altColor) {
|
|
93
93
|
if (appConfig.theme === 'dark')
|
|
94
94
|
classes.push('altColorDark');
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
classes.push('italic');
|
|
100
100
|
classes.push('bold');
|
|
101
101
|
}
|
|
102
|
-
else if (pictureLocations[folder.CreatorIdx]
|
|
102
|
+
else if (pictureLocations.Parents![folder.CreatorIdx] < 0) {
|
|
103
103
|
classes.push('bold');
|
|
104
104
|
}
|
|
105
105
|
}
|
|
@@ -109,9 +109,11 @@
|
|
|
109
109
|
if (showAlbums.value)
|
|
110
110
|
showPictures(folder);
|
|
111
111
|
else {
|
|
112
|
-
|
|
113
|
-
if (folder.mustExpand)
|
|
112
|
+
if (folder.mustExpand) {
|
|
114
113
|
LocationHelper.expandLocationFolder(mediaService, selected.selected, folder);
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
window.history.pushState({ noBackExitsApp: true }, '');
|
|
115
117
|
setSelected(folder);
|
|
116
118
|
}
|
|
117
119
|
}
|
|
@@ -262,11 +264,11 @@
|
|
|
262
264
|
<style scoped>
|
|
263
265
|
.italic {
|
|
264
266
|
font-style: italic;
|
|
265
|
-
font-weight:
|
|
267
|
+
font-weight: bolder;
|
|
266
268
|
}
|
|
267
269
|
|
|
268
270
|
.bold {
|
|
269
|
-
font-weight:
|
|
271
|
+
font-weight: bolder;
|
|
270
272
|
}
|
|
271
273
|
|
|
272
274
|
.altColorDark {
|