fixed progress reporting

importer/fetch.go

@@ -129,6 +129,9 @@ func (job *Job) fetch() (interface{}, error) {
 		err = res.err
 	}
 
+	for _, l := range convLog {
+		job.im.dbgLog.Println(l.Line)
+	}
 	job.Progress.set(StepFetching, 1)
 	job.source.done <- &JobSourceResult{err, res.hash, convLog}
 	return loudness, err

importer/normalize.go

@@ -55,7 +55,7 @@ func (job *Job) normalize(loudness interface{}) error {
 			return
 		}
 
-		written, err := io.Copy(&progressWriter{job, StepNormalizing, 0, uint64(srcStat.Size()), conv}, src)
+		written, err := io.Copy(&progressWriter{job, StepNormalizing, uint64(srcStat.Size()), 0, conv}, src)
 		if err != nil {
 			done <- err
 			return

importer/normalize_converter.go

@@ -40,6 +40,8 @@ type normalizeConverter interface {
 func (job *Job) newNormalizeConverter(loudness interface{}) (normalizeConverter, error) {
 	if loudness == nil {
 		// make default converter configurable?
+		// mind that there is no nullNormalizeConverter because we need something to
+		// convert incoming files to the format the store uses.
 		return newFFmpegNormalizeConverter(job, nil)
 	}
 

importer/types.go

@@ -203,6 +203,12 @@ func (p *JobProgress) get() (step JobProgressStep, progress float32) {
 
 func (p *JobProgress) MarshalJSON() ([]byte, error) {
 	step, progress := p.get()
+	if math.IsNaN(float64(progress)) || math.IsInf(float64(progress), 0) || progress < 0.0 {
+		progress = -1.0
+	} else if progress > 1.0 {
+		progress = 1.0
+	}
+
 	return json.Marshal(struct {
 		Step     JobProgressStep `json:"step"`
 		Progress float32         `json:"progress"`