Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 04:44:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix inf values causing marshal error (#1607)

Browse Source
This commit is contained in:
WithoutPants
2021-08-03 14:29:57 +10:00
committed by GitHub
parent c7d2ddc5db
commit 8a7577c9bf
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/resolver_model_scene.go
View File

@@ -67,12 +67,12 @@ func (r *sceneResolver) File(ctx context.Context, obj *models.Scene) (*models.Sc
bitrate := int(obj.Bitrate.Int64) bitrate := int(obj.Bitrate.Int64)
return &models.SceneFileType{ return &models.SceneFileType{
Size: &obj.Size.String, Size: &obj.Size.String,
Duration: &obj.Duration.Float64, Duration: handleFloat64(obj.Duration.Float64),
VideoCodec: &obj.VideoCodec.String, VideoCodec: &obj.VideoCodec.String,
AudioCodec: &obj.AudioCodec.String, AudioCodec: &obj.AudioCodec.String,
Width: &width, Width: &width,
Height: &height, Height: &height,
Framerate: &obj.Framerate.Float64, Framerate: handleFloat64(obj.Framerate.Float64),
Bitrate: &bitrate, Bitrate: &bitrate,
}, nil }, nil
} }

12
pkg/api/types.go
View File

@@ -1,7 +1,19 @@
package api package api
import "math"
// An enum https://golang.org/ref/spec#Iota // An enum https://golang.org/ref/spec#Iota
const ( const (
create = iota // 0 create = iota // 0
update = iota // 1 update = iota // 1
) )
// #1572 - Inf and NaN values cause the JSON marshaller to fail
// Return nil for these values
func handleFloat64(v float64) *float64 {
if math.IsInf(v, 0) || math.IsNaN(v) {
return nil
}
return &v
}

1
ui/v2.5/src/components/Changelog/versions/v090.md
View File

@@ -6,6 +6,7 @@
* Added de-DE language option. ([#1578](https://github.com/stashapp/stash/pull/1578)) * Added de-DE language option. ([#1578](https://github.com/stashapp/stash/pull/1578))
### 🐛 Bug fixes ### 🐛 Bug fixes
* Fix infinity framerate values causing resolver error. ([#1607](https://github.com/stashapp/stash/pull/1607))
* Fix unsetting performer gender not working correctly. ([#1606](https://github.com/stashapp/stash/pull/1606)) * Fix unsetting performer gender not working correctly. ([#1606](https://github.com/stashapp/stash/pull/1606))
* Fix is missing date scene criterion causing invalid SQL. ([#1577](https://github.com/stashapp/stash/pull/1577)) * Fix is missing date scene criterion causing invalid SQL. ([#1577](https://github.com/stashapp/stash/pull/1577))
* Fix rendering of carousel images on Apple devices. ([#1562](https://github.com/stashapp/stash/pull/1562)) * Fix rendering of carousel images on Apple devices. ([#1562](https://github.com/stashapp/stash/pull/1562))