c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy and delete instead of rename

Browse Source 
Fixes: https://github.com/ooni/probe-cli/issues/21
This commit is contained in:
Arturo Filastò 2019-05-15 18:06:09 +02:00
parent dbed661357
commit 826822df31
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/database/models.go
View File

@ -6,6 +6,7 @@ import (
"path/filepath"
"time"
"github.com/ooni/probe-cli/internal/shutil"
"github.com/pkg/errors"
"upper.io/db.v3/lib/sqlbuilder"
)
@ -161,9 +162,13 @@ func (m *Measurement) AddToResult(sess sqlbuilder.Database, result *Result) erro
// If the finalPath already exists, it means it has already been moved there.
// This happens in multi input reports
if _, err = os.Stat(finalPath); os.IsNotExist(err) {
err = os.Rename(m.ReportFilePath, finalPath)
err := shutil.CopyFile(m.ReportFilePath, finalPath, false)
if err != nil {
return errors.Wrap(err, "moving report file")
return errors.Wrap(err, "copying report file")
}
err = os.Remove(m.ReportFilePath)
if err != nil {
return errors.Wrap(err, "deleting report file")
}
}
m.ReportFilePath = finalPath