@@ -33,6 +33,7 @@ import (
3333 "path/filepath"
3434
3535 cc "github.com/arduino/golang-concurrent-workers"
36+ "github.com/arduino/libraries-repository-engine/internal/feedback"
3637 "github.com/arduino/libraries-repository-engine/internal/libraries"
3738 "github.com/arduino/libraries-repository-engine/internal/libraries/db"
3839 "github.com/arduino/libraries-repository-engine/internal/libraries/gitutils"
@@ -52,14 +53,6 @@ type Config struct {
5253 ArduinoLintPath string
5354}
5455
55- func logError (err error ) bool {
56- if err != nil {
57- log .Println (err )
58- return true
59- }
60- return false
61- }
62-
6356var config * Config
6457
6558func main () {
@@ -86,13 +79,13 @@ func main() {
8679
8780func syncLibraries (reposFile string ) {
8881 if _ , err := os .Stat (reposFile ); os .IsNotExist (err ) {
89- logError (err )
82+ feedback . LogError (err )
9083 os .Exit (1 )
9184 }
9285
9386 log .Println ("Synchronizing libraries..." )
9487 repos , err := libraries .ListRepos (reposFile )
95- if logError (err ) {
88+ if feedback . LogError (err ) {
9689 os .Exit (1 )
9790 }
9891
@@ -142,11 +135,11 @@ func syncLibraries(reposFile string) {
142135 }()
143136
144137 for err := range pool .Errors {
145- logError (err )
138+ feedback . LogError (err )
146139 }
147140
148141 libraryIndex , err := libraryDb .OutputLibraryIndex ()
149- if logError (err ) {
142+ if feedback . LogError (err ) {
150143 os .Exit (1 )
151144 }
152145
@@ -157,48 +150,48 @@ func syncLibraries(reposFile string) {
157150
158151func serializeLibraryIndex (libraryIndex interface {}, libraryIndexFile string ) {
159152 file , err := os .Create (libraryIndexFile )
160- if logError (err ) {
153+ if feedback . LogError (err ) {
161154 os .Exit (1 )
162155 }
163156 defer file .Close ()
164157
165158 b , err := json .MarshalIndent (libraryIndex , "" , " " )
166- if logError (err ) {
159+ if feedback . LogError (err ) {
167160 os .Exit (1 )
168161 }
169162
170163 _ , err = file .Write (b )
171- if logError (err ) {
164+ if feedback . LogError (err ) {
172165 os .Exit (1 )
173166 }
174167}
175168
176169func readConf (configFile string ) * Config {
177170 if _ , err := os .Stat (configFile ); os .IsNotExist (err ) {
178- logError (err )
171+ feedback . LogError (err )
179172 os .Exit (1 )
180173 }
181174
182175 file , err := os .Open (configFile )
183- if logError (err ) {
176+ if feedback . LogError (err ) {
184177 os .Exit (1 )
185178 }
186179 decoder := json .NewDecoder (file )
187180 config := Config {}
188181 err = decoder .Decode (& config )
189- if logError (err ) {
182+ if feedback . LogError (err ) {
190183 os .Exit (1 )
191184 }
192185 return & config
193186}
194187
195188func setup (config * Config ) {
196189 err := os .MkdirAll (config .GitClonesFolder , os .FileMode (0777 ))
197- if logError (err ) {
190+ if feedback . LogError (err ) {
198191 os .Exit (1 )
199192 }
200193 err = os .MkdirAll (config .LibrariesFolder , os .FileMode (0777 ))
201- if logError (err ) {
194+ if feedback . LogError (err ) {
202195 os .Exit (1 )
203196 }
204197}
0 commit comments