Merge branch 'PluginTimeout' into dev

Author: Neko-Box-Coder

internal/action/command.go

@@ -107,6 +107,29 @@ func (h *BufPane) PluginCmd(args []string) {
 		return
 	}
 
+	switch args[0] {
+	case "install":
+		InfoBar.Message("Downloading plugin, please wait...")
+	case "remove":
+	case "update":
+		InfoBar.Message("Updating plugins, please wait...")
+	case "available":
+		InfoBar.Message("Fetching plugins, please wait...")
+	case "list":
+	case "search":
+		InfoBar.Message("Fetching plugins, please wait...")
+	default:
+		InfoBar.Error("Invalid plugin command:", args[0])
+	}
+
+	// NOTE: Display the message in info bar immediately before we get hang in PluginCommand()
+	// 		 Ideally we should lock it but it seems like main func in micro.go is constantly locking it
+	// 		 Locking it here will cause a deadlock
+	// screen.Lock()
+	InfoBar.Display()
+	screen.Show()
+	// screen.Unlock()
+
 	if h.Buf.Type != buffer.BTLog {
 		h.OpenLogBuf()
 	}

internal/config/plugin_installer.go

@@ -127,8 +127,8 @@ func (pc PluginChannels) Fetch(out io.Writer) PluginPackages {
 
 // Fetch retrieves all available PluginPackages from the given channel
 func (pc PluginChannel) Fetch(out io.Writer) PluginPackages {
-	client := http.Client {
-		Timeout: 10 * time.Second,
+	client := http.Client{
+		Timeout: 30 * time.Second,
 	}
 	resp, err := client.Get(string(pc))
 	if err != nil {
@@ -150,8 +150,8 @@ func (pc PluginChannel) Fetch(out io.Writer) PluginPackages {
 
 // Fetch retrieves all available PluginPackages from the given repository
 func (pr PluginRepository) Fetch(out io.Writer) PluginPackages {
-	client := http.Client {
-		Timeout: 10 * time.Second,
+	client := http.Client{
+		Timeout: 30 * time.Second,
 	}
 	resp, err := client.Get(string(pr))
 	if err != nil {
@@ -398,8 +398,8 @@ func GetInstalledPluginVersion(name string) string {
 // DownloadAndInstall downloads and installs the given plugin and version
 func (pv *PluginVersion) DownloadAndInstall(out io.Writer) error {
 	fmt.Fprintf(out, "Downloading %q (%s) from %q\n", pv.pack.Name, pv.Version, pv.Url)
-	client := http.Client {
-		Timeout: 10 * time.Second,
+	client := http.Client{
+		Timeout: 30 * time.Second,
 	}
 	resp, err := client.Get(pv.Url)
 	if err != nil {
@@ -650,6 +650,7 @@ func UpdatePlugins(out io.Writer, plugins []string) {
 func PluginCommand(out io.Writer, cmd string, args []string) {
 	switch cmd {
 	case "install":
+		fmt.Fprintln(out, "Downloading plugin, please wait...")
 		installedVersions := GetInstalledVersions(false)
 		for _, plugin := range args {
 			pp := GetAllPluginPackages(out).Get(plugin)
@@ -693,6 +694,7 @@ func PluginCommand(out io.Writer, cmd string, args []string) {
 			fmt.Fprintln(out, "No plugins removed")
 		}
 	case "update":
+		fmt.Fprintln(out, "Updating plugins, please wait...")
 		UpdatePlugins(out, args)
 	case "list":
 		plugins := GetInstalledVersions(false)
@@ -701,6 +703,7 @@ func PluginCommand(out io.Writer, cmd string, args []string) {
 			fmt.Fprintf(out, "%s (%s)\n", p.Pack().Name, p.Version)
 		}
 	case "search":
+		fmt.Fprintln(out, "Fetching plugins, please wait...")
 		plugins := SearchPlugin(out, args)
 		fmt.Fprintln(out, len(plugins), " plugins found")
 		for _, p := range plugins {
@@ -709,6 +712,7 @@ func PluginCommand(out io.Writer, cmd string, args []string) {
 		}
 		fmt.Fprintln(out, "----------------")
 	case "available":
+		fmt.Fprintln(out, "Fetching plugins, please wait...")
 		packages := GetAllPluginPackages(out)
 		fmt.Fprintln(out, "Available Plugins:")
 		for _, pkg := range packages {

internal/screen/screen.go

@@ -121,6 +121,10 @@ func SetContent(x, y int, mainc rune, combc []rune, style tcell.Style) {
 	}
 }
 
+func Show() {
+	Screen.Show()
+}
+
 // TempFini shuts the screen down temporarily
 func TempFini() bool {
 	screenWasNil := Screen == nil