mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 04:44:37 +03:00
Restructure data layer (#2532)
* Add new txn manager interface * Add txn management to sqlite * Rename get to getByID * Add contexts to repository methods * Update query builders * Add context to reader writer interfaces * Use repository in resolver * Tighten interfaces * Tighten interfaces in dlna * Tighten interfaces in match package * Tighten interfaces in scraper package * Tighten interfaces in scan code * Tighten interfaces on autotag package * Remove ReaderWriter usage * Merge database package into sqlite
This commit is contained in:
@@ -18,16 +18,14 @@ type stashScraper struct {
|
||||
config config
|
||||
globalConfig GlobalConfig
|
||||
client *http.Client
|
||||
txnManager models.TransactionManager
|
||||
}
|
||||
|
||||
func newStashScraper(scraper scraperTypeConfig, client *http.Client, txnManager models.TransactionManager, config config, globalConfig GlobalConfig) *stashScraper {
|
||||
func newStashScraper(scraper scraperTypeConfig, client *http.Client, config config, globalConfig GlobalConfig) *stashScraper {
|
||||
return &stashScraper{
|
||||
scraper: scraper,
|
||||
config: config,
|
||||
client: client,
|
||||
globalConfig: globalConfig,
|
||||
txnManager: txnManager,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -308,18 +306,6 @@ func (s *stashScraper) scrapeByURL(_ context.Context, _ string, _ ScrapeContentT
|
||||
return nil, ErrNotSupported
|
||||
}
|
||||
|
||||
func getScene(ctx context.Context, sceneID int, txnManager models.TransactionManager) (*models.Scene, error) {
|
||||
var ret *models.Scene
|
||||
if err := txnManager.WithReadTxn(ctx, func(r models.ReaderRepository) error {
|
||||
var err error
|
||||
ret, err = r.Scene().Find(sceneID)
|
||||
return err
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func sceneToUpdateInput(scene *models.Scene) models.SceneUpdateInput {
|
||||
toStringPtr := func(s sql.NullString) *string {
|
||||
if s.Valid {
|
||||
@@ -346,18 +332,6 @@ func sceneToUpdateInput(scene *models.Scene) models.SceneUpdateInput {
|
||||
}
|
||||
}
|
||||
|
||||
func getGallery(ctx context.Context, galleryID int, txnManager models.TransactionManager) (*models.Gallery, error) {
|
||||
var ret *models.Gallery
|
||||
if err := txnManager.WithReadTxn(ctx, func(r models.ReaderRepository) error {
|
||||
var err error
|
||||
ret, err = r.Gallery().Find(galleryID)
|
||||
return err
|
||||
}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
func galleryToUpdateInput(gallery *models.Gallery) models.GalleryUpdateInput {
|
||||
toStringPtr := func(s sql.NullString) *string {
|
||||
if s.Valid {
|
||||
|
||||
Reference in New Issue
Block a user