t/bbash
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into laukkasBranch

Browse Source 
# Conflicts:
#	input_parser/input_parser.go
This commit is contained in:
Laukka 2025-01-13 14:25:54 +01:00
commit 6c63fc7122
8 changed files with 300 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/command.go
View File

@ -12,6 +12,7 @@ import (
"bbash/command/mv"
"bbash/command/pwd"
"bbash/command/rm"
"bbash/command/tail"
"bbash/command/touch"
"bbash/environment"
"bbash/input_parser"
@ -56,6 +57,8 @@ 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))

50
command/head/head.go
View File

@ -6,12 +6,29 @@ import (
"bufio"
"fmt"
"os"
"slices"
"strconv"
"strings"
)
func Head(in input_parser.Input, env *environment.Env) {
args := strings.SplitN(in.Args_raw, " ", 2)
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 {
@ -20,7 +37,7 @@ func Head(in input_parser.Input, env *environment.Env) {
} else {
fmt.Print(fmt.Sprintf("No arguments provided"))
return
}
}
if len(args) == 2 {
lines1, err := strconv.Atoi(strings.TrimSpace(args[1]))
lines = lines1
@ -28,7 +45,7 @@ func Head(in input_parser.Input, env *environment.Env) {
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()))
@ -36,15 +53,24 @@ func Head(in input_parser.Input, env *environment.Env) {
}
defer file.Close()
scanner := bufio.NewScanner(file)
for i := 0; i < lines-1; i++ {
if(!scanner.Scan()) {
return
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()))
}
fmt.Println(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() {
return
}
fmt.Println(scanner.Text())
}
scanner.Scan()
fmt.Print(scanner.Text())
}
scanner.Scan()
fmt.Print(scanner.Text())
}

11
command/ls/ls.go
View File

@ -9,12 +9,12 @@ import (
)
func Ls(in input_parser.Input, env *environment.Env) {
flagsArray := []string {
"a ",
flagsArray := []string{
"a ",
"help ",
}
flagsDictionary := map[string]string {
"a": "-a shows hidden directories",
flagsDictionary := map[string]string{
"a": "-a shows hidden directories",
"help": "-help shows this message",
}
if slices.Contains(in.Flags, "help") {
@ -22,7 +22,8 @@ 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 there description
} // Print flags and their description
return
}
fs, err := os.ReadDir(env.Path)
if err != nil {

51
command/man/man.go
View File

@ -8,30 +8,31 @@ import (
func Man(in input_parser.Input, env *environment.Env) {
switch in.Args_raw {
case "pwd":
fmt.Print("Output current working directory")
case "echo":
fmt.Print("Echoes the input argument")
case "ls":
fmt.Print("List Sources in the current working directory")
case "cd":
fmt.Print("Change to directory given in the argument")
case "man":
fmt.Print("Manual for the terminal options")
case "cat":
fmt.Print("Outputs the contents of the given file")
case "head":
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":
fmt.Print("Removes the given file")
case "cp":
fmt.Print("Copies the given file. Argument: <source> <destination>")
case "mv":
fmt.Print("Moves a given file. Argument: <source> <destination>")
default: fmt.Println(fmt.Sprintf("No such command! (%s)", in.Instruction))
case "pwd":
fmt.Print("Output current working directory")
case "echo":
fmt.Print("Echoes the input argument")
case "ls":
fmt.Print("List Sources in the current working directory")
case "cd":
fmt.Print("Change to directory given in the argument")
case "man":
fmt.Print("Manual for the terminal options")
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")
case "touch":
fmt.Print("Creates the given file")
case "rm":
fmt.Print("Removes the given file")
case "cp":
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))
}
}

128
command/tail/tail.go Normal file
View File

@ -0,0 +1,128 @@
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
}

3
command/touch/touch.go
View File

@ -22,6 +22,3 @@ func Touch(in input_parser.Input, env *environment.Env) {
}
defer file.Close()
}

70
input_parser/auto_complete.go Normal file
View File

@ -0,0 +1,70 @@
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]
}

58
input_parser/input_parser.go
View File

@ -22,9 +22,9 @@ type Input struct {
func Parse(env *environment.Env) Input {
input := input_str(env)
return parse(input)
return parse_input(input)
}
func parse(input string) Input {
func parse_input(input string) Input {
split := strings.Split(string(input), " ")
instruction := strings.TrimSpace(split[0])
@ -36,11 +36,14 @@ func parse(input string) Input {
var flags []string
var args []string
for _, arg := range split[1:] {
if len(arg) == 1 {
if len(arg) == 0 {
continue
} else if len(arg) == 1 {
if arg[0] == '-' {
continue
} else {
args = append(args, strings.TrimSpace(arg))
}
_ = append(args, string(arg[0]))
} else if arg[0:2] == "--" {
var result = strings.TrimSpace(arg)
flags = append(flags, string(result[2:]))
@ -84,7 +87,7 @@ func input_str(env *environment.Env) string {
for {
r_rune, _, err := reader.ReadRune()
if err != nil {
fmt.Print(fmt.Sprintf("Error reading user input: %s", err.Error()))
fmt.Print(fmt.Sprintf("Error reading user input: ", err.Error()))
}
switch r_rune {
case 3: // ^C
@ -93,32 +96,27 @@ func input_str(env *environment.Env) string {
case 4: // ^D
input = "exit"
goto loop_exit
case 27: // UPP
if r, _, _ := reader.ReadRune(); r != 91 {
case 9: // Tab
input = AutoComplete(input)
case 91:
if r, _, _ := reader.ReadRune(); r == 65 { // UPP
if history_index > 0 {
history_index--
input = env.History[history_index]
}
break
}
if r, _, _ := reader.ReadRune(); r != 66 { //DOWN
if history_index < len(env.History)-2 {
history_index++
input = env.History[history_index]
} else {
input = ""
}
break
}
case 66: // DOWN
if history_index < len(env.History)-2 {
history_index++
input = env.History[history_index]
} else {
history_index = len(env.History) - 1
input = ""
if r, _, _ := reader.ReadRune(); r == 65 { // UPP
if history_index > 0 {
history_index--
input = env.History[history_index]
}
}
if r, _, _ := reader.ReadRune(); r != 66 { //DOWN
if history_index < len(env.History)-1 {
history_index++
input = env.History[history_index]
} else {
input = ""
}
}
}
case 127: //packspace
if len(input) > 0 {
input = input[:len(input)-1]
@ -129,9 +127,11 @@ func input_str(env *environment.Env) string {
input = input + string(r_rune)
}
env.History[len(env.History)-1] = input
fmt.Print("\r")
fmt.Print("\r\033[K")
fmt.Print(env.Path)
fmt.Print(" > ")
fmt.Print("\033[K")
fmt.Print(input)
}
loop_exit: