Replace --once-remove-match with --once=unique

Author: mblaschke

README.md

@@ -17,22 +17,34 @@ Usage:
   goreplace
 
 Application Options:
-  -m, --mode=[replace|line|lineinfile|template] replacement mode - replace: replace match with term; line: replace line with term; lineinfile: replace line with
-                                                term or if not found append to term to file; template: parse content as golang template, search value have to
-                                                start uppercase (default: replace)
+  -m, --mode=[replace|line|lineinfile|template] replacement mode - replace:
+                                                replace match with term; line:
+                                                replace line with term;
+                                                lineinfile: replace line with
+                                                term or if not found append to
+                                                term to file; template: parse
+                                                content as golang template,
+                                                search value have to start
+                                                uppercase (default: replace)
   -s, --search=                                 search term
   -r, --replace=                                replacement term
-  -i, --case-insensitive                        ignore case of pattern to match upper and lowercase characters
+  -i, --case-insensitive                        ignore case of pattern to match
+                                                upper and lowercase characters
       --stdin                                   process stdin as input
-      --once                                    replace search term only one in a file
-      --once-remove-match                       replace search term only one in a file and also don't keep matching lines (for line and lineinfile mode)
+      --once=[keep|unique]                      replace search term only one in
+                                                a file, keep duplicaes (keep,
+                                                default) or remove them (unique)
       --regex                                   treat pattern as regex
-      --regex-backrefs                          enable backreferences in replace term
+      --regex-backrefs                          enable backreferences in
+                                                replace term
       --regex-posix                             parse regex term as POSIX regex
       --path=                                   use files in this path
-      --path-pattern=                           file pattern (* for wildcard, only basename of file)
+      --path-pattern=                           file pattern (* for wildcard,
+                                                only basename of file)
       --path-regex=                             file pattern (regex, full path)
-      --ignore-empty                            ignore empty file list, otherwise this will result in an error
+      --ignore-empty                            ignore empty file list,
+                                                otherwise this will result in
+                                                an error
   -v, --verbose                                 verbose mode
       --dry-run                                 dry run mode
   -V, --version                                 show version and exit

goreplace.go

@@ -53,8 +53,7 @@ var opts struct {
     Replace                 []string `short:"r"  long:"replace"                       description:"replacement term" `
     CaseInsensitive         bool     `short:"i"  long:"case-insensitive"              description:"ignore case of pattern to match upper and lowercase characters"`
     Stdin                   bool     `           long:"stdin"                         description:"process stdin as input"`
-    Once                    bool     `           long:"once"                          description:"replace search term only one in a file"`
-    OnceRemoveMatch         bool     `           long:"once-remove-match"             description:"replace search term only one in a file and also don't keep matching lines (for line and lineinfile mode)"`
+    Once                    string   `           long:"once"                          description:"replace search term only one in a file, keep duplicaes (keep, default) or remove them (unique)" optional:"true" optional-value:"keep" choice:"keep" choice:"unique"`
     Regex                   bool     `           long:"regex"                         description:"treat pattern as regex"`
     RegexBackref            bool     `           long:"regex-backrefs"                description:"enable backreferences in replace term"`
     RegexPosix              bool     `           long:"regex-posix"                   description:"parse regex term as POSIX regex"`
@@ -152,9 +151,9 @@ func applyChangesetsToLine(line string, changesets []changeset) (string, bool, b
         changeset := changesets[i]
 
         // --once, only do changeset once if already applied to file
-        if opts.Once && changeset.MatchFound {
-            // --once-without-match, skip matching lines
-            if opts.OnceRemoveMatch && searchMatch(line, changeset) {
+        if opts.Once != "" && changeset.MatchFound {
+            // --once=unique, skip matching lines
+            if opts.Once == "unique" && searchMatch(line, changeset) {
                 // matching line, not writing to buffer as requsted
                 skipLine = true
                 changed = true
@@ -345,7 +344,6 @@ func searchFilesInPath(path string, callback func(os.FileInfo, string)) {
 //     --version
 //     --path
 //     --mode=...
-//     --once-without-match
 func handleSpecialCliOptions(args []string) ([]string) {
     // --version
     if (opts.ShowVersion) {
@@ -390,12 +388,6 @@ func handleSpecialCliOptions(args []string) ([]string) {
         })
     }
 
-    // --once-without-match
-    if opts.OnceRemoveMatch {
-        // implicit enables once mode
-        opts.Once = true
-    }
-
     return args
 }
 

tests/main.test

@@ -202,7 +202,7 @@ Testing line mode with multiple matches and --once:
   this is the foobar forth foobar line
   this is the last line
 
-Testing line mode with multiple matches and --once-remove-match:
+Testing line mode with multiple matches and --once=unique:
 
   $ cat > test.txt <<EOF
   > this is a testline
@@ -211,7 +211,7 @@ Testing line mode with multiple matches and --once-remove-match:
   > this is the foobar forth foobar line
   > this is the last line
   > EOF
-  $ goreplace --mode=line -s foobar -r ___xxx --once-remove-match test.txt
+  $ goreplace --mode=line -s foobar -r ___xxx --once=unique test.txt
   $ cat test.txt
   this is a testline
   this is the second line
@@ -270,7 +270,7 @@ Testing lineinfile mode with multiple matches and --once:
   this is the foobar forth foobar line
   this is the last line
 
-Testing lineinfile mode with multiple matches and --once-remove-match:
+Testing lineinfile mode with multiple matches and --once=unique:
 
   $ cat > test.txt <<EOF
   > this is a testline
@@ -279,7 +279,7 @@ Testing lineinfile mode with multiple matches and --once-remove-match:
   > this is the foobar forth foobar line
   > this is the last line
   > EOF
-  $ goreplace --mode=lineinfile -s foobar -r ___xxx --once-remove-match test.txt
+  $ goreplace --mode=lineinfile -s foobar -r ___xxx --once=unique test.txt
   $ cat test.txt
   this is a testline
   this is the second line
@@ -295,7 +295,7 @@ Testing lineinfile mode without match:
   > this is the foobar forth foobar line
   > this is the last line
   > EOF
-  $ goreplace --mode=lineinfile -s barfoo -r ___xxx --once-remove-match test.txt
+  $ goreplace --mode=lineinfile -s barfoo -r ___xxx --once=unique test.txt
   $ cat test.txt
   this is a testline
   this is the second line