@@ -249,7 +249,7 @@ func checkMatchedScenes() {
249249
250250// if len(ref.XbvrLinks) == 0 {
251251for _ ,xbvrActor := range xbvrScene .Cast {
252- if strings .EqualFold (strings .TrimSpace (xbvrActor .Name ),strings .TrimSpace (performer .Performer .Name )) {
252+ if strings .EqualFold (strings .TrimSpace (simplifyName ( xbvrActor .Name )) ,strings .TrimSpace (simplifyName ( performer .Performer .Name ) )) {
253253// check if actor already matched
254254exists := false
255255for _ ,link := range ref .XbvrLinks {
@@ -364,7 +364,7 @@ func matchPerformerName(scene models.StashScene, xbvrScene models.Scene, matchLe
364364
365365if ref .ID != 0 && len (ref .XbvrLinks )== 0 {
366366for _ ,xbvrActor := range xbvrScene .Cast {
367- if strings .EqualFold (strings .TrimSpace (xbvrActor .Name ),strings .TrimSpace (performer .Performer .Name )) {
367+ if strings .EqualFold (strings .TrimSpace (simplifyName ( xbvrActor .Name )) ,strings .TrimSpace (simplifyName ( performer .Performer .Name ) )) {
368368xbvrLink := models.ExternalReferenceLink {InternalTable :"actors" ,InternalDbId :xbvrActor .ID ,InternalNameId :xbvrActor .Name ,MatchType :matchLevl ,
369369ExternalReferenceID :ref .ID ,ExternalSource :ref .ExternalSource ,ExternalId :ref .ExternalId }
370370ref .XbvrLinks = append (ref .XbvrLinks ,xbvrLink )
@@ -390,6 +390,13 @@ func matchPerformerName(scene models.StashScene, xbvrScene models.Scene, matchLe
390390
391391}
392392
393+ func simplifyName (name string )string {
394+ name = strings .TrimSpace (name )
395+ name = strings .ReplaceAll (name ," " ,"" )
396+ name = strings .ReplaceAll (name ,"." ,"" )
397+ return strings .ReplaceAll (name ,"-" ,"" )
398+ }
399+
393400// tries to match from stash to xbvr using the aka or aliases from stash
394401func MatchAkaPerformers () {
395402tlog := log .WithField ("task" ,"scrape" )
@@ -434,10 +441,12 @@ func MatchAkaPerformers() {
434441
435442for _ ,aka := range akaList {
436443var scene models.Scene
437- scene .GetIfExistByPK (uint (aka .SceneInternalDbId ))
444+
445+ db .Preload ("Cast" ).Where (& models.Scene {ID :uint (aka .SceneInternalDbId )}).First (& scene )
446+
438447for _ ,actor := range scene .Cast {
439448var extref models.ExternalReference
440- if strings .EqualFold (strings .TrimSpace (actor .Name ),strings .TrimSpace (aka .AkaName )) {
449+ if strings .EqualFold (strings .TrimSpace (simplifyName ( actor .Name )) ,strings .TrimSpace (simplifyName ( aka .AkaName ) )) {
441450extref .FindExternalId ("stashdb performer" ,aka .ActorId )
442451if extref .ID != 0 && len (extref .XbvrLinks )== 0 {
443452xbvrLink := models.ExternalReferenceLink {InternalTable :"actors" ,InternalDbId :actor .ID ,InternalNameId :actor .Name ,MatchType :30 ,
@@ -453,7 +462,7 @@ func MatchAkaPerformers() {
453462var aliases []string
454463json .Unmarshal ([]byte (aka .Aliases ),& aliases )
455464for _ ,alias := range aliases {
456- if len (extref .XbvrLinks )== 0 && strings .EqualFold (strings .TrimSpace (actor .Name ),strings .TrimSpace (alias )) {
465+ if len (extref .XbvrLinks )== 0 && strings .EqualFold (strings .TrimSpace (simplifyName ( actor .Name )) ,strings .TrimSpace (simplifyName ( alias ) )) {
457466extref .FindExternalId ("stashdb performer" ,aka .ActorId )
458467if extref .ID != 0 && len (extref .XbvrLinks )== 0 {
459468xbvrLink := models.ExternalReferenceLink {InternalTable :"actors" ,InternalDbId :actor .ID ,InternalNameId :actor .Name ,MatchType :30 ,
@@ -502,7 +511,7 @@ func ReverseMatch() {
502511var stashSceneData models.StashScene
503512json .Unmarshal ([]byte (stashScene .ExternalData ),& stashSceneData )
504513for _ ,performance := range stashSceneData .Performers {
505- if strings .EqualFold (strings .TrimSpace (actor .Name ),strings .TrimSpace (performance .As )) {
514+ if strings .EqualFold (strings .TrimSpace (simplifyName ( actor .Name )) ,strings .TrimSpace (simplifyName ( performance .As ) )) {
506515var extref models.ExternalReference
507516extref .FindExternalId ("stashdb performer" ,performance .Performer .ID )
508517if extref .ID != 0 {
@@ -520,7 +529,7 @@ func ReverseMatch() {
520529break sceneLoop
521530}
522531for _ ,alias := range performance .Performer .Aliases {
523- if strings .EqualFold (strings .TrimSpace (actor .Name ),strings .TrimSpace (alias )) {
532+ if strings .EqualFold (strings .TrimSpace (simplifyName ( actor .Name )) ,strings .TrimSpace (simplifyName ( alias ) )) {
524533var extref models.ExternalReference
525534extref .FindExternalId ("stashdb performer" ,performance .Performer .ID )
526535if extref .ID != 0 {