Merge branch 'master' into RealVR

xbapps · Jan 17, 2025 · dee71d1 · dee71d1
2 parents f8de4a0 + 9711d20
commit dee71d1
Show file tree

Hide file tree

Showing 23 changed files with 1,820 additions and 45 deletions.
diff --git a/pkg/api/external_references.go b/pkg/api/external_references.go
@@ -49,6 +49,16 @@ func (i ExternalReference) WebService() *restful.WebService {
 
 	ws.Route(ws.GET("/generic/scrape_all").To(i.genericActorScraper).
 		Metadata(restfulspec.KeyOpenAPITags, tags))
+	ws.Route(ws.GET("/stashdb/link2scene/{scene-id}/{stashdb-id}").To(i.linkScene2Stashdb).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(models.Scene{}))
+	ws.Route(ws.GET("/stashdb/search/{scene-id}").To(i.searchForStashdbScene).
+		Metadata(restfulspec.KeyOpenAPITags, tags))
+	ws.Route(ws.GET("/stashdb/link2actor/{actor-id}/{stashdb-id}").To(i.linkActor2Stashdb).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(models.Scene{}))
+	ws.Route(ws.GET("/stashdb/searchactor/{actor-id}").To(i.searchForStashdbActor).
+		Metadata(restfulspec.KeyOpenAPITags, tags))
 
 	ws.Route(ws.POST("/generic/scrape_single").To(i.genericSingleActorScraper).
 		Metadata(restfulspec.KeyOpenAPITags, tags))

diff --git a/pkg/api/options.go b/pkg/api/options.go
@@ -1017,6 +1017,7 @@ func (i ConfigResource) createCustomSite(req *restful.Request, resp *restful.Res
 	scrapers := make(map[string][]config.ScraperConfig)
 	scrapers["povr"] = scraperConfig.CustomScrapers.PovrScrapers
 	scrapers["slr"] = scraperConfig.CustomScrapers.SlrScrapers
+	scrapers["stashdb"] = scraperConfig.CustomScrapers.StashDbScrapers
 	scrapers["vrphub"] = scraperConfig.CustomScrapers.VrphubScrapers
 	scrapers["vrporn"] = scraperConfig.CustomScrapers.VrpornScrapers
 	scrapers["realvr"] = scraperConfig.CustomScrapers.RealVRScrapers
@@ -1041,6 +1042,8 @@ func (i ConfigResource) createCustomSite(req *restful.Request, resp *restful.Res
 			scrapers["povr"] = append(scrapers["povr"], scraper)
 		case "sexlikereal":
 			scrapers["slr"] = append(scrapers["slr"], scraper)
+		case "stashdb":
+			scrapers["stashdb"] = append(scrapers["stashdb"], scraper)
 		case "vrphub":
 			scrapers["vrphub"] = append(scrapers["vrphub"], scraper)
 		case "vrporn":
@@ -1051,6 +1054,7 @@ func (i ConfigResource) createCustomSite(req *restful.Request, resp *restful.Res
 	}
 	scraperConfig.CustomScrapers.PovrScrapers = scrapers["povr"]
 	scraperConfig.CustomScrapers.SlrScrapers = scrapers["slr"]
+	scraperConfig.CustomScrapers.StashDbScrapers = scrapers["stashdb"]
 	scraperConfig.CustomScrapers.VrphubScrapers = scrapers["vrphub"]
 	scraperConfig.CustomScrapers.VrpornScrapers = scrapers["vrporn"]
 	scraperConfig.CustomScrapers.RealVRScrapers = scrapers["realvr"]

diff --git a/pkg/api/scenes.go b/pkg/api/scenes.go
@@ -1029,7 +1029,7 @@ func (i SceneResource) getSceneAlternateSources(req *restful.Request, resp *rest
 		var site models.Site
 
 		if ref.ExternalSource == "stashdb scene" {
-			ressults = append(ressults, ResponseGetAlternateSources{Url: ref.ExternalReference.ExternalURL, Icon: "https://docs.stashapp.cc/favicon.ico", ExternalSource: ref.ExternalReference.ExternalSource, ExternalId: ref.ExternalReference.ExternalId, ExternalData: ref.ExternalReference.ExternalData})
+			ressults = append(ressults, ResponseGetAlternateSources{Url: ref.ExternalReference.ExternalURL, Icon: "https://guidelines.stashdb.org/favicon.ico", ExternalSource: ref.ExternalReference.ExternalSource, ExternalId: ref.ExternalReference.ExternalId, ExternalData: ref.ExternalReference.ExternalData})
 		} else {
 			json.Unmarshal([]byte(ref.ExternalReference.ExternalData), &altscene)
 			site.GetIfExist(altscene.Scene.ScraperId)