Skip to content

Commit

Permalink
Merge pull request #2 from kkdai/master
Browse files Browse the repository at this point in the history
Fixed default placeholder will introduce determine error
  • Loading branch information
c9s committed Jun 5, 2015
2 parents 6bb8751 + ad1725a commit b3f95b8
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,13 @@ func main() {
pathArgs = []string{"./"}
}

if *replacementFormatPtr != "" {
sequenceNumber = *seqStart
*replacementPtr = ""
*fileOnlyPtr = true
}

// Build pattern from prefix/suffix options
if *trimPrefixPtr != "" {
*matchPatternPtr = "^" + regexp.QuoteMeta(*trimPrefixPtr)
*replacementPtr = ""
*replacementFormatPtr = ""
} else if *trimSuffixPtr != "" {
*matchPatternPtr = regexp.QuoteMeta(*trimSuffixPtr) + "$"
*replacementPtr = ""
*replacementFormatPtr = ""
}

if *matchPatternPtr == "" {
Expand All @@ -131,6 +123,10 @@ func main() {
if *replacementPtr == "{replacement}" && *replacementFormatPtr == "{replacement}" {
log.Fatalln("replacement is required. use -replace 'replacement' or -replace-format 'replacement with format'")
}
if *replacementFormatPtr != "{replacement}" {
sequenceNumber = *seqStart
*fileOnlyPtr = true
}

var matchRegExp = regexp.MustCompile(*matchPatternPtr)
var extRegExp *regexp.Regexp = nil
Expand Down Expand Up @@ -192,11 +188,12 @@ func main() {
sort.Sort(SizeReverseSort{entryQueue})
}
}
}

for index, _ := range entryQueue {
entryOutput <- &(entryQueue[index])
}
for index, _ := range entryQueue {
entryOutput <- &(entryQueue[index])
}

entryOutput <- nil
close(entryOutput)

Expand Down

0 comments on commit b3f95b8

Please sign in to comment.