fix shredder file on download

Author: JojiiOfficial

commands/File.go

@@ -286,7 +286,7 @@ func (cData *CommandData) EditFile(id uint) {
 	}
 
 	// Save File
-	err = resp.WriteToFile(filePath, 0600)
+	err = resp.WriteToFile(filePath, 0600, nil)
 	if err != nil {
 		printError("downloading file", err.Error())
 		return
@@ -324,7 +324,6 @@ func (cData *CommandData) EditFile(id uint) {
 	cData.Encryption = resp.Encryption
 
 	// Replace file on server with new file
-	// cData.UploadFile([]string{filePath}, serverName, "", false, false, false, id, 1, false)
 	cData.UploadFile([]string{filePath}, 1, &UploadData{
 		ReplaceFile: resp.FileID,
 		Progress:    uiprogress.New(),

commands/FileDownload.go

@@ -78,15 +78,15 @@ func (cData *CommandData) ViewFile(data *DownloadData) {
 		defer ShredderFile(tmpFile, -1)
 
 		// Write file
-		if err = writeFile(cData, resp, tmpFile); err != nil {
+		if err = writeFile(cData, resp, tmpFile, nil); err != nil {
 			return
 		}
 
 		// Preview tempfile
 		previewFile(tmpFile)
 	} else {
 		// Display file in os.Stdout (cli)
-		err = resp.SaveTo(os.Stdout)
+		err = resp.SaveTo(os.Stdout, nil)
 		if err != nil {
 			printResponseError(err, "downloading file")
 			return
@@ -133,35 +133,42 @@ func (cData *CommandData) DownloadFile(data *DownloadData) {
 		return
 	}
 
+	cancel := make(chan bool, 1)
 	c := make(chan string, 1)
 
 	go func() {
-		err = writeFile(cData, resp, outFile)
+		err = writeFile(cData, resp, outFile, cancel)
 		if err != nil {
 			// Delete file on error. On checksum error only delete if --verify was passed
 			if err != libdm.ErrChecksumNotMatch || cData.VerifyFile {
 				ShredderFile(outFile, -1)
 			}
 
+			c <- "exit"
 			return
 		}
+
 		c <- ""
 	}()
 
+	// Wait for download to be done or delete file on interrupt
 	awaitOrInterrupt(c, func(s os.Signal) {
-		ShredderFile(outFile, -1)
+		cancel <- true
+
+		// await shredder
+		<-c
 	}, func(s string) {
 		printSuccess("saved '%s'", outFile)
 	})
 }
 
-func writeFile(cData *CommandData, resp *libdm.FileDownloadResponse, file string) error {
+func writeFile(cData *CommandData, resp *libdm.FileDownloadResponse, file string, cancel chan bool) error {
 	// Save file to tempFile
-	err := resp.WriteToFile(file, 0600)
+	err := resp.WriteToFile(file, 0600, cancel)
 	if err != nil {
 		if err == libdm.ErrChecksumNotMatch {
 			cData.printChecksumError(resp)
-		} else {
+		} else if err != libdm.ErrCancelled {
 			printError("downloading file", err.Error())
 		}
 	}

commands/FileUpload.go

@@ -138,7 +138,7 @@ func (cData *CommandData) uploadFile(uploadRequest *libdm.UploadRequest, uploadD
 	// Start uploading
 	go func() {
 		c := make(chan string, 1)
-		uploadResponse, err = uploadRequest.UploadFromReader(r, size, c)
+		uploadResponse, err = uploadRequest.UploadFromReader(r, size, c, nil)
 		done <- <-c
 	}()
 

go.mod

@@ -6,7 +6,7 @@ replace github.com/gosuri/uiprogress v0.0.1 => github.com/JojiiOfficial/uiprogre
 
 require (
 	github.com/CovenantSQL/go-sqlite3-encrypt v1.9.0
-	github.com/DataManager-Go/libdatamanager v1.1.14
+	github.com/DataManager-Go/libdatamanager v1.1.15
 	github.com/DataManager-Go/libdatamanager/config v0.0.0-20200412231115-a82508b229bb
 	github.com/JojiiOfficial/configService v0.0.0-20200219132202-6e71512e2e28
 	github.com/JojiiOfficial/gaw v1.2.1

go.sum

@@ -3,10 +3,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/CovenantSQL/go-sqlite3-encrypt v1.9.0 h1:GPtIZW4KZhul21SrmmpgUCx+wEPhnFlzOceTtzMypzs=
 github.com/CovenantSQL/go-sqlite3-encrypt v1.9.0/go.mod h1:EH9sjhhyDGHNIj/Wx59f7CURbVp1C1x/eRVi07WPsvg=
 github.com/DataManager-Go/libdatamanager v1.0.10/go.mod h1:iLQrv9tvUkcx9nA+x51eUR9juV0JgIOnFrhPISxWWUE=
-github.com/DataManager-Go/libdatamanager v1.1.14 h1:Mric8SgGRISSp6N+Gl7AvpzLEfSeaAVyL+YnAqOr4d0=
-github.com/DataManager-Go/libdatamanager v1.1.14/go.mod h1:s2ywdIZpWEfgxJ7iMtCOdLCNaHVnO8dr7e9cE2NzgL4=
-github.com/DataManager-Go/libdatamanager/config v0.0.0-20200411170352-eece8060bcb8 h1:MU5d6F7BfvFCRjYuDCfehpamDo5Qm/Pnkmnpqqb+obw=
-github.com/DataManager-Go/libdatamanager/config v0.0.0-20200411170352-eece8060bcb8/go.mod h1:RfoOPe8dQgubuBUmtqEYu1Ny0fT+htZH/ArrEl0dcHQ=
+github.com/DataManager-Go/libdatamanager v1.1.15 h1:6ftBaMXLWD1hlxjylidh578W4afVH8Yb00Va8HYXBeg=
+github.com/DataManager-Go/libdatamanager v1.1.15/go.mod h1:s2ywdIZpWEfgxJ7iMtCOdLCNaHVnO8dr7e9cE2NzgL4=
 github.com/DataManager-Go/libdatamanager/config v0.0.0-20200412231115-a82508b229bb h1:w53VeyM2XITRcIAGf8ArdKy1Q60McFIbuL+Jz4o6HV4=
 github.com/DataManager-Go/libdatamanager/config v0.0.0-20200412231115-a82508b229bb/go.mod h1:RfoOPe8dQgubuBUmtqEYu1Ny0fT+htZH/ArrEl0dcHQ=
 github.com/JojiiOfficial/configService v0.0.0-20200219132202-6e71512e2e28 h1:nYoIExG+Z/gSLS9Jbpu6lnrh+m6e9gTxQfGhanTsExE=