mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Update external exif parser method 

Exiftool meta data parsed as intergers and not strings. Keep internal
exif parsing functionality.

Signed-off-by: Kjeldgaard <Kjeldgaard@users.noreply.github.com>
This commit is contained in:
Kjeldgaard 2021-03-28 23:52:51 +02:00
parent 7b5305579b
commit 1193222f92
6 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/graphql/generated.go
View File

@ -1889,7 +1889,7 @@ type MediaEXIF {
"The focal length of the lens, when the image was taken"
focalLength: Float
"A formatted description of the flash settings, when the image was taken"
flash: String
flash: Int
"An index describing the mode for adjusting the exposure of the image"
exposureProgram: Int
}
@ -4584,9 +4584,9 @@ func (ec *executionContext) _MediaEXIF_flash(ctx context.Context, field graphql.
if resTmp == nil {
return graphql.Null
}
res := resTmp.(*string)
res := resTmp.(*int64)
fc.Result = res
return ec.marshalOString2ᚖstring(ctx, field.Selections, res)
return ec.marshalOInt2ᚖint64(ctx, field.Selections, res)
}
func (ec *executionContext) _MediaEXIF_exposureProgram(ctx context.Context, field graphql.CollectedField, obj *models.MediaEXIF) (ret graphql.Marshaler) {

2
api/graphql/models/media_exif.go
View File

@ -14,7 +14,7 @@ type MediaEXIF struct {
Aperture *float64
Iso *int64
FocalLength *float64
Flash *string
Flash *int64
Orientation *int64
ExposureProgram *int64
GPSLatitude *float64

2
api/graphql/schema.graphql
View File

@ -312,7 +312,7 @@ type MediaEXIF {
"The focal length of the lens, when the image was taken"
focalLength: Float
"A formatted description of the flash settings, when the image was taken"
flash: String
flash: Int
"An index describing the mode for adjusting the exposure of the image"
exposureProgram: Int
}

72
api/scanner/exif/exif_parser_external.go
View File

@ -14,10 +14,8 @@ type externalExifParser struct{}
func (p *externalExifParser) ParseExif(media *models.Media) (returnExif *models.MediaEXIF, returnErr error) {
// Init ExifTool
et2 := exiftool.Charset("-n")
et, err := .NewExiftool(et2)
extraInitArgs := []string{"-n"}
et, err := exiftool.NewExiftool(exiftool.AddInitArgs(extraInitArgs))
if err != nil {
log.Printf("Error initializing ExifTool: %s\n", err)
return nil, err
@ -99,9 +97,9 @@ func (p *externalExifParser) ParseExif(media *models.Media) (returnExif *models.
}
// Get flash info
flash, err := fileInfo.GetString("Flash")
flash, err := fileInfo.GetInt("Flash")
if err == nil {
log.Printf("Flash: %s", flash)
log.Printf("Flash: %d", flash)
newExif.Flash = &flash
}
@ -113,71 +111,27 @@ func (p *externalExifParser) ParseExif(media *models.Media) (returnExif *models.
}
// Get exposure program
expProgram, err := fileInfo.GetStrings("ExposureProgram")
expProgram, err := fileInfo.GetInt("ExposureProgram")
if err == nil {
for _, value := range expProgram {
log.Printf("%s", value)
}
//log.Printf("Exposure Program: %d", expProgram)
log.Printf("Exposure Program: %d", expProgram)
newExif.ExposureProgram = &expProgram
}
// GPS coordinates - longitude
longitudeRaw, err := fileInfo.GetString("GPSLongitude")
longitudeRaw, err := fileInfo.GetFloat("GPSLongitude")
if err == nil {
log.Printf("GPS longitude: %s", longitudeRaw)
value, err := ConvertCoodinateToFloat(longitudeRaw)
if err == nil {
newExif.GPSLongitude = &value
}
log.Printf("GPS longitude: %f", longitudeRaw)
newExif.GPSLongitude = &longitudeRaw
}
// GPS coordinates - latitude
latitudeRaw, err := fileInfo.GetString("GPSLatitude")
latitudeRaw, err := fileInfo.GetFloat("GPSLatitude")
if err == nil {
log.Printf("GPS latitude: %s", latitudeRaw)
value, err := ConvertCoodinateToFloat(latitudeRaw)
if err == nil {
newExif.GPSLatitude = &value
}
log.Printf("GPS latitude: %f", latitudeRaw)
newExif.GPSLatitude = &latitudeRaw
}
}
returnExif = &newExif
return
}
func ConvertCoodinateToFloat(coordinate string) (value float64, err error) {
reg, err := regexp.Compile("[0-9.]+")
if err != nil {
return 0, err
}
coordinateStr := reg.FindAllString(coordinate, -1)
log.Printf("GPS: %s length: %d\n", coordinateStr, len(coordinateStr))
if len(coordinateStr) != 3 {
return 0, err
}
deg, err := strconv.ParseFloat(coordinateStr[0], 64)
if err != nil {
return 0, err
}
minute, err := strconv.ParseFloat(coordinateStr[1], 64)
if err != nil {
return 0, err
}
second, err := strconv.ParseFloat(coordinateStr[2], 64)
if err != nil {
return 0, err
}
var multiplier float64 = 1
if deg < 0 {
multiplier = -1
}
value = (deg + minute / 60 + second / 3600) * multiplier
return value, nil
}

5
api/scanner/exif/exif_parser_internal.go
View File

@ -106,9 +106,10 @@ func (p *internalExifParser) ParseExif(media *models.Media) (returnExif *models.
}
}
flash, err := exifTags.Flash()
flash, err := p.readIntegerTag(exifTags, exif.Flash, media)
if err == nil {
newExif.Flash = &flash
flash64 := int64(*flash)
newExif.Flash = &flash64
}
orientation, err := p.readIntegerTag(exifTags, exif.Orientation, media)

51
ui/src/components/sidebar/MediaSidebar.js
View File

@ -148,6 +148,49 @@ const exposurePrograms = {
9: 'Bulb',
}
// From https://exiftool.org/TagNames/EXIF.html#Flash
const flash = {
0x0: 'No Flash',
0x1: 'Fired',
0x5: 'Fired, Return not detected',
0x7: 'Fired, Return detected',
0x8: 'On, Did not fire',
0x9: 'On, Fired',
0xd: 'On, Return not detected',
0xf: 'On, Return detected',
0x10: 'Off, Did not fire',
0x14: 'Off, Did not fire, Return not detected',
0x18: 'Auto, Did not fire',
0x19: 'Auto, Fired',
0x1d: 'Auto, Fired, Return not detected',
0x1f: 'Auto, Fired, Return detected',
0x20: 'No flash function',
0x30: 'Off, No flash function',
0x41: 'Fired, Red-eye reduction',
0x45: 'Fired, Red-eye reduction, Return not detected',
0x47: 'Fired, Red-eye reduction, Return detected',
0x49: 'On, Red-eye reduction',
0x4d: 'On, Red-eye reduction, Return not detected',
0x4f: 'On, Red-eye reduction, Return detected',
0x50: 'Off, Red-eye reduction',
0x58: 'Auto, Did not fire, Red-eye reduction',
0x59: 'Auto, Fired, Red-eye reduction',
0x5d: 'Auto, Fired, Red-eye reduction, Return not detected',
0x5f: 'Auto, Fired, Red-eye reduction, Return detected',
}
// From https://exiftool.org/TagNames/EXIF.html
const orientation = {
1: 'Horizontal (normal)',
2: 'Mirror horizontal',
3: 'Rotate 180',
4: 'Mirror vertical',
5: 'Mirror horizontal and rotate 270 CW',
6: 'Rotate 90 CW',
7: 'Mirror horizontal and rotate 90 CW',
8: 'Rotate 270 CW',
}
const SidebarContent = ({ media, hidePreview }) => {
let exifItems = []
@ -165,7 +208,9 @@ const SidebarContent = ({ media, hidePreview }) => {
)
exif.dateShot = new Date(exif.dateShot).toLocaleString()
if (exif.exposureProgram) {
if (exposurePrograms.hasOwnProperty(exif.exposureProgram))
{
exif.exposureProgram = exposurePrograms[exif.exposureProgram]
}
@ -177,6 +222,10 @@ const SidebarContent = ({ media, hidePreview }) => {
exif.focalLength = `${exif.focalLength}mm`
}
if (flash.hasOwnProperty(exif.flash)) {
exif.flash = flash[exif.flash]
}
exifItems = exifKeys.map(key => (
<SidebarItem key={key} name={exifNameLookup[key]} value={exif[key]} />
))