improved search performance and add smart pagination

isacikgoz · Jan 2, 2019 · a653d95 · a653d95
1 parent 76c3f01
commit a653d95
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/main.go b/main.go
@@ -20,7 +20,7 @@ var (
 
 func main() {
 
-	kingpin.Version("tldr++ version 0.4.0")
+	kingpin.Version("tldr++ version 0.5.0")
 	kingpin.Parse()
 
 	config.StartUp(*clear, *update)

diff --git a/pkg/config/source.go b/pkg/config/source.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"gopkg.in/src-d/go-git.v4"
+	git "gopkg.in/src-d/go-git.v4"
 )
 
 const (
@@ -55,7 +55,11 @@ func PullSource() error {
 		Progress:   os.Stdout,
 	})
 	if err != nil {
-		fmt.Printf("%s\n", err.Error())
+		if err == git.NoErrAlreadyUpToDate {
+			fmt.Printf("%s\n", "No changes at tldr-pages repository.")
+		} else {
+			fmt.Printf("%s\n", err.Error())
+		}
 	} else {
 		fmt.Printf("Successfully pulled into: %s\n", dir)
 	}
@@ -96,5 +100,6 @@ func staled() (bool, error) {
 	if diff > 24*7*2*time.Hour {
 		return true, nil
 	}
+	file.Close()
 	return false, nil
 }
diff --git a/pkg/prompt/prompt.go b/pkg/prompt/prompt.go
@@ -11,6 +11,7 @@ import (
 	"github.com/c-bata/go-prompt/completer"
 	"github.com/isacikgoz/survey"
 	"github.com/isacikgoz/tldr/pkg/pages"
+	xterm "golang.org/x/crypto/ssh/terminal"
 	"gopkg.in/AlecAivazis/survey.v1/core"
 	"gopkg.in/AlecAivazis/survey.v1/terminal"
 )
@@ -43,12 +44,23 @@ func (p *Prompt) RenderPage(static bool) error {
 		options = append(options, t.Display())
 	}
 	core.ErrorTemplate = ""
+
 	var mxRows int
-	if len(p.Page.Tips) > 7 {
+	_, height, err := xterm.GetSize(0)
+	if err != nil || len(p.Page.Tips) > 10 {
 		mxRows = 7
 	} else {
-		mxRows = len(p.Page.Tips)
+		mxRows = (height - 7) / (3)
+		if mxRows < 3 {
+			mxRows = 3
+		}
 	}
+
+	// if len(p.Page.Tips) > 7 {
+	// 	mxRows = 7
+	// } else {
+	// 	mxRows = len(p.Page.Tips)
+	// }
 	// genereate questions to ask
 	p.Questions = []*survey.Question{
 		{