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

Movie group renames (#5039)

Browse Source 
* Rename Movie and MoviePartial to Group/GroupPartial
* Rename Movie interfaces
* Update movie url builders to use group
* Rename movieRoutes to groupRoutes
* Update dataloader
* Update names in sqlite package
* Rename in resolvers
* Add GroupByURL to scraper config
* Scraper backward compatibility hacks
This commit is contained in:
WithoutPants
2024-07-04 09:10:26 +10:00
committed by GitHub
parent b69d9cc840
commit 15a7b8a859
83 changed files with 1765 additions and 1646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/scraper/config.go
View File

@@ -45,8 +45,9 @@ type config struct {
// Configuration for querying a gallery by a URL
GalleryByURL []*scrapeByURLConfig `yaml:"galleryByURL"`
// Configuration for querying a movie by a URL
// Configuration for querying a movie by a URL - deprecated, use GroupByURL
MovieByURL []*scrapeByURLConfig `yaml:"movieByURL"`
GroupByURL []*scrapeByURLConfig `yaml:"groupByURL"`
// Scraper debugging options
DebugOptions *scraperDebugOptions `yaml:"debug"`
@@ -99,7 +100,11 @@ func (c config) validate() error {
}
}
for _, s := range c.MovieByURL {
if len(c.MovieByURL) > 0 && len(c.GroupByURL) > 0 {
return errors.New("movieByURL disallowed if groupByURL is present")
}
for _, s := range append(c.MovieByURL, c.GroupByURL...) {
if err := s.validate(); err != nil {
return err
}
@@ -289,17 +294,17 @@ func (c config) spec() Scraper {
ret.Gallery = &gallery
}
movie := ScraperSpec{}
if len(c.MovieByURL) > 0 {
movie.SupportedScrapes = append(movie.SupportedScrapes, ScrapeTypeURL)
for _, v := range c.MovieByURL {
movie.Urls = append(movie.Urls, v.URL...)
group := ScraperSpec{}
if len(c.MovieByURL) > 0 || len(c.GroupByURL) > 0 {
group.SupportedScrapes = append(group.SupportedScrapes, ScrapeTypeURL)
for _, v := range append(c.MovieByURL, c.GroupByURL...) {
group.Urls = append(group.Urls, v.URL...)
}
}
if len(movie.SupportedScrapes) > 0 {
ret.Movie = &movie
ret.Group = &movie
if len(group.SupportedScrapes) > 0 {
ret.Movie = &group
ret.Group = &group
}
return ret
@@ -314,7 +319,7 @@ func (c config) supports(ty ScrapeContentType) bool {
case ScrapeContentTypeGallery:
return c.GalleryByFragment != nil || len(c.GalleryByURL) > 0
case ScrapeContentTypeMovie, ScrapeContentTypeGroup:
return len(c.MovieByURL) > 0
return len(c.MovieByURL) > 0 || len(c.GroupByURL) > 0
}
panic("Unhandled ScrapeContentType")