Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 12:54:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

File storage rewrite (#2676)

Browse Source 
* 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:
WithoutPants
2022-07-13 16:30:54 +10:00
parent 30877c75fb
commit 5495d72849
359 changed files with 43690 additions and 16000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/scraper/stash.go
View File

@@ -2,7 +2,6 @@ package scraper
import (
"context"
"database/sql"
"fmt"
"net/http"
"strconv"
@@ -230,9 +229,12 @@ func (s *stashScraper) scrapeSceneByScene(ctx context.Context, scene *models.Sce
Oshash *string `graphql:"oshash" json:"oshash"`
}
checksum := scene.Checksum()
oshash := scene.OSHash()
input := SceneHashInput{
Checksum: &scene.Checksum.String,
Oshash: &scene.OSHash.String,
Checksum: &checksum,
Oshash: &oshash,
}
vars := map[string]interface{}{
@@ -280,8 +282,9 @@ func (s *stashScraper) scrapeGalleryByGallery(ctx context.Context, gallery *mode
Checksum *string `graphql:"checksum" json:"checksum"`
}
checksum := gallery.Checksum()
input := GalleryHashInput{
Checksum: &gallery.Checksum,
Checksum: &checksum,
}
vars := map[string]interface{}{
@@ -307,17 +310,10 @@ func (s *stashScraper) scrapeByURL(_ context.Context, _ string, _ ScrapeContentT
}
func sceneToUpdateInput(scene *models.Scene) models.SceneUpdateInput {
toStringPtr := func(s sql.NullString) *string {
if s.Valid {
return &s.String
}
return nil
}
dateToStringPtr := func(s models.SQLiteDate) *string {
if s.Valid {
return &s.String
dateToStringPtr := func(s *models.Date) *string {
if s != nil {
v := s.String()
return &v
}
return nil
@@ -325,25 +321,18 @@ func sceneToUpdateInput(scene *models.Scene) models.SceneUpdateInput {
return models.SceneUpdateInput{
ID: strconv.Itoa(scene.ID),
Title: toStringPtr(scene.Title),
Details: toStringPtr(scene.Details),
URL: toStringPtr(scene.URL),
Title: &scene.Title,
Details: &scene.Details,
URL: &scene.URL,
Date: dateToStringPtr(scene.Date),
}
}
func galleryToUpdateInput(gallery *models.Gallery) models.GalleryUpdateInput {
toStringPtr := func(s sql.NullString) *string {
if s.Valid {
return &s.String
}
return nil
}
dateToStringPtr := func(s models.SQLiteDate) *string {
if s.Valid {
return &s.String
dateToStringPtr := func(s *models.Date) *string {
if s != nil {
v := s.String()
return &v
}
return nil
@@ -351,9 +340,9 @@ func galleryToUpdateInput(gallery *models.Gallery) models.GalleryUpdateInput {
return models.GalleryUpdateInput{
ID: strconv.Itoa(gallery.ID),
Title: toStringPtr(gallery.Title),
Details: toStringPtr(gallery.Details),
URL: toStringPtr(gallery.URL),
Title: &gallery.Title,
Details: &gallery.Details,
URL: &gallery.URL,
Date: dateToStringPtr(gallery.Date),
}
}