diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-01-27 10:22:42 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-01-27 10:22:42 +0100 |
commit | 7b472e46084b603045b87cea870ffc73ac1cf7e7 (patch) | |
tree | 34da0356f12344350555c44300dba8038061ece3 /resource/resource.go | |
parent | 96e3fbcf23ceb946504d7e82ea08bf1c30b0fe5f (diff) |
resource: Start Resources :counter first time they're used
This is less surprising and more flexible than the original implementation.
Given:
```toml
[[resources]]
src = "documents/photo_specs.pdf"
title = "Photo Specifications"
[[resources]]
src = "**.pdf"
name = "pdf-file-:counter"
```
Every `pdf` in the bundle will have an unique counter, but the `photo_specs.pdf` is still allowed to have its specific `title`.
If you change the above example to:
```toml
[[resources]]
src = "documents/*specs.pdf"
title = "Photo Specifications #:conter"
[[resources]]
src = "**.pdf"
name = "pdf-file-:counter"
```
We are talking about two different groups of documents, each with its own counters starting at 1.
Fixes #4335
Diffstat (limited to 'resource/resource.go')
-rw-r--r-- | resource/resource.go | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/resource/resource.go b/resource/resource.go index 2e5c8011a..dfda1ae7a 100644 --- a/resource/resource.go +++ b/resource/resource.go @@ -447,6 +447,8 @@ func (l *genericResource) Publish() error { return helpers.WriteToDisk(target, f, l.spec.Fs.Destination) } +const counterPlaceHolder = ":counter" + // AssignMetadata assigns the given metadata to those resources that supports updates // and matching by wildcard given in `src` using `filepath.Match` with lower cased values. // This assignment is additive, but the most specific match needs to be first. @@ -464,6 +466,7 @@ func AssignMetadata(metadata []map[string]interface{}, resources ...Resource) er var ( nameSet, titleSet bool currentCounter = 0 + counterFound bool resourceSrcKey = strings.ToLower(r.Name()) ) @@ -487,12 +490,16 @@ func AssignMetadata(metadata []map[string]interface{}, resources ...Resource) er if !nameSet { name, found := meta["name"] if found { - if currentCounter == 0 { + name := cast.ToString(name) + if !counterFound { + counterFound = strings.Contains(name, counterPlaceHolder) + } + if counterFound && currentCounter == 0 { currentCounter = counters[srcKey] + 1 counters[srcKey] = currentCounter } - ma.setName(replaceResourcePlaceholders(cast.ToString(name), currentCounter)) + ma.setName(replaceResourcePlaceholders(name, currentCounter)) nameSet = true } } @@ -500,11 +507,15 @@ func AssignMetadata(metadata []map[string]interface{}, resources ...Resource) er if !titleSet { title, found := meta["title"] if found { - if currentCounter == 0 { + title := cast.ToString(title) + if !counterFound { + counterFound = strings.Contains(title, counterPlaceHolder) + } + if counterFound && currentCounter == 0 { currentCounter = counters[srcKey] + 1 counters[srcKey] = currentCounter } - ma.setTitle((replaceResourcePlaceholders(cast.ToString(title), currentCounter))) + ma.setTitle((replaceResourcePlaceholders(title, currentCounter))) titleSet = true } } @@ -524,7 +535,7 @@ func AssignMetadata(metadata []map[string]interface{}, resources ...Resource) er } func replaceResourcePlaceholders(in string, counter int) string { - return strings.Replace(in, ":counter", strconv.Itoa(counter), -1) + return strings.Replace(in, counterPlaceHolder, strconv.Itoa(counter), -1) } func (l *genericResource) target() string { |