xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

fix bug 1 of #838 : If the tagged video contains only one keyword, the keyword is shown in PiGallery2 character by character, each prefixed by a hash sign, all separated by comma and space

Browse Source
This commit is contained in:
kagahd 2024-02-26 21:37:28 +01:00
parent d1684d4c89
commit 75e4ed70b6
No known key found for this signature in database
GPG Key ID: C7C8777FDE0053DF
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/backend/model/fileaccess/MetadataLoader.ts
View File

@ -135,7 +135,7 @@ export class MetadataLoader {
fullPathWithoutExt + '.xmp', fullPathWithoutExt + '.xmp',
fullPathWithoutExt + '.XMP', fullPathWithoutExt + '.XMP',
]; ];
for (const sidecarPath of sidecarPaths) { for (const sidecarPath of sidecarPaths) {
if (fs.existsSync(sidecarPath)) { if (fs.existsSync(sidecarPath)) {
const sidecarData = await exifr.sidecar(sidecarPath); const sidecarData = await exifr.sidecar(sidecarPath);
@ -144,11 +144,16 @@ export class MetadataLoader {
if (metadata.keywords === undefined) { if (metadata.keywords === undefined) {
metadata.keywords = []; metadata.keywords = [];
} }
for (const kw of (sidecarData as SideCar).dc.subject) { let keywords = (sidecarData as SideCar).dc.subject || [];
if (typeof keywords === 'string') {
keywords = [keywords];
}
for (const kw of keywords) {
if (metadata.keywords.indexOf(kw) === -1) { if (metadata.keywords.indexOf(kw) === -1) {
metadata.keywords.push(kw); metadata.keywords.push(kw);
} }
} } }
}
if ((sidecarData as SideCar).xmp.Rating !== undefined) { if ((sidecarData as SideCar).xmp.Rating !== undefined) {
metadata.rating = (sidecarData as SideCar).xmp.Rating; metadata.rating = (sidecarData as SideCar).xmp.Rating;
} }
@ -305,7 +310,7 @@ export class MetadataLoader {
} }
} catch (err) { } catch (err) {
Logger.debug(LOG_TAG, 'Error parsing exif', fullPath, err); Logger.debug(LOG_TAG, 'Error parsing exif', fullPath, err);
try { try {
const info = imageSize(fullPath); const info = imageSize(fullPath);
metadata.size = {width: info.width, height: info.height}; metadata.size = {width: info.width, height: info.height};
} catch (e) { } catch (e) {
@ -368,9 +373,9 @@ export class MetadataLoader {
gps: true, gps: true,
translateValues: false, //don't translate orientation from numbers to strings etc. translateValues: false, //don't translate orientation from numbers to strings etc.
mergeOutput: false //don't merge output, because things like Microsoft Rating (percent) and xmp.rating will be merged mergeOutput: false //don't merge output, because things like Microsoft Rating (percent) and xmp.rating will be merged
}; };
const exif = await exifr.parse(data, exifrOptions); const exif = await exifr.parse(data, exifrOptions);
if (exif.xmp && exif.xmp.Rating) { if (exif.xmp && exif.xmp.Rating) {
metadata.rating = exif.xmp.Rating; metadata.rating = exif.xmp.Rating;
if (metadata.rating < 0) { if (metadata.rating < 0) {
@ -378,18 +383,18 @@ export class MetadataLoader {
} }
} }
if (exif.dc && if (exif.dc &&
exif.dc.subject && exif.dc.subject &&
exif.dc.subject.length > 0) { exif.dc.subject.length > 0) {
const subj = Array.isArray(exif.dc.subject) ? exif.dc.subject : [exif.dc.subject]; const subj = Array.isArray(exif.dc.subject) ? exif.dc.subject : [exif.dc.subject];
if (metadata.keywords === undefined) { if (metadata.keywords === undefined) {
metadata.keywords = []; metadata.keywords = [];
} }
for (const kw of subj) { for (const kw of subj) {
if (metadata.keywords.indexOf(kw) === -1) { if (metadata.keywords.indexOf(kw) === -1) {
metadata.keywords.push(kw); metadata.keywords.push(kw);
} }
} }
} }
let orientation = OrientationTypes.TOP_LEFT; let orientation = OrientationTypes.TOP_LEFT;
if (exif.ifd0 && if (exif.ifd0 &&
exif.ifd0.Orientation) { exif.ifd0.Orientation) {
@ -536,7 +541,11 @@ export class MetadataLoader {
if (metadata.keywords === undefined) { if (metadata.keywords === undefined) {
metadata.keywords = []; metadata.keywords = [];
} }
for (const kw of (sidecarData as SideCar).dc.subject) { let keywords = (sidecarData as SideCar).dc.subject || [];
if (typeof keywords === 'string') {
keywords = [keywords];
}
for (const kw of keywords) {
if (metadata.keywords.indexOf(kw) === -1) { if (metadata.keywords.indexOf(kw) === -1) {
metadata.keywords.push(kw); metadata.keywords.push(kw);
} }