gemma: pkg/imports/sr.go comparison

Decoupled import job creation and job execution with a factory function. This is needed for persistence purposes.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Mon, 22 Oct 2018 10:45:17 +0200
parents	7dfd3db94e6d
children	a244b18cb916

comparison

equal deleted inserted replaced

-:3907a7b98067
+:a301d240905f
 	shp "github.com/jonas-p/go-shp"
 	"gemma.intevation.de/gemma/pkg/octree"
 )
-type SoundingResult struct {
+type SoundingResult string
-	Who string
-	Dir string
-}
 const SoundingResultDateFormat = "2006-01-02"
 type (
 	SoundingResultDate struct{ time.Time }
 const (
 	contourStepWidth = 0.5
 	contourTolerance = 0.1
 )
+const SRJobKind JobKind = "sr"
+func init() {
+	RegisterJobCreator(SRJobKind, func(_ JobKind, data string) (Job, error) {
+		return SoundingResult(data), nil
+	})
+}
 const (
 	checkDepthReferenceSQL = `
 SELECT true FROM depth_references WHERE depth_reference = $1`
 FROM waterway.sounding_results sr
 WHERE id = $1
 `
 )
-func (sr *SoundingResult) Do(conn *sql.Conn, feedback Feedback) error {
+func (sr SoundingResult) Do(conn *sql.Conn, feedback Feedback) error {
-	z, err := zip.OpenReader(filepath.Join(sr.Dir, "sr.zip"))
+	z, err := zip.OpenReader(filepath.Join(string(sr), "sr.zip"))
 	if err != nil {
 		return err
 	}
 	defer z.Close()
 		*srd = SoundingResultDate{d}
 	}
 	return err
 }
-func (sr *SoundingResult) User() string {
+func (sr SoundingResult) CleanUp() error {
-	return sr.Who
+	return os.RemoveAll(string(sr))
-}
-func (sr *SoundingResult) CleanUp() error {
-	return os.RemoveAll(sr.Dir)
 }
 func find(needle string, haystack []*zip.File) *zip.File {
 	needle = strings.ToLower(needle)
 	for _, straw := range haystack {

Mercurial > gemma