# HG changeset patch # User Sascha L. Teichmann # Date 1542626247 -3600 # Node ID 49eead4fad3a42e5d3b8ea7eacdbc69037b1b916 # Parent 68fb4af05b73974948c0ee26b8cf452672c184a4 Renamed controller file of sounding result imports to a more suited name. diff -r 68fb4af05b73 -r 49eead4fad3a pkg/controllers/imports.go --- a/pkg/controllers/imports.go Mon Nov 19 10:09:25 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -// This is Free Software under GNU Affero General Public License v >= 3.0 -// without warranty, see README.md and license for details. -// -// SPDX-License-Identifier: AGPL-3.0-or-later -// License-Filename: LICENSES/AGPL-3.0.txt -// -// Copyright (C) 2018 by via donau -// – Österreichische Wasserstraßen-Gesellschaft mbH -// Software engineering by Intevation GmbH -// -// Author(s): -// * Sascha L. Teichmann - -package controllers - -import ( - "bufio" - "io" - "io/ioutil" - "log" - "net/http" - "os" - "path/filepath" - - "gemma.intevation.de/gemma/pkg/auth" - "gemma.intevation.de/gemma/pkg/config" - "gemma.intevation.de/gemma/pkg/imports" -) - -const ( - maxSoundingResultSize = 25 * 1024 * 1024 - soundingResultName = "soundingresult" -) - -func downloadSoundingResult(req *http.Request) (string, error) { - - f, _, err := req.FormFile(soundingResultName) - if err != nil { - return "", err - } - defer f.Close() - - dir, err := ioutil.TempDir(config.TmpDir(), soundingResultName) - if err != nil { - return "", err - } - - o, err := os.Create(filepath.Join(dir, "sr.zip")) - if err != nil { - os.RemoveAll(dir) - return "", err - } - - out := bufio.NewWriter(o) - - if _, err = io.Copy(out, io.LimitReader(f, maxSoundingResultSize)); err != nil { - o.Close() - os.RemoveAll(dir) - return "", err - } - - if err = out.Flush(); err != nil { - o.Close() - os.RemoveAll(dir) - return "", err - } - - return dir, nil -} - -func importSoundingResult(rw http.ResponseWriter, req *http.Request) { - - dir, err := downloadSoundingResult(req) - if err != nil { - log.Printf("error: %v\n", err) - http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) - return - } - - session, _ := auth.GetSession(req) - - jobID, err := imports.AddJob(imports.SRJobKind, session.User, dir) - if err != nil { - log.Printf("error: %v\n", err) - http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) - return - } - - log.Printf("info: added import #%d to queue\n", jobID) - - result := struct { - ID int64 `json:"id"` - }{ - ID: jobID, - } - SendJSON(rw, http.StatusCreated, &result) -} diff -r 68fb4af05b73 -r 49eead4fad3a pkg/controllers/srimports.go --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pkg/controllers/srimports.go Mon Nov 19 12:17:27 2018 +0100 @@ -0,0 +1,97 @@ +// This is Free Software under GNU Affero General Public License v >= 3.0 +// without warranty, see README.md and license for details. +// +// SPDX-License-Identifier: AGPL-3.0-or-later +// License-Filename: LICENSES/AGPL-3.0.txt +// +// Copyright (C) 2018 by via donau +// – Österreichische Wasserstraßen-Gesellschaft mbH +// Software engineering by Intevation GmbH +// +// Author(s): +// * Sascha L. Teichmann + +package controllers + +import ( + "bufio" + "io" + "io/ioutil" + "log" + "net/http" + "os" + "path/filepath" + + "gemma.intevation.de/gemma/pkg/auth" + "gemma.intevation.de/gemma/pkg/config" + "gemma.intevation.de/gemma/pkg/imports" +) + +const ( + maxSoundingResultSize = 25 * 1024 * 1024 + soundingResultName = "soundingresult" +) + +func downloadSoundingResult(req *http.Request) (string, error) { + + f, _, err := req.FormFile(soundingResultName) + if err != nil { + return "", err + } + defer f.Close() + + dir, err := ioutil.TempDir(config.TmpDir(), soundingResultName) + if err != nil { + return "", err + } + + o, err := os.Create(filepath.Join(dir, "sr.zip")) + if err != nil { + os.RemoveAll(dir) + return "", err + } + + out := bufio.NewWriter(o) + + if _, err = io.Copy(out, io.LimitReader(f, maxSoundingResultSize)); err != nil { + o.Close() + os.RemoveAll(dir) + return "", err + } + + if err = out.Flush(); err != nil { + o.Close() + os.RemoveAll(dir) + return "", err + } + + return dir, nil +} + +func importSoundingResult(rw http.ResponseWriter, req *http.Request) { + + dir, err := downloadSoundingResult(req) + if err != nil { + log.Printf("error: %v\n", err) + http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) + return + } + + session, _ := auth.GetSession(req) + + jobID, err := imports.AddJob(imports.SRJobKind, session.User, dir) + if err != nil { + log.Printf("error: %v\n", err) + http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError) + return + } + + log.Printf("info: added import #%d to queue\n", jobID) + + result := struct { + ID int64 `json:"id"` + }{ + ID: jobID, + } + SendJSON(rw, http.StatusCreated, &result) +}