MQP/jsh
Archived
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Feature/ls internal structure

See merge request !7
This commit is contained in:
Fredric Silberberg 2014-10-14 16:52:08 -04:00
commit 418be9217b
3 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
Makefile
View File

@ -1,57 +1,57 @@
# Go parameters # Go parameters
GOCMD=go GOCMD=go
GOBUILD=$(GOCMD) build GOBUILD=$(GOCMD) build
GOCLEAN=$(GOCMD) clean GOCLEAN=$(GOCMD) clean
GOINSTALL=$(GOCMD) install GOINSTALL=$(GOCMD) install
GOTEST=$(GOCMD) test GOTEST=$(GOCMD) test
GODEP=$(GOTEST) -i GODEP=$(GOTEST) -i
GOFMT=gofmt -w GOFMT=gofmt -w
GOCOVER=$(GOCMD) tool cover GOCOVER=$(GOCMD) tool cover
COVER_DIR=cover COVER_DIR=cover
# Package lists # Package lists
TOPLEVEL_PKG := jsh 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 # List building
ALL_LIST = $(TOPLEVEL_PKG) $(CMD_LIST) ALL_LIST = $(TOPLEVEL_PKG) $(CMD_LIST)
BUILD_LIST = $(foreach int, $(ALL_LIST), $(int)_build) BUILD_LIST = $(foreach int, $(ALL_LIST), $(int)_build)
CLEAN_LIST = $(foreach int, $(ALL_LIST), $(int)_clean) CLEAN_LIST = $(foreach int, $(ALL_LIST), $(int)_clean)
INSTALL_LIST = $(foreach int, $(ALL_LIST), $(int)_install) INSTALL_LIST = $(foreach int, $(ALL_LIST), $(int)_install)
IREF_LIST = $(foreach int, $(ALL_LIST), $(int)_iref) IREF_LIST = $(foreach int, $(ALL_LIST), $(int)_iref)
TEST_LIST = $(foreach int, $(ALL_LIST), $(int)_test) TEST_LIST = $(foreach int, $(ALL_LIST), $(int)_test)
COVER_LIST = $(foreach int, $(ALL_LIST), $(int)_cover) COVER_LIST = $(foreach int, $(ALL_LIST), $(int)_cover)
FMT_TEST = $(foreach int, $(ALL_LIST), $(int)_fmt) FMT_TEST = $(foreach int, $(ALL_LIST), $(int)_fmt)
# All are .PHONY for now because dependencyness is hard # All are .PHONY for now because dependencyness is hard
.PHONY: $(CLEAN_LIST) $(TEST_LIST) $(FMT_LIST) $(INSTALL_LIST) $(BUILD_LIST) $(IREF_LIST) .PHONY: $(CLEAN_LIST) $(TEST_LIST) $(FMT_LIST) $(INSTALL_LIST) $(BUILD_LIST) $(IREF_LIST)
all: install all: install
build: $(BUILD_LIST) build: $(BUILD_LIST)
clean: $(CLEAN_LIST) clean: $(CLEAN_LIST)
rm -rf $(COVER_DIR) rm -rf $(COVER_DIR)
install: $(INSTALL_LIST) install: $(INSTALL_LIST)
test: $(TEST_LIST) test: $(TEST_LIST)
cover: $(COVER_LIST) cover: $(COVER_LIST)
echo "Output in directory: $(COVER_DIR)" echo "Output in directory: $(COVER_DIR)"
iref: $(IREF_LIST) iref: $(IREF_LIST)
fmt: $(FMT_TEST) fmt: $(FMT_TEST)
$(BUILD_LIST): %_build: %_fmt %_iref $(BUILD_LIST): %_build: %_fmt %_iref
$(GOBUILD) $* $(GOBUILD) $*
$(CLEAN_LIST): %_clean: $(CLEAN_LIST): %_clean:
$(GOCLEAN) $* $(GOCLEAN) $*
$(INSTALL_LIST): %_install: %_fmt %_iref $(INSTALL_LIST): %_install: %_fmt %_iref
$(GOINSTALL) $* $(GOINSTALL) $*
$(IREF_LIST): %_iref: $(IREF_LIST): %_iref:
$(GODEP) $* $(GODEP) $*
$(TEST_LIST): %_test: $(TEST_LIST): %_test:
$(GOTEST) $* $(GOTEST) $*
$(COVER_LIST): %_cover: $(COVER_LIST): %_cover:
mkdir -p $(COVER_DIR)/$* mkdir -p $(COVER_DIR)/$*
$(GOTEST) -coverprofile=$(COVER_DIR)/$*/c.out $* $(GOTEST) -coverprofile=$(COVER_DIR)/$*/c.out $*
$(GOCOVER) -html=$(COVER_DIR)/$*/c.out -o $(COVER_DIR)/$*/index.html $(GOCOVER) -html=$(COVER_DIR)/$*/c.out -o $(COVER_DIR)/$*/index.html
rm -f $(COVER_DIR)/$*/c.out rm -f $(COVER_DIR)/$*/c.out
$(FMT_TEST): %_fmt: $(FMT_TEST): %_fmt:
[ -d ./$* ] && $(GOFMT) ./$* || $(GOFMT) . [ -d ./$* ] && $(GOFMT) ./$* || $(GOFMT) .

14
files.go Normal file
View File

@ -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
}

98
ls/main.go
View File

@ -4,72 +4,58 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"jsh"
"log" "log"
"strconv"
"syscall" "syscall"
) )
func get_fileinfo(f string, size bool, mode bool, inode bool) string { // func get_fileinfo(f string) 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 main() { // ret = ret + ", \"size\":" + strconv.FormatInt(stat.Size, 10)
// here be the ls flags // ret = ret + ", \"mode\":" + strconv.Itoa(int(stat.Mode))
// ret = ret + ", \"inode\":" + strconv.FormatUint(stat.Ino, 10)
var a_flag bool // all files, even ones starting with . // ret = ret + "}]}"
var mode_flag bool // flags // return ret
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
func listFiles(queue chan *jsh.JshFrame) {
flag.Parse() flag.Parse()
root := "." //flag.Arg(0) root := "." //flag.Arg(0)
dir, _ := ioutil.ReadDir(root) dir, _ := ioutil.ReadDir(root)
for _, entry := range dir {
fmt.Printf("[{\"StdOut\": [\n") var stat syscall.Stat_t
if err := syscall.Stat(entry.Name(), &stat); err != nil {
if !a_flag { log.Fatal(err)
for _, entry := range dir {
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))
}
} }
} else { if entry.Name()[0] != '.' {
for _, entry := range dir { output := jsh.File{}
if !first { output.Name = entry.Name()
fmt.Printf(",") output.Size = int(stat.Size)
} else { output.Mode = int(stat.Mode)
first = false output.Inode = stat.Ino
} frame := jsh.JshFrame{output, ""}
fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag)) queue <- &frame
} }
} }
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()
}
} }