Merge branch 'feature/ls-internal-structure' into 'master'

Feature/ls internal structure

See merge request !7

Makefile

@@ -11,7 +11,7 @@ COVER_DIR=cover
 
 # Package lists
 TOPLEVEL_PKG := jsh
-CMD_LIST := jsh/ps jsh/free jsh/ls
+CMD_LIST := jsh/ps jsh/free jsh/ls jsh/cat jsh/df
 
 # List building
 ALL_LIST = $(TOPLEVEL_PKG) $(CMD_LIST)

files.go

@@ -0,0 +1,14 @@
+package jsh
+
+type File struct {
+	Name  string
+	Size  int
+	Mode  int
+	Inode uint64
+}
+
+type Permission struct {
+	Read    bool
+	Write   bool
+	Execute bool
+}

ls/main.go

@@ -4,72 +4,58 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"jsh"
 	"log"
-	"strconv"
 	"syscall"
 )
 
-func get_fileinfo(f string, size bool, mode bool, inode bool) string {
-	var stat syscall.Stat_t
-	var ret string
-	ret = "{\"files\": [{\"name\":\"" + f + "\""
-	if err := syscall.Stat(f, &stat); err != nil {
-		log.Fatal(err)
-	}
-	if size {
-		ret = ret + ", \"size\":" + strconv.FormatInt(stat.Size, 10)
-	}
-	if mode {
-		ret = ret + ", \"mode\":" + strconv.Itoa(int(stat.Mode))
-	}
-	if inode {
-		ret = ret + ", \"inode\":" + strconv.FormatUint(stat.Ino, 10)
-	}
-	ret = ret + "}]}"
-	return ret
-}
+// func get_fileinfo(f string) string {
 
-func main() {
-	// here be the ls flags
-
-	var a_flag bool     // all files, even ones starting with .
-	var mode_flag bool  // flags
-	var inode_flag bool // inode
-	var size_flag bool  // size
-	var first = true
-
-	flag.BoolVar(&a_flag, "a", false, "lists all files in directory, even hidden ones")
-	flag.BoolVar(&mode_flag, "f", false, "include flags for file")
-	flag.BoolVar(&inode_flag, "i", false, "include flags for file")
-	flag.BoolVar(&size_flag, "s", false, "include flags for file")
-	// end ls flag
+// 	ret = ret + ", \"size\":" + strconv.FormatInt(stat.Size, 10)
+// 	ret = ret + ", \"mode\":" + strconv.Itoa(int(stat.Mode))
+// 	ret = ret + ", \"inode\":" + strconv.FormatUint(stat.Ino, 10)
+// 	ret = ret + "}]}"
+// 	return ret
+// }
 
+func listFiles(queue chan *jsh.JshFrame) {
 	flag.Parse()
 	root := "." //flag.Arg(0)
 	dir, _ := ioutil.ReadDir(root)
-
-	fmt.Printf("[{\"StdOut\": [\n")
-
-	if !a_flag {
 	for _, entry := range dir {
+		var stat syscall.Stat_t
+		if err := syscall.Stat(entry.Name(), &stat); err != nil {
+			log.Fatal(err)
+		}
 		if entry.Name()[0] != '.' {
-				if !first {
-					fmt.Printf(",")
-				} else {
-					first = false
-				}
-				fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag))
+			output := jsh.File{}
+			output.Name = entry.Name()
+			output.Size = int(stat.Size)
+			output.Mode = int(stat.Mode)
+			output.Inode = stat.Ino
+			frame := jsh.JshFrame{output, ""}
+			queue <- &frame
 		}
 	}
-	} else {
-		for _, entry := range dir {
-			if !first {
-				fmt.Printf(",")
-			} else {
-				first = false
-			}
-			fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag))
-		}
-	}
-	fmt.Printf("], \"StdErr\": []}]\n")
+}
+
+func runJsonMode() {
+	queue := make(chan *jsh.JshFrame)
+	done := make(chan bool)
+	go jsh.OutputFrames(queue, done)
+	listFiles(queue)
+	close(queue)
+	<-done
+}
+
+func main() {
+	// TODO: Support more flags
+	jsonModePtr := flag.Bool("json", false, "whether to use json mode for input and output")
+	flag.Parse()
+
+	if !*jsonModePtr {
+		fmt.Printf("%s", jsh.FallbackWithArgs("ls", flag.Args()))
+	} else {
+		runJsonMode()
+	}
 }