Compare commits
No commits in common. "2932f9bf431ba6f677d7d2f1651f2984cb09df45" and "aad4da307791933f8329ebba061ec9d01a13397c" have entirely different histories.
2932f9bf43
...
aad4da3077
@ -5,7 +5,6 @@ import (
|
||||
"bbash/command/cd"
|
||||
"bbash/command/cp"
|
||||
"bbash/command/echo"
|
||||
"bbash/command/fritiofcommand"
|
||||
"bbash/command/head"
|
||||
"bbash/command/help"
|
||||
"bbash/command/ls"
|
||||
@ -13,7 +12,6 @@ import (
|
||||
"bbash/command/mv"
|
||||
"bbash/command/pwd"
|
||||
"bbash/command/rm"
|
||||
"bbash/command/tail"
|
||||
"bbash/command/touch"
|
||||
"bbash/environment"
|
||||
"bbash/input_parser"
|
||||
@ -38,8 +36,6 @@ func Run_command(in input_parser.Input, env *environment.Env) {
|
||||
pwd.Pwd(in, env)
|
||||
case "echo":
|
||||
echo.Echo(in, env)
|
||||
case "fritiof":
|
||||
fritiofcommand.Fritiof(in, env)
|
||||
case "ls":
|
||||
ls.Ls(in, env)
|
||||
case "cd":
|
||||
@ -60,8 +56,6 @@ func Run_command(in input_parser.Input, env *environment.Env) {
|
||||
mv.Mv(in, env)
|
||||
case "help":
|
||||
help.Help(in, env)
|
||||
case "tail":
|
||||
tail.Tail(in, env)
|
||||
default:
|
||||
if !run_by_path(in, env) {
|
||||
fmt.Println(fmt.Sprintf("No such command! (%s)", in.Instruction))
|
||||
|
||||
@ -6,29 +6,12 @@ import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"os"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func Head(in input_parser.Input, env *environment.Env) {
|
||||
flagsArray := []string{
|
||||
"n ",
|
||||
"help ",
|
||||
}
|
||||
flagsDictionary := map[string]string{
|
||||
"n": "-n displays the line numbers",
|
||||
"help": "-help shows this message",
|
||||
}
|
||||
if slices.Contains(in.Flags, "help") {
|
||||
fmt.Printf("Lists Sources in the current working directory")
|
||||
fmt.Printf("Supported flags are:")
|
||||
for _, flag := range flagsArray {
|
||||
fmt.Println(flag + flagsDictionary[flag])
|
||||
} // Print flags and there description
|
||||
return
|
||||
}
|
||||
args := in.Args
|
||||
args := strings.SplitN(in.Args_raw, " ", 2)
|
||||
var file_path string
|
||||
var lines int
|
||||
if len(args) >= 1 {
|
||||
@ -53,24 +36,15 @@ func Head(in input_parser.Input, env *environment.Env) {
|
||||
}
|
||||
defer file.Close()
|
||||
scanner := bufio.NewScanner(file)
|
||||
if slices.Contains(in.Flags, "n") {
|
||||
var counter int
|
||||
for counter = 0; counter < lines-1; counter++ {
|
||||
if !scanner.Scan() {
|
||||
return
|
||||
}
|
||||
fmt.Println(fmt.Sprintf(strconv.FormatInt(int64(counter), 10) + scanner.Text()))
|
||||
}
|
||||
scanner.Scan()
|
||||
fmt.Print(fmt.Sprintf(strconv.FormatInt(int64(counter), 10) + scanner.Text()))
|
||||
} else {
|
||||
for i := 0; i < lines-1; i++ {
|
||||
if !scanner.Scan() {
|
||||
if(!scanner.Scan()) {
|
||||
return
|
||||
}
|
||||
fmt.Println(scanner.Text())
|
||||
}
|
||||
scanner.Scan()
|
||||
fmt.Print(scanner.Text())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -9,11 +9,11 @@ import (
|
||||
)
|
||||
|
||||
func Ls(in input_parser.Input, env *environment.Env) {
|
||||
flagsArray := []string{
|
||||
flagsArray := []string {
|
||||
"a ",
|
||||
"help ",
|
||||
}
|
||||
flagsDictionary := map[string]string{
|
||||
flagsDictionary := map[string]string {
|
||||
"a": "-a shows hidden directories",
|
||||
"help": "-help shows this message",
|
||||
}
|
||||
@ -22,8 +22,7 @@ func Ls(in input_parser.Input, env *environment.Env) {
|
||||
fmt.Printf("Supported flags are:")
|
||||
for _, flag := range flagsArray {
|
||||
fmt.Println(flag + flagsDictionary[flag])
|
||||
} // Print flags and their description
|
||||
return
|
||||
} // Print flags and there description
|
||||
}
|
||||
fs, err := os.ReadDir(env.Path)
|
||||
if err != nil {
|
||||
|
||||
@ -21,7 +21,7 @@ func Man(in input_parser.Input, env *environment.Env) {
|
||||
case "cat":
|
||||
fmt.Print("Outputs the contents of the given file")
|
||||
case "head":
|
||||
fmt.Print("Outputs first lines of a given file. 10 if none or 0 is provided. Argument <file> <number of lines> \nTakes the flag -n in order to display the line numbers")
|
||||
fmt.Print("Outputs first lines of a given file. 10 if non provided. Argument <file> <number of lines>")
|
||||
case "touch":
|
||||
fmt.Print("Creates the given file")
|
||||
case "rm":
|
||||
@ -30,9 +30,8 @@ func Man(in input_parser.Input, env *environment.Env) {
|
||||
fmt.Print("Copies the given file. Argument: <source> <destination>")
|
||||
case "mv":
|
||||
fmt.Print("Moves a given file. Argument: <source> <destination>")
|
||||
case "tail":
|
||||
fmt.Print("Outputs last lines of a given file. 10 if none or 0 is provided. Argument <file> <number of lines> \nTakes the flag -n in order to display the line numbers")
|
||||
default:
|
||||
fmt.Println(fmt.Sprintf("No such command! (%s)", in.Instruction))
|
||||
default: fmt.Println(fmt.Sprintf("No such command! (%s)", in.Instruction))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,128 +0,0 @@
|
||||
package tail
|
||||
|
||||
import (
|
||||
"bbash/environment"
|
||||
"bbash/input_parser"
|
||||
"bufio"
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"slices"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func Tail(in input_parser.Input, env *environment.Env) {
|
||||
flagsArray := []string{
|
||||
"n ",
|
||||
"help ",
|
||||
}
|
||||
flagsDictionary := map[string]string{
|
||||
"n": "-n displays the line numbers",
|
||||
"help": "-help shows this message",
|
||||
}
|
||||
if slices.Contains(in.Flags, "help") {
|
||||
fmt.Printf("Lists Sources in the current working directory")
|
||||
fmt.Printf("Supported flags are:")
|
||||
for _, flag := range flagsArray {
|
||||
fmt.Println(flag + flagsDictionary[flag])
|
||||
} // Print flags and there description
|
||||
return
|
||||
}
|
||||
args := in.Args
|
||||
var file_path string
|
||||
var lines int
|
||||
if len(args) >= 1 {
|
||||
file_path = strings.TrimSpace(args[0])
|
||||
} else {
|
||||
fmt.Print(fmt.Sprintf("No arguments provided"))
|
||||
return
|
||||
}
|
||||
if len(args) == 2 {
|
||||
lines1, err := strconv.Atoi(strings.TrimSpace(args[1]))
|
||||
lines = lines1
|
||||
if err != nil {
|
||||
fmt.Print(fmt.Sprintf("Second argument must be a integer"))
|
||||
return
|
||||
}
|
||||
}
|
||||
file, err := os.Open(file_path)
|
||||
if err != nil {
|
||||
fmt.Println(fmt.Sprintf("Error opening file: %s", err.Error()))
|
||||
return
|
||||
}
|
||||
defer file.Close()
|
||||
size, err := CountLines(file)
|
||||
file.Seek(0, io.SeekStart)
|
||||
scanner := bufio.NewScanner(file)
|
||||
if lines == 0 {
|
||||
if slices.Contains(in.Flags, "n") {
|
||||
for i := 0; i < size; i++ {
|
||||
if !scanner.Scan() {
|
||||
return
|
||||
}
|
||||
if i >= (size - 10) {
|
||||
fmt.Println(fmt.Sprintf(strconv.FormatInt(int64(i), 10) + scanner.Text()))
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for i := 0; i < size; i++ {
|
||||
if !scanner.Scan() {
|
||||
return
|
||||
}
|
||||
if i >= (size - 10) {
|
||||
fmt.Println(fmt.Sprintf(scanner.Text()))
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if slices.Contains(in.Flags, "n") {
|
||||
var counter int
|
||||
for counter := 0; counter < size-1; counter++ {
|
||||
if !scanner.Scan() {
|
||||
return
|
||||
}
|
||||
if counter >= (size - lines) {
|
||||
fmt.Println(fmt.Sprintf(strconv.FormatInt(int64(counter), 10) + scanner.Text()))
|
||||
}
|
||||
}
|
||||
scanner.Scan()
|
||||
fmt.Print(fmt.Sprintf(strconv.FormatInt(int64(counter), 10) + scanner.Text()))
|
||||
} else {
|
||||
for i := 0; i < size-1; i++ {
|
||||
if !scanner.Scan() {
|
||||
return
|
||||
}
|
||||
if i >= (size - lines) {
|
||||
fmt.Println(fmt.Sprintf(scanner.Text()))
|
||||
}
|
||||
}
|
||||
scanner.Scan()
|
||||
fmt.Print(fmt.Sprintf(scanner.Text()))
|
||||
}
|
||||
}
|
||||
}
|
||||
func CountLines(r io.Reader) (int, error) {
|
||||
var count int
|
||||
var read int
|
||||
var err error
|
||||
var target []byte = []byte("\n")
|
||||
|
||||
buffer := make([]byte, 32*1024)
|
||||
|
||||
for {
|
||||
read, err = r.Read(buffer)
|
||||
if err != nil {
|
||||
break
|
||||
}
|
||||
|
||||
count += bytes.Count(buffer[:read], target)
|
||||
}
|
||||
|
||||
if err == io.EOF {
|
||||
return count, nil
|
||||
}
|
||||
|
||||
return count, err
|
||||
}
|
||||
@ -22,3 +22,6 @@ func Touch(in input_parser.Input, env *environment.Env) {
|
||||
}
|
||||
defer file.Close()
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
package input_parser
|
||||
|
||||
var commandsTab []string
|
||||
var prevInput string
|
||||
var tabIndex int
|
||||
|
||||
func AutoComplete(input string) string {
|
||||
|
||||
inputLength := len(input)
|
||||
|
||||
if inputLength == 0 {
|
||||
return input
|
||||
}
|
||||
|
||||
if tabIndex+2 > len(commandsTab) {
|
||||
tabIndex = -1
|
||||
}
|
||||
|
||||
if prevInput == input {
|
||||
tabIndex = tabIndex + 1
|
||||
|
||||
prevInput = commandsTab[tabIndex]
|
||||
return commandsTab[tabIndex]
|
||||
}
|
||||
|
||||
prevInput = input
|
||||
tabIndex = 0
|
||||
|
||||
currentCommands := []string{
|
||||
"cat",
|
||||
"cd",
|
||||
"cp",
|
||||
"echo",
|
||||
"head",
|
||||
"help",
|
||||
"ls",
|
||||
"man",
|
||||
"mv",
|
||||
"pwd",
|
||||
"rm",
|
||||
"tail",
|
||||
"touch",
|
||||
}
|
||||
|
||||
var commandsWorking []string
|
||||
|
||||
for _, currentCommand := range currentCommands {
|
||||
|
||||
if len(currentCommand) < inputLength {
|
||||
continue
|
||||
}
|
||||
|
||||
currentCommandWithoutEnd := currentCommand[:inputLength]
|
||||
|
||||
if currentCommandWithoutEnd != input {
|
||||
continue
|
||||
}
|
||||
|
||||
commandsWorking = append(commandsWorking, currentCommand)
|
||||
}
|
||||
|
||||
commandsTab = commandsWorking
|
||||
|
||||
if len(commandsTab) == 0 {
|
||||
return input
|
||||
}
|
||||
|
||||
prevInput = commandsTab[0]
|
||||
return commandsTab[0]
|
||||
}
|
||||
@ -25,7 +25,7 @@ func Parse(env *environment.Env) Input {
|
||||
return parse(input)
|
||||
}
|
||||
func parse(input string) Input {
|
||||
split := strings.Split(strings.TrimSpace(string(input)), " ")
|
||||
split := strings.Split(string(input), " ")
|
||||
instruction := strings.TrimSpace(split[0])
|
||||
|
||||
args_raw := ""
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user