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

Support today, yesterday when using parseDate in scrapers (#1261)

Browse Source
This commit is contained in:
bnkai
2021-04-07 02:09:04 +03:00
committed by GitHub
parent d8ba4a08c0
commit 2edcdeaeb9
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/scraper/mapped.go
View File

@@ -362,6 +362,17 @@ type postProcessParseDate string
func (p *postProcessParseDate) Apply(value string, q mappedQuery) string { func (p *postProcessParseDate) Apply(value string, q mappedQuery) string {
parseDate := string(*p) parseDate := string(*p)
const internalDateFormat = "2006-01-02"
value = strings.ToLower(value)
if value == "today" || value == "yesterday" { // handle today, yesterday
dt := time.Now()
if value == "yesterday" { // subtract 1 day from now
dt = dt.AddDate(0, 0, -1)
}
return dt.Format(internalDateFormat)
}
if parseDate == "" { if parseDate == "" {
return value return value
} }
@@ -375,7 +386,6 @@ func (p *postProcessParseDate) Apply(value string, q mappedQuery) string {
} }
// convert it into our date format // convert it into our date format
const internalDateFormat = "2006-01-02"
return parsedValue.Format(internalDateFormat) return parsedValue.Format(internalDateFormat)
} }

1
ui/v2.5/src/components/Changelog/versions/v070.md
View File

@@ -3,6 +3,7 @@
* Added scene queue. * Added scene queue.
### 🎨 Improvements ### 🎨 Improvements
* Support `today` and `yesterday` for `parseDate` in scrapers.
* Add random sorting option for galleries, studios, movies and tags. * Add random sorting option for galleries, studios, movies and tags.
* Disable sounds on scene/marker wall previews by default. * Disable sounds on scene/marker wall previews by default.
* Improve Movie UI. * Improve Movie UI.

2
ui/v2.5/src/docs/en/Scraping.md
View File

@@ -360,7 +360,7 @@ performer:
``` ```
Gets the contents of the selected div element, and sets the returned value to `Female` if the scraped value is `F`; `Male` if the scraped value is `M`. Gets the contents of the selected div element, and sets the returned value to `Female` if the scraped value is `F`; `Male` if the scraped value is `M`.
* `parseDate`: if present, the value is the date format using go's reference date (2006-01-02). For example, if an example date was `14-Mar-2003`, then the date format would be `02-Jan-2006`. See the [time.Parse documentation](https://golang.org/pkg/time/#Parse) for details. When present, the scraper will convert the input string into a date, then convert it to the string format used by stash (`YYYY-MM-DD`). * `parseDate`: if present, the value is the date format using go's reference date (2006-01-02). For example, if an example date was `14-Mar-2003`, then the date format would be `02-Jan-2006`. See the [time.Parse documentation](https://golang.org/pkg/time/#Parse) for details. When present, the scraper will convert the input string into a date, then convert it to the string format used by stash (`YYYY-MM-DD`). Strings "Today", "Yesterday" are matched (case insensitive) and converted by the scraper so you don't need to edit/replace them.
* `replace`: contains an array of sub-objects. Each sub-object must have a `regex` and `with` field. The `regex` field is the regex pattern to replace, and `with` is the string to replace it with. `$` is used to reference capture groups - `$1` is the first capture group, `$2` the second and so on. Replacements are performed in order of the array. * `replace`: contains an array of sub-objects. Each sub-object must have a `regex` and `with` field. The `regex` field is the regex pattern to replace, and `with` is the string to replace it with. `$` is used to reference capture groups - `$1` is the first capture group, `$2` the second and so on. Replacements are performed in order of the array.