flatface.go: return to current menu after action

This commit is contained in:
mollusk 2018-01-03 00:54:49 -07:00
parent 099312acce
commit 95ac849fba

View File

@ -9,11 +9,11 @@ import (
) )
func input(s string) (string, error) { func input(s string) (string, error) {
stdin_buf := bufio.NewReader(os.Stdin) stdinBuf := bufio.NewReader(os.Stdin)
fmt.Print(s) fmt.Print(s)
text, err := stdin_buf.ReadString('\n') text, err := stdinBuf.ReadString('\n')
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -24,12 +24,12 @@ func searchRepo() {
print("\n| Search Repositories |\n\n") print("\n| Search Repositories |\n\n")
print("Enter a search term and copy the namespace to clipboard\n") print("Enter a search term and copy the namespace to clipboard\n")
print("Paste this later to the install menu.\n\n") print("Paste this later to the install menu.\n\n")
print("Type: 'menu' for main menu\n") print("Type: 'm' for main menu\n")
print("Type: 'q' to quit the application\n\n") print("Type: 'q' to quit the application\n\n")
var programName, _ = input(">> ") var programName, _ = input(">> ")
if programName == "menu" { if programName == "m" {
return return
} else if programName == "q" { } else if programName == "q" {
os.Exit(0) os.Exit(0)
@ -40,6 +40,7 @@ func searchRepo() {
log.Fatalf("cmd.Run() failed with %s\n", err) log.Fatalf("cmd.Run() failed with %s\n", err)
} }
fmt.Print("\n", "Results for ", programName, ": \n\n", string(out), "\n") fmt.Print("\n", "Results for ", programName, ": \n\n", string(out), "\n")
searchRepo()
} }
} }
@ -47,12 +48,12 @@ func installPak() {
print("\n| Install Menu |\n\n") print("\n| Install Menu |\n\n")
print("To Use: Copy paste a flatpak namespace from search results\n\n") print("To Use: Copy paste a flatpak namespace from search results\n\n")
print("EXAMPLE: 'com.play0ad.zeroad' - installs the Game '0ad'\n\n") print("EXAMPLE: 'com.play0ad.zeroad' - installs the Game '0ad'\n\n")
print("Type: 'menu' for main menu\n") print("Type: 'm' for main menu\n")
print("Type: 'q' to quit the application\n\n") print("Type: 'q' to quit the application\n\n")
print("NOTE: install can take several seconds and appear to hang. Please be patient...\n\n") print("NOTE: install can take several seconds and appear to hang. Please be patient...\n\n")
var programName, _ = input(">> ") var programName, _ = input(">> ")
if programName == "menu" { if programName == "m" {
return return
} else if programName == "q" { } else if programName == "q" {
os.Exit(0) os.Exit(0)
@ -63,6 +64,7 @@ func installPak() {
log.Fatalf("cmd.Run() failed with %s\n", err) log.Fatalf("cmd.Run() failed with %s\n", err)
} }
fmt.Print(string(out), "\n") fmt.Print(string(out), "\n")
installPak()
} }
} }
@ -77,14 +79,14 @@ func listPak() {
} }
func removePak() { func removePak() {
print("\n| Uninstall Flatpaks |\n\n") print("\n| Remove Flatpaks |\n\n")
listPak() listPak()
print("\n\nCopy and paste a namespace above and press enter to uninstall\n\n") print("\n\nCopy and paste a namespace above and press enter to remove from system\n\n")
print("Type: 'menu' for main menu\n") print("Type: 'm' for main menu\n")
print("Type: 'q' to quit the application\n\n") print("Type: 'q' to quit the application\n\n")
var programName, _ = input(">> ") var programName, _ = input(">> ")
if programName == "menu" { if programName == "m" {
return return
} else if programName == "q" { } else if programName == "q" {
os.Exit(0) os.Exit(0)
@ -95,6 +97,7 @@ func removePak() {
log.Fatalf("cmd.Run() failed with %s\n", err) log.Fatalf("cmd.Run() failed with %s\n", err)
} }
fmt.Print(string(out), "\n\n") fmt.Print(string(out), "\n\n")
removePak()
} }
} }
@ -143,27 +146,27 @@ func updatePak() {
fmt.Print(string(out)) fmt.Print(string(out))
} }
func mainMenu() { func mainMenu() {
print("\n\n| FlatFace v0.0.1a |\n\n") print("\n\n| FlatFace v0.0.1a-3 |\n\n")
var choice string var choice string
print("1. Search remote for flatpaks\n") print("[S]earch remote for flatpaks\n")
print("2. Install flatpaks from remote\n") print("[I]nstall flatpaks from remote\n")
print("3. Uninstall local flatpaks\n") print("[R]emove local flatpaks\n")
print("4. List install flatpaks\n") print("[L]ist install flatpaks\n")
print("5. Update\n") print("[U]pdate\n")
print("q. Quit\n\n") print("[Q]uit\n\n")
choice, _ = input(">> ") choice, _ = input(">> ")
if choice == "1" { if choice == "s" {
searchRepo() searchRepo()
} else if choice == "2" { } else if choice == "i" {
installPak() installPak()
} else if choice == "3" { } else if choice == "r" {
removePak() removePak()
} else if choice == "4" { } else if choice == "l" {
listPak() listPak()
} else if choice == "5" { } else if choice == "u" {
updatePak() updatePak()
} else if choice == "q" { } else if choice == "q" {
os.Exit(0) os.Exit(0)