Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unify scrape refactor #1630

Merged
merged 19 commits into from
Sep 7, 2021
Merged

Unify scrape refactor #1630

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e1e8a21
Unify scraped types
WithoutPants Aug 6, 2021
7687360
Make name fields optional
WithoutPants Aug 9, 2021
3a54bfe
Unify single scrape queries
WithoutPants Aug 10, 2021
529989b
Change UI to use new interfaces
WithoutPants Aug 10, 2021
46c046d
Add multi scrape interfaces
WithoutPants Aug 10, 2021
86e9731
Merge remote-tracking branch 'upstream/develop' into unify-scrape
WithoutPants Aug 10, 2021
991ede8
Fix merge error
WithoutPants Aug 10, 2021
697b71a
Merge remote-tracking branch 'upstream/develop' into unify-scrape
WithoutPants Aug 18, 2021
257955d
Use images instead of image
WithoutPants Aug 18, 2021
ec2f293
Fix fingerprint count message
WithoutPants Aug 18, 2021
f6631f8
Correct deprecation directives
WithoutPants Aug 18, 2021
0ae5ab4
Review changes
WithoutPants Aug 18, 2021
381dee2
Fix studio edit bug
WithoutPants Aug 20, 2021
d2d3879
Fix setting scraped performer image
WithoutPants Aug 20, 2021
0da058a
Merge remote-tracking branch 'upstream/develop' into unify-scrape
WithoutPants Aug 24, 2021
b8decf5
Fix phash stash-box matching
WithoutPants Aug 25, 2021
c8f266c
Merge remote-tracking branch 'upstream/develop' into unify-scrape
WithoutPants Aug 26, 2021
2c12924
Add fingerprints to scraped scene fragment
WithoutPants Aug 31, 2021
ec5907c
Merge remote-tracking branch 'upstream/develop' into unify-scrape
WithoutPants Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix merge error
  • Loading branch information
@WithoutPants
WithoutPants committed Aug 10, 2021
commit 991ede83b167763a18ad92d17e6ca04e517c5028
4 changes: 2 additions & 2 deletions pkg/scraper/scrapers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,8 @@ func (c Cache) ScrapeMovieURL(url string) (*models.ScrapedMovie, error) {
return nil, nil
}

func postProcessTags(tqb models.TagReader, scrapedTags []*models.ScrapedSceneTag) ([]*models.ScrapedSceneTag, error) {
var ret []*models.ScrapedSceneTag
func postProcessTags(tqb models.TagReader, scrapedTags []*models.ScrapedTag) ([]*models.ScrapedTag, error) {
var ret []*models.ScrapedTag

excludePatterns := stash_config.GetInstance().GetScraperExcludeTagPatterns()
var excludeRegexps []*regexp.Regexp
Expand Down