Mercurial > gemma
changeset 3762:98d5dd2f0ca1
Don't show unnecessary warnings when uploading TXT file for SR.
author | Sascha Wilde <wilde@intevation.de> |
---|---|
date | Wed, 26 Jun 2019 11:00:35 +0200 |
parents | f14ff00ad82a |
children | a1bb7c894058 |
files | pkg/controllers/srimports.go pkg/imports/sr.go |
diffstat | 2 files changed, 24 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/srimports.go Tue Jun 25 17:05:57 2019 +0200 +++ b/pkg/controllers/srimports.go Wed Jun 26 11:00:35 2019 +0200 @@ -201,9 +201,12 @@ var once sync.Once closeOnce := func() { zr.Close() } + var isZIP bool = false if zr, err = zip.OpenReader(srFile); err != nil { - messages = append(messages, fmt.Sprintf("ZIP problem: %v", err)) + messages = append(messages, fmt.Sprintf("%v - "+ + "Trying TXT file mode.", err)) } else { + isZIP = true defer once.Do(closeOnce) } @@ -216,27 +219,29 @@ find := func(ext string) *zip.File { return common.FindInZIP(zr, ext) } var noXYZ bool - if zr != nil { - noXYZ = find(".xyz") == nil && find(".txt") == nil - } + if isZIP { + if zr != nil { + noXYZ = find(".xyz") == nil && find(".txt") == nil + } - if noXYZ { - messages = append(messages, "no .xyz or .txt file found.") - } + if noXYZ { + messages = append(messages, "no .xyz or .txt file found.") + } - if mj := find("meta.json"); mj == nil { - messages = append(messages, "no 'meta.json' file found.") - } else { - if meta, err := loadMeta(mj); err != nil { - messages = append(messages, - fmt.Sprintf("'meta.json' found but invalid: %v", err)) + if mj := find("meta.json"); mj == nil { + messages = append(messages, "no 'meta.json' file found.") } else { - errs := meta.Validate(req.Context(), conn) - for _, err := range errs { + if meta, err := loadMeta(mj); err != nil { messages = append(messages, - fmt.Sprintf("invalid 'meta.json': %v", err)) + fmt.Sprintf("'meta.json' found but invalid: %v", err)) + } else { + errs := meta.Validate(req.Context(), conn) + for _, err := range errs { + messages = append(messages, + fmt.Sprintf("invalid 'meta.json': %v", err)) + } + result.Meta = meta } - result.Meta = meta } }
--- a/pkg/imports/sr.go Tue Jun 25 17:05:57 2019 +0200 +++ b/pkg/imports/sr.go Wed Jun 26 11:00:35 2019 +0200 @@ -224,8 +224,8 @@ z, err := zip.OpenReader(zpath) if err != nil { - feedback.Warn("Expected ZIP file: %v", err) - feedback.Warn("Falling back to TXT file mode.") + feedback.Info("%v", err) + feedback.Info("Falling back to TXT file mode.") z = nil } if z != nil {