Decouple galleries from scenes (#1057)

This commit is contained in:
InfiniteTF
2021-02-01 21:56:54 +01:00
committed by GitHub
parent 86bfb64a0d
commit 4fd022a93b
54 changed files with 952 additions and 755 deletions

View File

@@ -382,15 +382,13 @@ func exportScene(wg *sync.WaitGroup, jobChan <-chan *models.Scene, repo models.R
continue
}
sceneGallery, err := galleryReader.FindBySceneID(s.ID)
galleries, err := galleryReader.FindBySceneID(s.ID)
if err != nil {
logger.Errorf("[scenes] <%s> error getting scene gallery: %s", sceneHash, err.Error())
logger.Errorf("[scenes] <%s> error getting scene gallery checksums: %s", sceneHash, err.Error())
continue
}
if sceneGallery != nil {
newSceneJSON.Gallery = sceneGallery.Checksum
}
newSceneJSON.Galleries = gallery.GetChecksums(galleries)
performers, err := performerReader.FindBySceneID(s.ID)
if err != nil {
@@ -423,9 +421,7 @@ func exportScene(wg *sync.WaitGroup, jobChan <-chan *models.Scene, repo models.R
t.studios.IDs = utils.IntAppendUnique(t.studios.IDs, int(s.StudioID.Int64))
}
if sceneGallery != nil {
t.galleries.IDs = utils.IntAppendUnique(t.galleries.IDs, sceneGallery.ID)
}
t.galleries.IDs = utils.IntAppendUniques(t.galleries.IDs, gallery.GetIDs(galleries))
tagIDs, err := scene.GetDependentTagIDs(tagReader, sceneMarkerReader, s)
if err != nil {