Merge branch 'master' of https://github.com/LeeEirc/cocogo

Gopkg.lock

@@ -104,14 +104,6 @@
   revision = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
   version = "v0.0.4"
 
-[[projects]]
-  digest = "1:4a49346ca45376a2bba679ca0e83bec949d780d4e927931317904bad482943ec"
-  name = "github.com/mattn/go-sqlite3"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75"
-  version = "v1.10.0"
-
 [[projects]]
   digest = "1:abcdbf03ca6ca13d3697e2186edc1f33863bbdac2b3a44dfa39015e8903f7409"
   name = "github.com/olekukonko/tablewriter"
@@ -180,7 +172,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:ed3d25dee9c9d77611e5ce1bd3a5a078930e8efb31afac120ccb1fbba7ec08d1"
+  digest = "1:1a1855ef6bc1338dd3870260716214046cefd69855c5a5a772d44d2791478abc"
   name = "golang.org/x/sys"
   packages = [
     "cpu",
@@ -188,7 +180,7 @@
     "windows",
   ]
   pruneopts = "UT"
-  revision = "a5b02f93d862f065920dd6a40dddc66b60d0dec4"
+  revision = "3a4b5fb9f71f5874b2374ae059bc0e0bcb52e145"
 
 [[projects]]
   digest = "1:c805e517269b0ba4c21ded5836019ed7d16953d4026cb7d00041d039c7906be9"
@@ -215,7 +207,6 @@
     "github.com/jarcoal/httpmock",
     "github.com/kr/pty",
     "github.com/leonelquinteros/gotext",
-    "github.com/mattn/go-sqlite3",
     "github.com/olekukonko/tablewriter",
     "github.com/pkg/errors",
     "github.com/pkg/sftp",

pkg/handler/pagination.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/olekukonko/tablewriter"
 
@@ -19,29 +20,49 @@ const (
 	CommentColumnMinSize  = 2
 )
 
+func NewAssetPagination(term *utils.Terminal, assets []model.Asset) *AssetPagination {
+	fields := []string{"ID", "Hostname", "IP", "LoginAs", "Comment"}
+	wtable := WrapperTable{
+		Fields:     fields,
+		DataBulk:   make([][]string, 0),
+		ColumnSize: make([]int, len(fields)),
+	}
+	var interfaceSlice = make([]interface{}, len(assets))
+	for i, d := range assets {
+		interfaceSlice[i] = d
+	}
+	page := &Pagination{
+		data:        interfaceSlice,
+		lock:        new(sync.RWMutex),
+		currentPage: 1,
+	}
+
+	assetPage := &AssetPagination{term: term,
+		tableWriter: &wtable,
+		page:        page,
+	}
+	assetPage.Initial()
+	return assetPage
+
+}
+
 type AssetPagination struct {
 	term        *utils.Terminal
-	CurrentPage int
-	TotalPage   int
-	PageSize    int
-	TotalNumber int
-	Data        []model.Asset
-
-	dataBulk   [][]string
-	columnSize [5]int
+	tableWriter *WrapperTable
+	page        *Pagination
+	currentData []model.Asset
 }
 
 func (p *AssetPagination) Initial() {
 	var (
 		pageSize int
-		totalPage int
 	)
 	_, height := p.term.GetSize()
 	switch config.Conf.AssetListPageSize {
 	case "auto":
 		pageSize = height - 7
 	case "all":
-		pageSize = p.TotalNumber
+		pageSize = len(p.page.data)
 	default:
 		if value, err := strconv.Atoi(config.Conf.AssetListPageSize); err == nil {
 			pageSize = value
@@ -52,18 +73,14 @@ func (p *AssetPagination) Initial() {
 	if pageSize <= 0 {
 		pageSize = 1
 	}
+	p.page.SetPageSize(pageSize)
+	tmpdata := p.page.GetPageData(1)
+	p.currentData = make([]model.Asset, len(tmpdata))
 
-	if p.TotalNumber%pageSize == 0 {
-		totalPage = p.TotalNumber / pageSize
-	} else {
-		totalPage = p.TotalNumber/pageSize + 1
+	for i, item := range tmpdata {
+		p.currentData[i] = item.(model.Asset)
 	}
 
-	p.CurrentPage = 1
-	p.PageSize = pageSize
-	p.TotalPage = totalPage
-	p.dataBulk = make([][]string, 0)
-
 }
 
 func (p *AssetPagination) setPageSize() {
@@ -76,14 +93,8 @@ func (p *AssetPagination) setPageSize() {
 		} else {
 			pageSize = 1
 		}
-		if p.PageSize != pageSize {
-			p.PageSize = pageSize
-			p.CurrentPage = 1
-			if p.TotalNumber%pageSize == 0 {
-				p.TotalPage = p.TotalNumber / pageSize
-			} else {
-				p.TotalPage = p.TotalNumber/pageSize + 1
-			}
+		if p.page.GetPageSize() != pageSize {
+			p.page.SetPageSize(pageSize)
 		}
 	}
 }
@@ -95,22 +106,16 @@ func (p *AssetPagination) getColumnMaxSize() {
 		systemUserSize int
 		CommentSize    int
 	)
-	p.setPageSize()
 	IDSize = IDColumnMinSize
 	CommentSize = CommentColumnMinSize
-	endIndex := p.CurrentPage * p.PageSize
-	startIndex := endIndex - p.PageSize
-	if endIndex > len(p.Data) {
-		endIndex = len(p.Data)
-	}
-	if len(strconv.Itoa(endIndex)) > IDColumnMinSize {
-		IDSize = len(strconv.Itoa(endIndex))
+
+	if len(strconv.Itoa(len(p.currentData))) > IDColumnMinSize {
+		IDSize = len(strconv.Itoa(len(p.currentData)))
 	}
-	p.dataBulk = p.dataBulk[:0]
-	for i, item := range p.Data[startIndex:endIndex] {
+	p.tableWriter.DataBulk = p.tableWriter.DataBulk[:0]
+	for i, item := range p.currentData {
 		tmpDat := make([]string, 5)
 		var tmpSystemUserArray []string
-
 		result := selectHighestPrioritySystemUsers(item.SystemUsers)
 		tmpSystemUserArray = make([]string, len(result))
 		for index, sysUser := range result {
@@ -134,10 +139,10 @@ func (p *AssetPagination) getColumnMaxSize() {
 		if len(item.Comment) > CommentSize {
 			CommentSize = len(item.Comment)
 		}
-		tmpDat[0] = strconv.Itoa(startIndex + i + 1)
+		tmpDat[0] = strconv.Itoa(i + 1)
 		tmpDat[2] = item.Ip
 		tmpDat[3] = tmpSystemUserStr
-		p.dataBulk = append(p.dataBulk, tmpDat)
+		p.tableWriter.DataBulk = append(p.tableWriter.DataBulk, tmpDat)
 	}
 	// table writer 空白空间占用宽度 4 + (columnNum - 1) * 4
 	width, _ := p.term.GetSize()
@@ -145,29 +150,32 @@ func (p *AssetPagination) getColumnMaxSize() {
 	if remainSize > 0 && CommentSize < remainSize {
 		CommentSize = remainSize
 	}
-	for i, item := range p.Data[startIndex:endIndex] {
+	for i, item := range p.currentData {
 		if len(item.Comment) > CommentSize {
-			p.dataBulk[i][4] = item.Comment[:CommentSize]
+			p.tableWriter.DataBulk[i][4] = item.Comment[:CommentSize]
 		} else {
-			p.dataBulk[i][4] = item.Comment
+			p.tableWriter.DataBulk[i][4] = item.Comment
 		}
 	}
-	p.columnSize = [5]int{IDSize, HostNameSize, IPColumnSize, systemUserSize, CommentSize}
-	fmt.Println(p.columnSize)
+	currentCapMsg := fmt.Sprintf("Page: %d, Count: %d, Total Page: %d, Total Count:%d\n",
+		p.page.CurrentPage(), p.page.GetPageSize(), p.page.TotalPage(), p.page.TotalCount())
+	msg := utils.WrapperString(currentCapMsg, utils.Green)
+	p.tableWriter.SetCaption(msg)
+	p.tableWriter.SetColumnSize(IDSize, HostNameSize, IPColumnSize, systemUserSize, CommentSize)
+
 }
 
 func (p *AssetPagination) PaginationState() []model.Asset {
-	done := make(chan struct{})
-	defer close(done)
-	if p.PageSize > p.TotalNumber {
+
+	for {
+		if p.page.CurrentPage() == 1 && p.page.GetPageSize() > len(p.currentData) {
 			p.displayAssets()
 			return []model.Asset{}
 		}
-
-	for {
 		p.displayAssets()
 		p.displayTipsInfo()
 		line, err := p.term.ReadLine()
+		p.setPageSize()
 		if err != nil {
 			return []model.Asset{}
 		}
@@ -176,27 +184,39 @@ func (p *AssetPagination) PaginationState() []model.Asset {
 		case 0, 1:
 			switch strings.ToLower(line) {
 			case "p":
-				p.CurrentPage--
-				if p.CurrentPage <= 0 {
-					p.CurrentPage = 1
+				tmpData := p.page.GetPrePageData()
+				if len(p.currentData) != len(tmpData) {
+					p.currentData = make([]model.Asset, len(tmpData))
+				}
+				for i, item := range tmpData {
+					p.currentData[i] = item.(model.Asset)
 				}
-				continue
 
 			case "", "n":
-				p.CurrentPage++
-				if p.CurrentPage >= p.TotalPage {
-					p.CurrentPage = p.TotalPage
+				tmpData := p.page.GetNextPageData()
+				if len(p.currentData) != len(tmpData) {
+					p.currentData = make([]model.Asset, len(tmpData))
+				}
+				for i, item := range tmpData {
+					p.currentData[i] = item.(model.Asset)
 				}
-				continue
 			case "b":
 				return []model.Asset{}
+			default:
+				if indexID, err := strconv.Atoi(line); err == nil {
+					if indexID > 0 && indexID <= len(p.currentData) {
+						return []model.Asset{p.currentData[indexID-1]}
+					}
 				}
 			}
+		default:
 			if indexID, err := strconv.Atoi(line); err == nil {
-			if indexID > 0 && indexID <= p.TotalNumber {
-				return []model.Asset{p.Data[indexID-1]}
+				if indexID > 0 && indexID <= len(p.currentData) {
+					return []model.Asset{p.currentData[indexID-1]}
+				}
 			}
 		}
+
 	}
 }
 
@@ -204,42 +224,160 @@ func (p *AssetPagination) displayAssets() {
 	p.getColumnMaxSize()
 
 	_, _ = p.term.Write([]byte(utils.CharClear))
+	_, _ = p.term.Write([]byte(p.tableWriter.Display()))
+}
+
+func (p *AssetPagination) displayTipsInfo() {
+	tips := []string{
+		"\nTips: Enter the asset ID and log directly into the asset.\n",
+		"\nPage up: P/p	Page down: Enter|N/n	BACK: b.\n",
+	}
+	for _, tip := range tips {
+		_, _ = p.term.Write([]byte(tip))
+	}
+
+}
+
+type WrapperTable struct {
+	Fields     []string
+	DataBulk   [][]string
+	ColumnSize []int
+	Caption    string
+}
 
-	table := tablewriter.NewWriter(p.term)
-	table.SetHeader([]string{"ID", "Hostname", "IP", "LoginAs", "Comment"})
-	table.AppendBulk(p.dataBulk)
+func (w *WrapperTable) SetColumnSize(columnSizes ...int) {
+	if len(columnSizes) != len(w.Fields) {
+		panic("fields' number could not match column size")
+	}
+
+	for i, size := range columnSizes {
+		w.ColumnSize[i] = size
+	}
+}
+
+func (w *WrapperTable) SetCaption(cap string) {
+	w.Caption = cap
+}
+
+func (w *WrapperTable) Display() string {
+	tableString := &strings.Builder{}
+	table := tablewriter.NewWriter(tableString)
 	table.SetBorder(false)
-	greens := tablewriter.Colors{tablewriter.Normal, tablewriter.FgGreenColor}
-	table.SetHeaderColor(greens, greens, greens, greens, greens)
+	table.SetHeader(w.Fields)
+	colors := make([]tablewriter.Colors, len(w.Fields))
+	for i := 0; i < len(w.Fields); i++ {
+		colors[i] = tablewriter.Colors{tablewriter.Bold, tablewriter.FgGreenColor}
+	}
+	table.SetHeaderColor(colors...)
+	table.AppendBulk(w.DataBulk)
 	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
 	table.SetAlignment(tablewriter.ALIGN_LEFT)
-	for i, value := range p.columnSize {
+	for i, value := range w.ColumnSize {
 		table.SetColMinWidth(i, value)
 	}
-	currentCapMsg := fmt.Sprintf("Page: %d, Count: %d, Total Page: %d, Total Count:%d\n",
-		p.CurrentPage, p.PageSize, p.TotalPage, p.TotalNumber)
-	table.SetCaption(true, utils.WrapperString(currentCapMsg, utils.Green))
+	if w.Caption != "" {
+		table.SetCaption(true, w.Caption)
+	}
 	table.Render()
+	return tableString.String()
 }
 
-func (p *AssetPagination) displayTipsInfo() {
-	tips := []string{
-		"\nTips: Enter the asset ID and log directly into the asset.\n",
-		"\nPage up: P/p	Page down: Enter|N/n	BACK: b.\n",
+type Pagination struct {
+	data        []interface{}
+	currentPage int
+	pageSize    int
+	totalPage   int
+	lock        *sync.RWMutex
+}
+
+func (p *Pagination) GetNextPageData() []interface{} {
+	if p.HasNextPage() {
+		p.lock.Lock()
+		p.currentPage++
+		p.lock.Unlock()
 	}
-	for _, tip := range tips {
-		_, _ = p.term.Write([]byte(tip))
+	return p.GetPageData(p.currentPage)
+
+}
+
+func (p *Pagination) GetPrePageData() []interface{} {
+	if p.HasPrePage() {
+		p.lock.Lock()
+		p.currentPage--
+		p.lock.Unlock()
 	}
 
+	return p.GetPageData(p.currentPage)
+}
+
+func (p *Pagination) GetPageData(pageIndex int) []interface{} {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	var (
+		endIndex   int
+		startIndex int
+	)
+
+	endIndex = p.pageSize * pageIndex
+	startIndex = endIndex - p.pageSize
+	if endIndex > len(p.data) {
+		endIndex = len(p.data)
+	}
+	return p.data[startIndex:endIndex]
+}
+
+func (p *Pagination) CurrentPage() int {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	return p.currentPage
+}
+
+func (p *Pagination) TotalCount() int {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	return len(p.data)
+}
+
+func (p *Pagination) TotalPage() int {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	return p.totalPage
+}
+
+func (p *Pagination) SetPageSize(size int) {
+
+	if size <= 0 {
+		panic("Pagination size should be larger than zero")
+	}
+	p.lock.Lock()
+	defer p.lock.Unlock()
+	if p.pageSize == size {
+		return
+	}
+	p.pageSize = size
+	if len(p.data)%size == 0 {
+		p.totalPage = len(p.data) / size
+	} else {
+		p.totalPage = len(p.data)/size + 1
+	}
+	p.currentPage = 1
+
+}
+
+func (p *Pagination) GetPageSize() int {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	return p.pageSize
+}
+
+func (p *Pagination) HasNextPage() bool {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	return p.currentPage < p.totalPage
 }
 
-type Pagination interface {
-	GetNextPageData() []interface{}
-	GetPrePageData() []interface{}
-	GetPageData(p int) []interface{}
-	CurrentPage() int
-	TotalCount() int
-	TotalPage() int
-	SetPageSize(int)
-	GetPageSize() int
+func (p *Pagination) HasPrePage() bool {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	return p.currentPage > 1
 }

pkg/handler/session.go

@@ -230,11 +230,8 @@ func (h *interactiveHandler) displayAssets(assets model.AssetList) {
 	if len(assets) == 0 {
 		_, _ = io.WriteString(h.term, "\r\n No Assets\r\n\r")
 	} else {
-		pag := AssetPagination{
-			term:        h.term,
-			TotalNumber: len(assets),
-			Data:        assets,
-		}
+		h.term.SetPrompt(": ")
+		pag := NewAssetPagination(h.term, assets)
 		pag.Initial()
 		selectOneAssets := pag.PaginationState()
 		if len(selectOneAssets) == 1 {
@@ -243,6 +240,7 @@ func (h *interactiveHandler) displayAssets(assets model.AssetList) {
 			h.systemUserSelect = &systemUser
 			h.Proxy(context.TODO())
 		}
+		h.term.SetPrompt("Opt> ")
 	}
 
 }