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

gps coordinate undefined check + rating update

Browse Source
This commit is contained in:
gras 2024-03-30 15:31:16 +01:00
parent a8b00d549b
commit 9e7acc46c1
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,8 +462,12 @@ export class MetadataLoader {
metadata.positionData.GPSData.longitude = Utils.isFloat32(exif.gps?.longitude) ? exif.gps.longitude : Utils.xmpExifGpsCoordinateToDecimalDegrees(exif.exif.GPSLongitude); metadata.positionData.GPSData.longitude = Utils.isFloat32(exif.gps?.longitude) ? exif.gps.longitude : Utils.xmpExifGpsCoordinateToDecimalDegrees(exif.exif.GPSLongitude);
metadata.positionData.GPSData.latitude = Utils.isFloat32(exif.gps?.latitude) ? exif.gps.latitude : Utils.xmpExifGpsCoordinateToDecimalDegrees(exif.exif.GPSLatitude); metadata.positionData.GPSData.latitude = Utils.isFloat32(exif.gps?.latitude) ? exif.gps.latitude : Utils.xmpExifGpsCoordinateToDecimalDegrees(exif.exif.GPSLatitude);
metadata.positionData.GPSData.longitude = parseFloat(metadata.positionData.GPSData.longitude.toFixed(6)) if (metadata.positionData.GPSData.longitude !== undefined) {
metadata.positionData.GPSData.latitude = parseFloat(metadata.positionData.GPSData.latitude.toFixed(6)) metadata.positionData.GPSData.longitude = parseFloat(metadata.positionData.GPSData.longitude.toFixed(6))
}
if (metadata.positionData.GPSData.latitude !== undefined) {
metadata.positionData.GPSData.latitude = parseFloat(metadata.positionData.GPSData.latitude.toFixed(6))
}
} }
} catch (err) { } catch (err) {
Logger.error(LOG_TAG, 'Error during reading of GPS data: ' + err); Logger.error(LOG_TAG, 'Error during reading of GPS data: ' + err);
@ -511,6 +515,15 @@ export class MetadataLoader {
exif.xmp.Rating !== undefined) { exif.xmp.Rating !== undefined) {
metadata.rating = exif.xmp.Rating; metadata.rating = exif.xmp.Rating;
} }
if (metadata.rating !== undefined) {
if (metadata.rating < -1) { //Rating -1 means "rejected" according to adobe's spec
metadata.rating = -1;
} else if (metadata.rating > 5) {
metadata.rating = 5;
}
} //else {
//metadata.rating = 0; //Rating 0 means "unrated" according to adobe's spec
//}
} }
private static mapFaces(metadata: PhotoMetadata, exif: any, orientation: number) { private static mapFaces(metadata: PhotoMetadata, exif: any, orientation: number) {

2
src/common/entities/MediaDTO.ts
View File

@ -11,7 +11,7 @@ export interface MediaDTO extends FileDTO {
missingThumbnails?: number; missingThumbnails?: number;
} }
export type RatingTypes = 0 | 1 | 2 | 3 | 4 | 5; export type RatingTypes = -1 | 0 | 1 | 2 | 3 | 4 | 5;
export interface MediaMetadata { export interface MediaMetadata {
size: MediaDimension; size: MediaDimension;