Gallery URLs (#4114)

* Initial backend changes
* Fix unit tests
* UI changes
* Fix missing URL filters
This commit is contained in:
WithoutPants
2023-09-25 12:27:20 +10:00
committed by GitHub
parent a369e395e7
commit 9577600804
29 changed files with 361 additions and 117 deletions

View File

@@ -14,7 +14,7 @@ import (
func ToBasicJSON(gallery *models.Gallery) (*jsonschema.Gallery, error) {
newGalleryJSON := jsonschema.Gallery{
Title: gallery.Title,
URL: gallery.URL,
URLs: gallery.URLs.List(),
Details: gallery.Details,
CreatedAt: json.JSONTime{Time: gallery.CreatedAt},
UpdatedAt: json.JSONTime{Time: gallery.UpdatedAt},

View File

@@ -59,7 +59,7 @@ func createFullGallery(id int) models.Gallery {
Details: details,
Rating: &rating,
Organized: organized,
URL: url,
URLs: models.NewRelatedStrings([]string{url}),
CreatedAt: createTime,
UpdatedAt: updateTime,
}
@@ -85,7 +85,7 @@ func createFullJSONGallery() *jsonschema.Gallery {
Details: details,
Rating: rating,
Organized: organized,
URL: url,
URLs: []string{url},
ZipFiles: []string{path},
CreatedAt: json.JSONTime{
Time: createTime,

View File

@@ -65,8 +65,10 @@ func (i *Importer) galleryJSONToGallery(galleryJSON jsonschema.Gallery) models.G
if galleryJSON.Details != "" {
newGallery.Details = galleryJSON.Details
}
if galleryJSON.URL != "" {
newGallery.URL = galleryJSON.URL
if len(galleryJSON.URLs) > 0 {
newGallery.URLs = models.NewRelatedStrings(galleryJSON.URLs)
} else if galleryJSON.URL != "" {
newGallery.URLs = models.NewRelatedStrings([]string{galleryJSON.URL})
}
if galleryJSON.Date != "" {
d, err := models.ParseDate(galleryJSON.Date)

View File

@@ -66,7 +66,7 @@ func TestImporterPreImport(t *testing.T) {
Details: details,
Rating: &rating,
Organized: organized,
URL: url,
URLs: models.NewRelatedStrings([]string{url}),
Files: models.NewRelatedFiles([]models.File{}),
TagIDs: models.NewRelatedIDs([]int{}),
PerformerIDs: models.NewRelatedIDs([]int{}),