liliesh/scabiosa
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(Compression): No longer shows wrong Name in output

Browse source
This commit is contained in:
netbenix 2021-12-23 11:04:33 +01:00
parent 1f32937baf
commit ab27acb960
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Compressor/Compression.go
View file

@ -39,7 +39,7 @@ func compress(fileToWrite *os.File, folderPath string, backupName string){
zr, _ := gzip.NewWriterLevel(fileToWrite, flate.BestCompression) zr, _ := gzip.NewWriterLevel(fileToWrite, flate.BestCompression)
tw := tar.NewWriter(zr) tw := tar.NewWriter(zr)
go fmt.Printf("[%s] Start compression...\n", filepath.Base(folderPath)) go fmt.Printf("[%s] Start compression...\n", backupName)
SQL.NewLogEntry(SQL.GetSQLInstance(), uuid.New(), SQL.LogInfo, backupName, SQL.SQLStage_Compress, SQL.REMOTE_NONE, "Start compression", time.Now()) SQL.NewLogEntry(SQL.GetSQLInstance(), uuid.New(), SQL.LogInfo, backupName, SQL.SQLStage_Compress, SQL.REMOTE_NONE, "Start compression", time.Now())
filepath.Walk(folderPath, func(file string, fi os.FileInfo, err error) error { filepath.Walk(folderPath, func(file string, fi os.FileInfo, err error) error {
header, err := tar.FileInfoHeader(fi, file) header, err := tar.FileInfoHeader(fi, file)
@ -60,7 +60,7 @@ func compress(fileToWrite *os.File, folderPath string, backupName string){
logger.Fatal(err) logger.Fatal(err)
} }
go fmt.Printf("[%s] Compressing: %s (%d bytes)\n", filepath.Base(folderPath) ,relPath, fi.Size()) go fmt.Printf("[%s] Compressing: %s (%d bytes)\n", backupName, relPath, fi.Size())
if _, err := io.Copy(tw, data); err != nil { if _, err := io.Copy(tw, data); err != nil {
logger.Fatal(err) logger.Fatal(err)
} }
@ -78,6 +78,6 @@ func compress(fileToWrite *os.File, folderPath string, backupName string){
} }
go fmt.Printf("[%s] Compression Done.\n", filepath.Base(folderPath)) go fmt.Printf("[%s] Compression Done.\n", backupName)
SQL.NewLogEntry(SQL.GetSQLInstance(), uuid.New(), SQL.LogInfo, backupName, SQL.SQLStage_Compress, SQL.REMOTE_NONE, "Compression complete.", time.Now()) SQL.NewLogEntry(SQL.GetSQLInstance(), uuid.New(), SQL.LogInfo, backupName, SQL.SQLStage_Compress, SQL.REMOTE_NONE, "Compression complete.", time.Now())
} }