@@ -33,6 +33,7 @@ import (
33
33
"path/filepath"
34
34
35
35
cc "github.com/arduino/golang-concurrent-workers"
36
+ "github.com/arduino/libraries-repository-engine/internal/configuration"
36
37
"github.com/arduino/libraries-repository-engine/internal/feedback"
37
38
"github.com/arduino/libraries-repository-engine/internal/libraries"
38
39
"github.com/arduino/libraries-repository-engine/internal/libraries/db"
@@ -41,19 +42,7 @@ import (
41
42
"github.com/go-git/go-git/v5/plumbing"
42
43
)
43
44
44
- // Config is the type of the engine configuration.
45
- type Config struct {
46
- BaseDownloadURL string
47
- LibrariesFolder string
48
- LogsFolder string
49
- LibrariesDB string
50
- LibrariesIndex string
51
- GitClonesFolder string
52
- DoNotRunClamav bool
53
- ArduinoLintPath string
54
- }
55
-
56
- var config * Config
45
+ var config * configuration.Config
57
46
58
47
func main () {
59
48
var configFile string
@@ -63,7 +52,7 @@ func main() {
63
52
configFile = "./config.json"
64
53
}
65
54
66
- config = readConf (configFile )
55
+ config = configuration . ReadConf (configFile )
67
56
68
57
setup (config )
69
58
@@ -166,7 +155,7 @@ func serializeLibraryIndex(libraryIndex interface{}, libraryIndexFile string) {
166
155
}
167
156
}
168
157
169
- func readConf (configFile string ) * Config {
158
+ func readConf (configFile string ) * configuration. Config {
170
159
if _ , err := os .Stat (configFile ); os .IsNotExist (err ) {
171
160
feedback .LogError (err )
172
161
os .Exit (1 )
@@ -177,15 +166,15 @@ func readConf(configFile string) *Config {
177
166
os .Exit (1 )
178
167
}
179
168
decoder := json .NewDecoder (file )
180
- config := Config {}
169
+ config := configuration. Config {}
181
170
err = decoder .Decode (& config )
182
171
if feedback .LogError (err ) {
183
172
os .Exit (1 )
184
173
}
185
174
return & config
186
175
}
187
176
188
- func setup (config * Config ) {
177
+ func setup (config * configuration. Config ) {
189
178
err := os .MkdirAll (config .GitClonesFolder , os .FileMode (0777 ))
190
179
if feedback .LogError (err ) {
191
180
os .Exit (1 )
0 commit comments