Add human-readable format flag

Author: alexvitayu

bin/hexlet-path-size

@@ -11,16 +11,33 @@ import (
 )
 
 func main() {
-
 	cmd := &cli.Command{
-		Name:  "hexlet-path-size",
-		Usage: "print size of a file or directory;",
+		UseShortOptionHandling: true,
+		Name:                   "hexlet-path-size",
+		Usage:                  "print size of a file or directory;",
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:    "human",
+				Aliases: []string{"H"},
+				Value:   false,
+				Usage:   "human-readable sizes (auto-select unit)"},
+		},
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			path := "." //default value
+			if cmd.Args().Len() > 0 {
+				path = cmd.Args().Get(0)
+			}
+			h := cmd.Bool("human")
+			size, err := goproject242.GetSize(path, h)
+			if err != nil {
+				log.Println(err.Error())
+			}
+			fmt.Println(size)
+			return nil
+		},
 	}
 
 	if err := cmd.Run(context.Background(), os.Args); err != nil {
 		log.Fatal(err)
-		path := os.Args[1]
-		fmt.Println(goproject242.GetSize(path))
 	}
-
 }

cmd/hexlet-path-size/main.go

@@ -1,28 +1,14 @@
 package goproject242
 
 import (
-	"context"
 	"errors"
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
-
-	"github.com/urfave/cli/v3"
+	"strconv"
 )
 
-func Help() {
-	cmd := &cli.Command{
-		Name:  "hexlet-path-size",
-		Usage: "print size of a file or directory;",
-	}
-
-	if err := cmd.Run(context.Background(), os.Args); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func GetSize(path string) (string, error) {
+func GetSize(path string, human bool) (string, error) {
 	if path == "" {
 		return "", errors.New("не указан путь")
 	}
@@ -35,7 +21,8 @@ func GetSize(path string) (string, error) {
 		if err != nil {
 			return "", errors.New("не удалось получить информацию о файле")
 		}
-		return fmt.Sprintf("%vB\t%s", i.Size(), path), nil
+		//return fmt.Sprintf("%vB\t%s", i.Size(), path), nil
+		return fmt.Sprintf("%v\t%s", FormatSize(i.Size(), human), path), nil
 	}
 
 	var sum int64
@@ -53,5 +40,29 @@ func GetSize(path string) (string, error) {
 			sum += stat.Size()
 		}
 	}
-	return fmt.Sprintf("%vB\t%s", sum, path), nil
+	//return fmt.Sprintf("%vB\t%s", sum, path), nil
+	return fmt.Sprintf("%v\t%s", FormatSize(sum, human), path), nil
+}
+
+func FormatSize(size int64, human bool) string {
+	if human {
+		str := strconv.Itoa(int(size))
+		switch {
+		case len(str) <= 3:
+			return fmt.Sprintf("%vB", size)
+		case len(str) > 3 && len(str) <= 6:
+			return fmt.Sprintf("%.1fKB", float64(size)/1000)
+		case len(str) >= 7 && len(str) < 10:
+			return fmt.Sprintf("%.1fMB", float64(size)/1000000)
+		case len(str) >= 10 && len(str) < 13:
+			return fmt.Sprintf("%.1fGB", float64(size)/1000000000)
+		case len(str) >= 13 && len(str) < 16:
+			return fmt.Sprintf("%.1fTB", float64(size)/1000000000000)
+		case len(str) >= 16 && len(str) < 19:
+			return fmt.Sprintf("%.1fPB", float64(size)/1000000000000000)
+		default:
+			return fmt.Sprintf("%.1fEB", float64(size)/1000000000000000000)
+		}
+	}
+	return fmt.Sprintf("%vB", size)
 }

path_size.go

@@ -2,6 +2,7 @@ package goproject242
 
 import (
 	"errors"
+	"reflect"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -12,37 +13,42 @@ var testCases = []struct {
 	path_file string
 	expect    string
 	err       error
+	human     bool
 }{
 	{
 		name:      "Path-file",
 		path_file: "testdata/text.txt",
 		expect:    "23B\ttestdata/text.txt",
 		err:       nil,
+		human:     true,
 	},
 	{
 		name:      "Path-directory",
 		path_file: "testdata",
-		expect:    "82B\ttestdata",
+		expect:    "8939B\ttestdata",
 		err:       nil,
+		human:     false,
 	},
 	{
 		name:      "Empty path",
 		path_file: "",
 		expect:    "",
 		err:       errors.New("не указан путь"),
+		human:     true,
 	},
 	{
 		name:      "Wrong path",
 		path_file: "testdata/text.txttt",
 		expect:    "",
 		err:       errors.New("не удалось прочитать путь к файлу или директории"),
+		human:     true,
 	},
 }
 
 func TestGetSize(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			got, err := GetSize(tc.path_file)
+			got, err := GetSize(tc.path_file, tc.human)
 			if tc.err != nil {
 				if err.Error() != tc.err.Error() {
 					t.Errorf("ожидали %v, получили %v", tc.err.Error(), err.Error())
@@ -62,3 +68,38 @@ func TestGetSize(t *testing.T) {
 		})
 	}
 }
+
+var testCases2 = []struct {
+	name   string
+	size   []int64
+	human  bool
+	expect []string
+}{
+	{
+		name:   "nonHumanReadable",
+		size:   []int64{123, 10000, 500000},
+		human:  false,
+		expect: []string{"123B", "10000B", "500000B"},
+	},
+	{
+		name:   "HumanReadable",
+		size:   []int64{123, 10000, 999800, 11000000820},
+		human:  true,
+		expect: []string{"123B", "10.0KB", "999.8KB", "11.0GB"},
+	},
+}
+
+func TestFormatSize(t *testing.T) {
+	for _, tc := range testCases2 {
+		t.Run(tc.name, func(t *testing.T) {
+			var got []string
+			for _, s := range tc.size {
+				size := FormatSize(s, tc.human)
+				got = append(got, size)
+			}
+			if !reflect.DeepEqual(got, tc.expect) {
+				t.Errorf("ожидали %v, получили %v", tc.expect, got)
+			}
+		})
+	}
+}

path_size_test.go

@@ -0,0 +1,122 @@
+Individual utilities
+* arch: (coreutils)arch invocation.             Print machine hardware name.
+* b2sum: (coreutils)b2sum invocation.           Print or check BLAKE2 digests.
+* base32: (coreutils)base32 invocation.         Base32 encode/decode data.
+* base64: (coreutils)base64 invocation.         Base64 encode/decode data.
+* basename: (coreutils)basename invocation.     Strip directory and suffix.
+* basenc: (coreutils)basenc invocation.         Encoding/decoding of data.
+* cat: (coreutils)cat invocation.               Concatenate and write files.
+* chcon: (coreutils)chcon invocation.           Change SELinux CTX of files.
+* chgrp: (coreutils)chgrp invocation.           Change file groups.
+* chmod: (coreutils)chmod invocation.           Change access permissions.
+* chown: (coreutils)chown invocation.           Change file owners and groups.
+* chroot: (coreutils)chroot invocation.         Specify the root directory.
+* cksum: (coreutils)cksum invocation.           Print POSIX CRC checksum.
+* cmp: (diffutils)Invoking cmp.                 Compare 2 files byte by byte.
+* comm: (coreutils)comm invocation.             Compare sorted files by line.
+* cp: (coreutils)cp invocation.                 Copy files.
+* csplit: (coreutils)csplit invocation.         Split by context.
+* cut: (coreutils)cut invocation.               Print selected parts of lines.
+* date: (coreutils)date invocation.             Print/set system date and time.
+* dd: (coreutils)dd invocation.                 Copy and convert a file.
+* df: (coreutils)df invocation.                 Report file system usage.
+* diff: (diffutils)Invoking diff.               Compare 2 files line by line.
+* diff3: (diffutils)Invoking diff3.             Compare 3 files line by line.
+* dir: (coreutils)dir invocation.               List directories briefly.
+* dircolors: (coreutils)dircolors invocation.   Color setup for ls.
+* dirname: (coreutils)dirname invocation.       Strip last file name component.
+* du: (coreutils)du invocation.                 Report file usage.
+* echo: (coreutils)echo invocation.             Print a line of text.
+* env: (coreutils)env invocation.               Modify the environment.
+* expand: (coreutils)expand invocation.         Convert tabs to spaces.
+* expr: (coreutils)expr invocation.             Evaluate expressions.
+* factor: (coreutils)factor invocation.         Print prime factors
+* false: (coreutils)false invocation.           Do nothing, unsuccessfully.
+* find: (find)Finding Files.                    Finding and acting on files.
+* fmt: (coreutils)fmt invocation.               Reformat paragraph text.
+* fold: (coreutils)fold invocation.             Wrap long input lines.
+* groups: (coreutils)groups invocation.         Print group names a user is in.
+* gunzip: (gzip)Overview.                       Decompression.
+* gzexe: (gzip)Overview.                        Compress executables.
+* head: (coreutils)head invocation.             Output the first part of files.
+* hostid: (coreutils)hostid invocation.         Print numeric host identifier.
+* hostname: (coreutils)hostname invocation.     Print or set system name.
+* id: (coreutils)id invocation.                 Print user identity.
+* install: (coreutils)install invocation.       Copy files and set attributes.
+* join: (coreutils)join invocation.             Join lines on a common field.
+* kill: (coreutils)kill invocation.             Send a signal to processes.
+* link: (coreutils)link invocation.             Make hard links between files.
+* ln: (coreutils)ln invocation.                 Make links between files.
+* locate: (find)Invoking locate.                Finding files in a database.
+* logname: (coreutils)logname invocation.       Print current login name.
+* ls: (coreutils)ls invocation.                 List directory contents.
+* md5sum: (coreutils)md5sum invocation.         Print or check MD5 digests.
+* mkdir: (coreutils)mkdir invocation.           Create directories.
+* mkfifo: (coreutils)mkfifo invocation.         Create FIFOs (named pipes).
+* mknod: (coreutils)mknod invocation.           Create special files.
+* mktemp: (coreutils)mktemp invocation.         Create temporary files.
+* mv: (coreutils)mv invocation.                 Rename files.
+* nice: (coreutils)nice invocation.             Modify niceness.
+* nl: (coreutils)nl invocation.                 Number lines and write files.
+* nohup: (coreutils)nohup invocation.           Immunize to hangups.
+* nproc: (coreutils)nproc invocation.           Print the number of processors.
+* numfmt: (coreutils)numfmt invocation.         Reformat numbers.
+* od: (coreutils)od invocation.                 Dump files in octal, etc.
+* paste: (coreutils)paste invocation.           Merge lines of files.
+* patch: (diffutils)Invoking patch.             Apply a patch to a file.
+* pathchk: (coreutils)pathchk invocation.       Check file name portability.
+* pinky: (coreutils)pinky invocation.           Print information about users.
+* pr: (coreutils)pr invocation.                 Paginate or columnate files.
+* printenv: (coreutils)printenv invocation.     Print environment variables.
+* printf: (coreutils)printf invocation.         Format and print data.
+* ptx: (coreutils)ptx invocation.               Produce permuted indexes.
+* pwd: (coreutils)pwd invocation.               Print working directory.
+* readlink: (coreutils)readlink invocation.     Print referent of a symlink.
+* realpath: (coreutils)realpath invocation.     Print resolved file names.
+* rm: (coreutils)rm invocation.                 Remove files.
+* rmdir: (coreutils)rmdir invocation.           Remove empty directories.
+* runcon: (coreutils)runcon invocation.         Run in specified SELinux CTX.
+* sdiff: (diffutils)Invoking sdiff.             Merge 2 files side-by-side.
+* seq: (coreutils)seq invocation.               Print numeric sequences
+* sha1sum: (coreutils)sha1sum invocation.       Print or check SHA-1 digests.
+* sha2: (coreutils)sha2 utilities.              Print or check SHA-2 digests.
+* shred: (coreutils)shred invocation.           Remove files more securely.
+* shuf: (coreutils)shuf invocation.             Shuffling text files.
+* sleep: (coreutils)sleep invocation.           Delay for a specified time.
+* sort: (coreutils)sort invocation.             Sort text files.
+* split: (coreutils)split invocation.           Split into pieces.
+* stat: (coreutils)stat invocation.             Report file(system) status.
+* stdbuf: (coreutils)stdbuf invocation.         Modify stdio buffering.
+* stty: (coreutils)stty invocation.             Print/change terminal settings.
+* sum: (coreutils)sum invocation.               Print traditional checksum.
+* sync: (coreutils)sync invocation.             Sync files to stable storage.
+* tac: (coreutils)tac invocation.               Reverse files.
+* tail: (coreutils)tail invocation.             Output the last part of files.
+* tee: (coreutils)tee invocation.               Redirect to multiple files.
+* test: (coreutils)test invocation.             File/string tests.
+* timeout: (coreutils)timeout invocation.       Run with time limit.
+* touch: (coreutils)touch invocation.           Change file timestamps.
+* tr: (coreutils)tr invocation.                 Translate characters.
+* true: (coreutils)true invocation.             Do nothing, successfully.
+* truncate: (coreutils)truncate invocation.     Shrink/extend size of a file.
+* tsort: (coreutils)tsort invocation.           Topological sort.
+* tty: (coreutils)tty invocation.               Print terminal name.
+* uname: (coreutils)uname invocation.           Print system information.
+* unexpand: (coreutils)unexpand invocation.     Convert spaces to tabs.
+* uniq: (coreutils)uniq invocation.             Uniquify files.
+* unlink: (coreutils)unlink invocation.         Removal via unlink(2).
+* updatedb: (find)Invoking updatedb.            Building the locate database.
+* uptime: (coreutils)uptime invocation.         Print uptime and load.
+* users: (coreutils)users invocation.           Print current user names.
+* vdir: (coreutils)vdir invocation.             List directories verbosely.
+* wc: (coreutils)wc invocation.                 Line, word, and byte counts.
+* who: (coreutils)who invocation.               Print who is logged in.
+* whoami: (coreutils)whoami invocation.         Print effective user ID.
+* xargs: (find)Invoking xargs.                  Operating on many files.
+* yes: (coreutils)yes invocation.               Print a string indefinitely.
+* zcat: (gzip)Overview.                         Decompression to stdout.
+* zdiff: (gzip)Overview.                        Compare compressed files.
+* zforce: (gzip)Overview.                       Force .gz extension on files.
+* zgrep: (gzip)Overview.                        Search compressed files.
+* zmore: (gzip)Overview.                        Decompression output by pages.
+