refactor(transfer data): use helper function

Author: amirzayi

client/client.go

@@ -6,7 +6,6 @@ import (
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
-	"io"
 	"net"
 	"os"
 	"path/filepath"
@@ -59,36 +58,18 @@ func receiveFile(conn net.Conn, file config.File, savePath string, fileID, progr
 	}
 	defer f.Close()
 
-	shortedFileName := utils.ShortedString(file.Name, 10, 6, 4)
-
-	buffer := make([]byte, config.DefaultChunkSize)
-	var totalBytesRead, totalBytesWritten int64
-	byteToRead := config.DefaultChunkSize
-
-	for totalBytesRead < file.Size {
-		if config.DefaultChunkSize > file.Size-totalBytesRead {
-			byteToRead = int(file.Size - totalBytesRead)
-		}
-		n, err := io.ReadFull(conn, buffer[:byteToRead])
-		if err != nil {
-			return fmt.Errorf("failed to read buffer from network, %v", err)
-		}
-
-		m, err := f.Write(buffer[:n])
-		if err != nil {
-			return fmt.Errorf("failed to write buffer into file, %v", err)
-		}
-
-		totalBytesRead += int64(n)
-		if !silentTransfer {
-			totalBytesWritten += int64(m)
-			receivedPercent := int(totalBytesWritten * 100 / file.Size)
-			utils.DrawProgressBar(receivedPercent, progressbarWidth, shortedFileName)
-		}
+	if silentTransfer {
+		return utils.WriteFromReader(conn, f, file.Size, config.DefaultBufferSize)
 	}
-	if !silentTransfer {
-		fmt.Printf("\r[%d] %s ✓%s\n", fileID, file.Name, strings.Repeat(" ", progressbarWidth))
+
+	shortedFileName := utils.ShortedString(file.Name, 10, 8, 3)
+	fileSize := utils.ConvertByteSizeToHumanReadable(float64(file.Size))
+	barTitle := fmt.Sprintf("<%s ^ %s>", fileSize, shortedFileName)
+	if err = utils.DrawRWProgressbar(conn, f, file.Size, config.DefaultBufferSize, progressbarWidth, barTitle); err != nil {
+		return err
 	}
+	fmt.Printf("\r[%d] %s ✓%s\n", fileID, file.Name, strings.Repeat(" ", progressbarWidth))
+
 	return nil
 }
 

cmd/root.go

@@ -15,6 +15,10 @@ var rootCmd = &cobra.Command{
 	Short: "relay is an CLI application wich provide transfer files over network.",
 	Long: `relay is a CLI application for transferring files over network(local or global).
 This application will transfer folders within files as exists in source machine.
+credit: Amir Mirzaei 
+mirzayi994@gmail.com
+https://github.com/AmirMirzayi
+https://www.linkedin.com/in/amir-mirzaei
 	`,
 }
 

config/config.go

@@ -12,7 +12,7 @@ import (
 const (
 	DefaultPort             = 55555
 	DefaultTimeout          = 30 * time.Second
-	DefaultChunkSize        = 1024 * 1024
+	DefaultBufferSize       = 1024 * 1024
 	DefaultProgressbarWidth = 25
 	DefaultSilent           = false
 )

host/host.go

@@ -5,13 +5,10 @@ package host
 import (
 	"encoding/binary"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"io"
 	"net"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/AmirMirzayi/relay/config"
@@ -20,8 +17,8 @@ import (
 
 // Serve starts a file transfer server that listens on the specified IP and port.
 // It serves files located at the provided paths to connected clients.
-func Serve(ip net.IP, port, progressbarWidth int, timeout time.Duration, silentTransfer bool, pathes ...string) error {
-	files, err := getFilesByPathes(pathes...)
+func Serve(ip net.IP, port, progressbarWidth int, timeout time.Duration, silentTransfer bool, paths ...string) error {
+	files, err := getFilesByPaths(paths...)
 	if err != nil {
 		return err
 	}
@@ -53,12 +50,12 @@ func Serve(ip net.IP, port, progressbarWidth int, timeout time.Duration, silentT
 	return nil
 }
 
-func getFilesByPathes(pathes ...string) (config.Files, error) {
+func getFilesByPaths(paths ...string) (config.Files, error) {
 	// preallocate files to args lengths
 	// but, what if an arg was directory
-	files := make(config.Files, 0, len(pathes))
+	files := make(config.Files, 0, len(paths))
 
-	for _, path := range pathes {
+	for _, path := range paths {
 		fileInfo, err := os.Stat(path)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read information of %s, %v", path, err)
@@ -108,33 +105,17 @@ func sendFile(conn net.Conn, file config.File, fileID, progressbarWidth int, sil
 	}
 	defer f.Close()
 
-	shortedFileName := utils.ShortedString(file.Name, 10, 7, 4)
-
-	var totalByteSent int64
-	buffer := make([]byte, config.DefaultChunkSize)
-	for {
-		n, err := f.Read(buffer)
-		if err != nil {
-			if errors.Is(err, io.EOF) {
-				break
-			}
-			return fmt.Errorf("failed to buffering file %s, %v", file.Path, err)
-		}
-
-		byteSent, err := conn.Write(buffer[:n])
-		if err != nil {
-			return fmt.Errorf("failed to write over network, %v", err)
-		}
-
-		if !silentTransfer {
-			totalByteSent += int64(byteSent)
-			sentPercent := int(totalByteSent * 100 / file.Size)
-			utils.DrawProgressBar(sentPercent, progressbarWidth, shortedFileName)
-		}
+	if silentTransfer {
+		return utils.WriteFromReader(f, conn, file.Size, config.DefaultBufferSize)
 	}
-	if !silentTransfer {
-		fmt.Printf("\r[%d] %s ✓%s\n", fileID, file.Name, strings.Repeat(" ", progressbarWidth))
+
+	shortedFileName := utils.ShortedString(file.Name, 10, 8, 3)
+	fileSize := utils.ConvertByteSizeToHumanReadable(float64(file.Size))
+	barTitle := fmt.Sprintf("<%s ^ %s>", fileSize, shortedFileName)
+	if err = utils.DrawRWProgressbar(f, conn, file.Size, config.DefaultBufferSize, progressbarWidth, barTitle); err != nil {
+		return err
 	}
+	fmt.Printf("\r[%d] %s ✓\033[K\n", fileID, file.Name)
 	return nil
 }
 
@@ -147,7 +128,7 @@ func readDirectoryFilesRecursively(path string, parents ...string) (config.Files
 
 	var files []config.File
 
-	// we need to sepereate files and directories iteration over entries because of confusation
+	// we need to separate files and directories iteration over entries because of confusing
 	for _, entry := range entries {
 		if entry.IsDir() {
 			continue

utils/io.go

@@ -0,0 +1,42 @@
+package utils
+
+import (
+	"fmt"
+	"io"
+)
+
+// DrawRWProgressbar reads data from an io.Reader and writes it to an io.Writer with buffering while displaying a progress bar.
+func DrawRWProgressbar(r io.Reader, w io.Writer, size, bufferSize int64, barSize int, barTitle string) error {
+	lr := io.LimitReader(r, size)
+	rw := io.TeeReader(lr, w)
+
+	buffer := make([]byte, bufferSize)
+	syncedBytes := int64(0)
+	for syncedBytes < size {
+		n, err := rw.Read(buffer)
+		if err != nil {
+			return fmt.Errorf("failed to sync buffer between network and disk: %v", err)
+		}
+
+		syncedBytes += int64(n)
+		donePercent := int(syncedBytes * 100 / size)
+		drawProgressBar(donePercent, barSize, barTitle)
+	}
+	return nil
+}
+
+// WriteFromReader reads data from an io.Reader and writes it to an io.Writer with buffering.
+func WriteFromReader(r io.Reader, w io.Writer, size, bufferSize int64) error {
+	lr := io.LimitReader(r, size)
+	rw := io.TeeReader(lr, w)
+
+	buffer := make([]byte, bufferSize)
+	totalBytesRead := int64(0)
+	for totalBytesRead < size {
+		_, err := rw.Read(buffer)
+		if err != nil && err != io.EOF {
+			return fmt.Errorf("failed to sync buffer between network and disk: %v", err)
+		}
+	}
+	return nil
+}

utils/progressbar.go

@@ -5,11 +5,10 @@ import (
 	"strings"
 )
 
-func DrawProgressBar(percent, width int, fileName string) {
+// drawProgressBar draw percentage progress bar
+func drawProgressBar(percent, width int, barName string) {
+	progress := strings.Repeat("", 100-percent/(100/width))
+	progress += strings.Repeat("█", percent/(100/width))
 
-	// draw transferred data progress bar
-	progressBar := strings.Repeat("", 100-percent/(100/width))
-	progressBar += strings.Repeat("█", percent/(100/width))
-
-	fmt.Printf("\r%d%% [%-*s] %s", percent, width, progressBar, fileName)
+	fmt.Printf("\r%d%% |%-*s| %s", percent, width, progress, barName)
 }