mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 04:44:37 +03:00
File storage rewrite (#2676)
* Restructure data layer part 2 (#2599) * Refactor and separate image model * Refactor image query builder * Handle relationships in image query builder * Remove relationship management methods * Refactor gallery model/query builder * Add scenes to gallery model * Convert scene model * Refactor scene models * Remove unused methods * Add unit tests for gallery * Add image tests * Add scene tests * Convert unnecessary scene value pointers to values * Convert unnecessary pointer values to values * Refactor scene partial * Add scene partial tests * Refactor ImagePartial * Add image partial tests * Refactor gallery partial update * Add partial gallery update tests * Use zero/null package for null values * Add files and scan system * Add sqlite implementation for files/folders * Add unit tests for files/folders * Image refactors * Update image data layer * Refactor gallery model and creation * Refactor scene model * Refactor scenes * Don't set title from filename * Allow galleries to freely add/remove images * Add multiple scene file support to graphql and UI * Add multiple file support for images in graphql/UI * Add multiple file for galleries in graphql/UI * Remove use of some deprecated fields * Remove scene path usage * Remove gallery path usage * Remove path from image * Move funscript to video file * Refactor caption detection * Migrate existing data * Add post commit/rollback hook system * Lint. Comment out import/export tests * Add WithDatabase read only wrapper * Prepend tasks to list * Add 32 pre-migration * Add warnings in release and migration notes
This commit is contained in:
@@ -13,11 +13,16 @@ type queryURLParameters map[string]string
|
||||
|
||||
func queryURLParametersFromScene(scene *models.Scene) queryURLParameters {
|
||||
ret := make(queryURLParameters)
|
||||
ret["checksum"] = scene.Checksum.String
|
||||
ret["oshash"] = scene.OSHash.String
|
||||
ret["filename"] = filepath.Base(scene.Path)
|
||||
ret["title"] = scene.Title.String
|
||||
ret["url"] = scene.URL.String
|
||||
ret["checksum"] = scene.Checksum()
|
||||
ret["oshash"] = scene.OSHash()
|
||||
ret["filename"] = filepath.Base(scene.Path())
|
||||
|
||||
if scene.Title != "" {
|
||||
ret["title"] = scene.Title
|
||||
}
|
||||
if scene.URL != "" {
|
||||
ret["url"] = scene.URL
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
@@ -46,13 +51,18 @@ func queryURLParameterFromURL(url string) queryURLParameters {
|
||||
|
||||
func queryURLParametersFromGallery(gallery *models.Gallery) queryURLParameters {
|
||||
ret := make(queryURLParameters)
|
||||
ret["checksum"] = gallery.Checksum
|
||||
ret["checksum"] = gallery.Checksum()
|
||||
|
||||
if gallery.Path.Valid {
|
||||
ret["filename"] = filepath.Base(gallery.Path.String)
|
||||
if gallery.Path() != "" {
|
||||
ret["filename"] = filepath.Base(gallery.Path())
|
||||
}
|
||||
if gallery.Title != "" {
|
||||
ret["title"] = gallery.Title
|
||||
}
|
||||
|
||||
if gallery.URL != "" {
|
||||
ret["url"] = gallery.URL
|
||||
}
|
||||
ret["title"] = gallery.Title.String
|
||||
ret["url"] = gallery.URL.String
|
||||
|
||||
return ret
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user