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 conversion of multi word stash-box enums (#2191)

Browse Source
This commit is contained in:
InfiniteTF
2022-01-04 02:55:45 +01:00
committed by GitHub
parent a2bfa9ee79
commit bd784cdf96
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/scraper/stashbox/stash_box.go
View File

@@ -468,7 +468,7 @@ func findURL(urls []*graphql.URLFragment, urlType string) *string {
func enumToStringPtr(e fmt.Stringer, titleCase bool) *string { func enumToStringPtr(e fmt.Stringer, titleCase bool) *string {
if e != nil { if e != nil {
ret := e.String() ret := strings.ReplaceAll(e.String(), "_", " ")
if titleCase { if titleCase {
ret = strings.Title(strings.ToLower(ret)) ret = strings.Title(strings.ToLower(ret))
} }
@@ -478,6 +478,28 @@ func enumToStringPtr(e fmt.Stringer, titleCase bool) *string {
return nil return nil
} }
func translateGender(gender *graphql.GenderEnum) *string {
var res models.GenderEnum
switch *gender {
case graphql.GenderEnumMale:
res = models.GenderEnumMale
case graphql.GenderEnumFemale:
res = models.GenderEnumFemale
case graphql.GenderEnumIntersex:
res = models.GenderEnumIntersex
case graphql.GenderEnumTransgenderFemale:
res = models.GenderEnumTransgenderFemale
case graphql.GenderEnumTransgenderMale:
res = models.GenderEnumTransgenderMale
}
if res != "" {
strVal := res.String()
return &strVal
}
return nil
}
func formatMeasurements(m graphql.MeasurementsFragment) *string { func formatMeasurements(m graphql.MeasurementsFragment) *string {
if m.BandSize != nil && m.CupSize != nil && m.Hip != nil && m.Waist != nil { if m.BandSize != nil && m.CupSize != nil && m.Hip != nil && m.Waist != nil {
ret := fmt.Sprintf("%d%s-%d-%d", *m.BandSize, *m.CupSize, *m.Waist, *m.Hip) ret := fmt.Sprintf("%d%s-%d-%d", *m.BandSize, *m.CupSize, *m.Waist, *m.Hip)
@@ -587,7 +609,7 @@ func performerFragmentToScrapedScenePerformer(p graphql.PerformerFragment) *mode
} }
if p.Gender != nil { if p.Gender != nil {
sp.Gender = enumToStringPtr(p.Gender, false) sp.Gender = translateGender(p.Gender)
} }
if p.Ethnicity != nil { if p.Ethnicity != nil {

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

@@ -1,4 +1,5 @@
### 🐛 Bug fixes ### 🐛 Bug fixes
* Fix stash-box scraping including underscores in ethnicity. ([#2191](https://github.com/stashapp/stash/pull/2191))
* Fix stash-box batch performer task not setting birthdate. ([#2189](https://github.com/stashapp/stash/pull/2189)) * Fix stash-box batch performer task not setting birthdate. ([#2189](https://github.com/stashapp/stash/pull/2189))
* Fix error when scanning symlinks. ([#2196](https://github.com/stashapp/stash/issues/2196)) * Fix error when scanning symlinks. ([#2196](https://github.com/stashapp/stash/issues/2196))
* Fix timezone issue with Created/Updated dates in scene/image/gallery details pages. ([#2190](https://github.com/stashapp/stash/pull/2190)) * Fix timezone issue with Created/Updated dates in scene/image/gallery details pages. ([#2190](https://github.com/stashapp/stash/pull/2190))