@@ -18,7 +18,6 @@ package internal
1818import (
1919 "bufio"
2020 "bytes"
21- "fmt"
2221 "io"
2322 "io/ioutil"
2423 "os"
@@ -29,51 +28,48 @@ import (
2928)
3029
3130// insertStrings reads content from given reader and insert string below the
32- // line line containing marker string. So for ex. in insertStrings(r, m1, v1, m2, v2)
31+ // line containing marker string. So for ex. in insertStrings(r, {'m1':
32+ // [v1], 'm2': [v2]})
3333// v1 will be inserted below the lines containing m1 string and v2 will be inserted
3434// below line containing m2 string.
35- func insertStrings (r io.Reader , markerAndValues ... string ) (io.Reader , error ) {
36- if len ( markerAndValues ) % 2 != 0 {
37- return nil , fmt . Errorf ( "invalid marker and value pairs" )
38- }
35+ func insertStrings (r io.Reader , markerAndValues map [ string ][] string ) (io.Reader , error ) {
36+ // reader clone is needed since we will be reading twice from the given reader
37+ buf := new (bytes. Buffer )
38+ rClone := io . TeeReader ( r , buf )
3939
40- mvPairs := map [string ]string {}
41- for i , s := range markerAndValues {
42- if i % 2 == 0 {
43- mvPairs [s ] = markerAndValues [i + 1 ]
44- }
40+ err := filterExistingValues (rClone , markerAndValues )
41+ if err != nil {
42+ return nil , err
4543 }
4644
47- buf := new (bytes.Buffer )
45+ out := new (bytes.Buffer )
4846
49- scanner := bufio .NewScanner (r )
47+ scanner := bufio .NewScanner (buf )
5048 for scanner .Scan () {
5149 line := scanner .Text ()
5250
53- for m , v := range mvPairs {
54- if strings .TrimSpace (line ) == strings .TrimSpace (v ) {
55- // since value already exist, so avoid duplication
56- delete (mvPairs , m )
57- }
58- if strings .Contains (line , m ) {
59- _ , err := buf .WriteString (v )
60- if err != nil {
61- return nil , err
51+ for marker , vals := range markerAndValues {
52+ if strings .TrimSpace (line ) == strings .TrimSpace (marker ) {
53+ for _ , val := range vals {
54+ _ , err := out .WriteString (val )
55+ if err != nil {
56+ return nil , err
57+ }
6258 }
6359 }
6460 }
65- _ , err := buf .WriteString (line + "\n " )
61+ _ , err := out .WriteString (line + "\n " )
6662 if err != nil {
6763 return nil , err
6864 }
6965 }
7066 if err := scanner .Err (); err != nil {
7167 return nil , err
7268 }
73- return buf , nil
69+ return out , nil
7470}
7571
76- func InsertStringsInFile (path string , markerAndValues ... string ) error {
72+ func InsertStringsInFile (path string , markerAndValues map [ string ][] string ) error {
7773 isGoFile := false
7874 if ext := filepath .Ext (path ); ext == ".go" {
7975 isGoFile = true
@@ -84,7 +80,7 @@ func InsertStringsInFile(path string, markerAndValues ...string) error {
8480 return err
8581 }
8682
87- r , err := insertStrings (f , markerAndValues ... )
83+ r , err := insertStrings (f , markerAndValues )
8884 if err != nil {
8985 return err
9086 }
@@ -115,3 +111,24 @@ func InsertStringsInFile(path string, markerAndValues ...string) error {
115111
116112 return err
117113}
114+
115+ // filterExistingValues removes the single-line values that already exists in
116+ // the given reader. Multi-line values are ignore currently simply because we
117+ // don't have a use-case for it.
118+ func filterExistingValues (r io.Reader , markerAndValues map [string ][]string ) error {
119+ scanner := bufio .NewScanner (r )
120+ for scanner .Scan () {
121+ line := scanner .Text ()
122+ for marker , vals := range markerAndValues {
123+ for i , val := range vals {
124+ if strings .TrimSpace (line ) == strings .TrimSpace (val ) {
125+ markerAndValues [marker ] = append (vals [:i ], vals [i + 1 :]... )
126+ }
127+ }
128+ }
129+ }
130+ if err := scanner .Err (); err != nil {
131+ return err
132+ }
133+ return nil
134+ }
0 commit comments