xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

Refactor sidecar loading into async-await

Browse Source 
Refactoring to async/await to solve race condition, also resolves error sometimes occuring with undefined values and resolves overwrite of xmp values.

xmp for image file has tag removed to validate additive tagging from both file xmp and sidecar xmp data.
This commit is contained in:
Graham Alderson 2023-11-30 13:13:33 +12:00
parent ed811a051d
commit 676a3b054b
2 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demo/images/IMG_5910.jpg.xmp
View File

@ -190,7 +190,6 @@
<dc:subject>
<rdf:Bag>
<rdf:li>Alvin the Squirrel</rdf:li>
<rdf:li>Berkley</rdf:li>
<rdf:li>USA</rdf:li>
<rdf:li>test</rdf:li>
</rdf:Bag>

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

@ -23,7 +23,7 @@ export class MetadataLoader {
@ExtensionDecorator(e=>e.gallery.MetadataLoader.loadVideoMetadata)
public static loadVideoMetadata(fullPath: string): Promise<VideoMetadata> {
return new Promise<VideoMetadata>((resolve) => {
return new Promise<VideoMetadata>(async (resolve) => {
const metadata: VideoMetadata = {
size: {
width: 1,
@ -38,21 +38,24 @@ export class MetadataLoader {
try {
// search for sidecar and merge metadata
const fullPathWithoutExt = path.parse(fullPath).name;
const fullPathWithoutExt = await path.parse(fullPath).name;
const sidecarPaths = [
fullPath + '.xmp',
fullPath + '.XMP',
fullPathWithoutExt + '.xmp',
fullPathWithoutExt + '.XMP',
];
for (const sidecarPath of sidecarPaths) {
if (fs.existsSync(sidecarPath)) {
const sidecarData = exifr.sidecar(sidecarPath);
sidecarData.then((response) => {
metadata.keywords = [(response as any).dc.subject].flat();
metadata.rating = (response as any).xmp.Rating;
});
const sidecarData = await exifr.sidecar(sidecarPath);
if (sidecarData !== undefined) {
if ((sidecarData as any).dc.subject !== undefined) {
metadata.keywords = (sidecarData as any).dc.subject.flat();
}
if ((sidecarData as any).xmp.Rating !== undefined) {
metadata.rating = (sidecarData as any).xmp.Rating;
}
}
}
}
} catch (err) {
@ -159,18 +162,46 @@ export class MetadataLoader {
@ExtensionDecorator(e=>e.gallery.MetadataLoader.loadPhotoMetadata)
public static loadPhotoMetadata(fullPath: string): Promise<PhotoMetadata> {
return new Promise<PhotoMetadata>((resolve, reject) => {
return new Promise<PhotoMetadata>(async (resolve, reject) => {
const metadata: PhotoMetadata = {
size: {width: 1, height: 1},
creationDate: 0,
fileSize: 0,
};
try {
// search for sidecar and merge metadata
const fullPathWithoutExt = await path.parse(fullPath).name;
const sidecarPaths = [
fullPath + '.xmp',
fullPath + '.XMP',
fullPathWithoutExt + '.xmp',
fullPathWithoutExt + '.XMP',
];
for (const sidecarPath of sidecarPaths) {
if (fs.existsSync(sidecarPath)) {
const sidecarData = await exifr.sidecar(sidecarPath);
if (sidecarData !== undefined) {
if ((sidecarData as any).dc.subject !== undefined) {
metadata.keywords = (sidecarData as any).dc.subject.flat();
}
if ((sidecarData as any).xmp.Rating !== undefined) {
metadata.rating = (sidecarData as any).xmp.Rating;
}
}
}
}
} catch (err) {
// ignoring errors
}
try {
const fd = fs.openSync(fullPath, 'r');
const data = Buffer.allocUnsafe(Config.Media.photoMetadataSize);
fs.read(fd, data, 0, Config.Media.photoMetadataSize, 0, (err) => {
fs.closeSync(fd);
const metadata: PhotoMetadata = {
size: {width: 1, height: 1},
creationDate: 0,
fileSize: 0,
};
if (err) {
Logger.error(LOG_TAG, 'Error during reading photo: ' + fullPath);
console.error(err);
@ -185,29 +216,6 @@ export class MetadataLoader {
// ignoring errors
}
try {
// search for sidecar and merge metadata
const fullPathWithoutExt = path.parse(fullPath).name;
const sidecarPaths = [
fullPath + '.xmp',
fullPath + '.XMP',
fullPathWithoutExt + '.xmp',
fullPathWithoutExt + '.XMP',
];
for (const sidecarPath of sidecarPaths) {
if (fs.existsSync(sidecarPath)) {
const sidecarData = exifr.sidecar(sidecarPath);
sidecarData.then((response) => {
metadata.keywords = [(response as any).dc.subject].flat();
metadata.rating = (response as any).xmp.Rating;
});
}
}
} catch (err) {
// ignoring errors
}
try {
const exif = ExifParserFactory.create(data).parse();
if (
@ -343,7 +351,9 @@ export class MetadataLoader {
metadata.caption = iptcData.caption.replace(/\0/g, '').trim();
}
if (Array.isArray(iptcData.keywords)) {
metadata.keywords = iptcData.keywords;
if (metadata.keywords === undefined) {
metadata.keywords = iptcData.keywords;
}
}
if (iptcData.date_time) {
@ -363,9 +373,11 @@ export class MetadataLoader {
// and keep the minimum amount only
const exif: ExifReader.Tags & ExifReader.XmpTags & ExifReader.IccTags = ExifReader.load(data);
if (exif.Rating) {
metadata.rating = parseInt(exif.Rating.value as string, 10) as 0 | 1 | 2 | 3 | 4 | 5;
if (metadata.rating < 0) {
metadata.rating = 0;
if (metadata.rating === undefined) {
metadata.rating = parseInt(exif.Rating.value as string, 10) as 0 | 1 | 2 | 3 | 4 | 5;
if (metadata.rating < 0) {
metadata.rating = 0;
}
}
}
if (