eureka.go: add bool config option type to parser, fix logic for multilinestring
Iris Lightshard nilix@nilfm.cc
PGP Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmPA75AACgkQO3+8IhRO Y5gQww/9FmxPbDTA8wRHbIokQ+OHsVjIXL6aCUdi7VMrQqSYTfDJx3b5UI3Guc+p qYNbCTp6rLDc5mstR1omwOsQJaJ/j+N/RuwZz8tqV74Kd2VdNaV8kwLzdsjfkotu 0IjA2k4bN18bcOlRD3Nek0/w51xAu61dO0enAsSkBwi8oga47rX623nd5FopZ7dC fpEIGqhVP44+N7z485lsJZNqlY0UOJPTv81PJG4KELgthQ1+gdMdMpvl2Hg3TSuP eN6oq/x/s+U6yu9RKfuWgnsHp8nc2EfwYobJhmxvsTqvmVp7q0Rp3RGlTe+uxTYm xjEiMY19LHV5krLog/UskLbtZ7cp+c1TyxvgU/wYnncKlk4f9lEqYuhzrlYcKlnX aUw1R8sRZ8kiV98Hwsepzp2fsozddMDuksQxwNrDbNCNzccE0alzJFgAcnu6ISO3 qTsWlO7P5eSa58bcZyrF4FoJQgPY/Y1XkBcDEAdf6EAhLNEMJEhaF99jlvKqBmcY Xbk1LsXltXIeceO1wzRhVPi2gLqKtd0bBfxJVg14O2PZP1BSdf4CK5NvYiSIc2oq LUv7UoYof5FBPeginXgPHxUDjT/8uQkjqyJg6GJbUPtX0qzJUX+NMq5Tm/AZyXSX 28nabOXtZexQYaYCbClZqji8DaoJwwB9LMGtFCiCNeC2EbdUpS4= =7IDT -----END PGP SIGNATURE-----
1 files changed,
7 insertions(+),
2 deletions(-)
jump to
M
archetype/eureka.go
→
archetype/eureka.go
@@ -321,7 +321,7 @@ k := tokens[0]
v := strings.TrimSpace(strings.Join(tokens[1:], " ")) if strings.Contains(v, "\"") { - if strings.Contains(v, "\\\r\n") || strings.Contains(v, "\\\n") { + if strings.HasSuffix(k, "_HTML") { // process multiline string lines := strings.Split(v, "\n") cleanedString := ""@@ -363,9 +363,13 @@ _, err := strconv.ParseInt(v, 10, 64)
if err != nil { return err } + cfgType := "int" + if strings.HasPrefix(k, "IS_") { + cfgType = "bool" + } self.Config[ConfigOption{ Name: k, - Type: "int", + Type: cfgType, }] = v } }@@ -383,6 +387,7 @@
for k, v := range self.Config { switch k.Type { case "int": + case "bool": _, err := strconv.ParseInt(v, 10, 64) if err != nil { return err