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

Restructure go project (#2356)

Browse Source 
* Move main to cmd
* Move api to internal
* Move logger and manager to internal
* Move shell hiding code to separate package
* Decouple job from desktop and utils
* Decouple session from config
* Move static into internal
* Decouple config from dlna
* Move desktop to internal
* Move dlna to internal
* Decouple remaining packages from config
* Move config into internal
* Move jsonschema and paths to models
* Make ffmpeg functions private
* Move file utility methods into fsutil package
* Move symwalk into fsutil
* Move single-use util functions into client package
* Move slice functions to separate packages
* Add env var to suppress windowsgui arg
* Move hash functions into separate package
* Move identify to internal
* Move autotag to internal
* Touch UI when generating backend
This commit is contained in:
WithoutPants
2022-03-17 11:33:59 +11:00
committed by GitHub
parent dcee874f59
commit f69bd8a94f
334 changed files with 1845 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/scraper/postprocessing.go
View File

@@ -6,7 +6,6 @@ import (
"strings"
"github.com/stashapp/stash/pkg/logger"
stash_config "github.com/stashapp/stash/pkg/manager/config"
"github.com/stashapp/stash/pkg/match"
"github.com/stashapp/stash/pkg/models"
)
@@ -51,7 +50,7 @@ func (c Cache) postScrapePerformer(ctx context.Context, p models.ScrapedPerforme
if err := c.txnManager.WithReadTxn(ctx, func(r models.ReaderRepository) error {
tqb := r.Tag()
tags, err := postProcessTags(tqb, p.Tags)
tags, err := postProcessTags(c.globalConfig, tqb, p.Tags)
if err != nil {
return err
}
@@ -94,7 +93,7 @@ func (c Cache) postScrapeScenePerformer(ctx context.Context, p models.ScrapedPer
if err := c.txnManager.WithReadTxn(ctx, func(r models.ReaderRepository) error {
tqb := r.Tag()
tags, err := postProcessTags(tqb, p.Tags)
tags, err := postProcessTags(c.globalConfig, tqb, p.Tags)
if err != nil {
return err
}
@@ -136,7 +135,7 @@ func (c Cache) postScrapeScene(ctx context.Context, scene models.ScrapedScene) (
}
}
tags, err := postProcessTags(tqb, scene.Tags)
tags, err := postProcessTags(c.globalConfig, tqb, scene.Tags)
if err != nil {
return err
}
@@ -175,7 +174,7 @@ func (c Cache) postScrapeGallery(ctx context.Context, g models.ScrapedGallery) (
}
}
tags, err := postProcessTags(tqb, g.Tags)
tags, err := postProcessTags(c.globalConfig, tqb, g.Tags)
if err != nil {
return err
}
@@ -196,10 +195,10 @@ func (c Cache) postScrapeGallery(ctx context.Context, g models.ScrapedGallery) (
return g, nil
}
func postProcessTags(tqb models.TagReader, scrapedTags []*models.ScrapedTag) ([]*models.ScrapedTag, error) {
func postProcessTags(globalConfig GlobalConfig, tqb models.TagReader, scrapedTags []*models.ScrapedTag) ([]*models.ScrapedTag, error) {
var ret []*models.ScrapedTag
excludePatterns := stash_config.GetInstance().GetScraperExcludeTagPatterns()
excludePatterns := globalConfig.GetScraperExcludeTagPatterns()
var excludeRegexps []*regexp.Regexp
for _, excludePattern := range excludePatterns {