Refactor: apply new internal structurs (#206)

fix lint

fix lint

Move print TrackedTimesList to print package

Move AbsPathWithExpansion to utils/path.go

rename module intern to config

Move Subcomands into it's own Packages

Split times subcomands into own sourcefiles

Split repos subcomands into own sourcefiles

Split releases subcomands into own sourcefiles

Split pulls subcomands into own sourcefiles

Split milestones subcomands into own sourcefiles

Split login subcomands into own sourcefiles

Split labels subcomands into own sourcefiles

split issues subcomands into own sourcefiles

mv

Move Interactive Login Creation to interact package

Move Add Login function to intern/login.go

apply from review

lint: add description to exported func

smal nits

Move DetailViews stdout print func to print package

Refactor:
* Move Config & Login routines into intern package
* rename global var in cmd
* Move help func to utils

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/206
Reviewed-by: Norwin <noerw@noreply.gitea.io>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>

modules/print/issue.go

@@ -0,0 +1,31 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package print
+
+import (
+	"fmt"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/charmbracelet/glamour"
+)
+
+// IssueDetails print an issue rendered to stdout
+func IssueDetails(issue *gitea.Issue) {
+
+	in := fmt.Sprintf("# #%d %s (%s)\n%s created %s\n\n%s\n", issue.Index,
+		issue.Title,
+		issue.State,
+		issue.Poster.UserName,
+		issue.Created.Format("2006-01-02 15:04:05"),
+		issue.Body,
+	)
+	out, err := glamour.Render(in, getGlamourTheme())
+	if err != nil {
+		// TODO: better Error handling
+		fmt.Printf("Error:\n%v\n\n", err)
+		return
+	}
+	fmt.Print(out)
+}

modules/print/list.go

@@ -0,0 +1,92 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package print
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/olekukonko/tablewriter"
+)
+
+var (
+	showLog bool
+)
+
+// errorf printf content as an error information
+func errorf(format string, a ...interface{}) {
+	fmt.Printf(format, a...)
+}
+
+// outputtable prints structured data as table
+func outputtable(headers []string, values [][]string) {
+	table := tablewriter.NewWriter(os.Stdout)
+	if len(headers) > 0 {
+		table.SetHeader(headers)
+	}
+	for _, value := range values {
+		table.Append(value)
+	}
+	table.Render()
+}
+
+// outputsimple prints structured data as space delimited value
+func outputsimple(headers []string, values [][]string) {
+	for _, value := range values {
+		fmt.Printf(strings.Join(value, " "))
+		fmt.Printf("\n")
+	}
+}
+
+// outputdsv prints structured data as delimiter separated value format
+func outputdsv(headers []string, values [][]string, delimiterOpt ...string) {
+	delimiter := ","
+	if len(delimiterOpt) > 0 {
+		delimiter = delimiterOpt[0]
+	}
+	fmt.Println("\"" + strings.Join(headers, "\""+delimiter+"\"") + "\"")
+	for _, value := range values {
+		fmt.Printf("\"")
+		fmt.Printf(strings.Join(value, "\""+delimiter+"\""))
+		fmt.Printf("\"")
+		fmt.Printf("\n")
+	}
+}
+
+// outputyaml prints structured data as yaml
+func outputyaml(headers []string, values [][]string) {
+	for _, value := range values {
+		fmt.Println("-")
+		for j, val := range value {
+			intVal, _ := strconv.Atoi(val)
+			if strconv.Itoa(intVal) == val {
+				fmt.Printf("    %s: %s\n", headers[j], val)
+			} else {
+				fmt.Printf("    %s: '%s'\n", headers[j], val)
+			}
+		}
+	}
+}
+
+// OutputList provides general function to convert given list of items
+// into several outputs (table, csv, simple, tsv, yaml)
+func OutputList(output string, headers []string, values [][]string) {
+	switch {
+	case output == "" || output == "table":
+		outputtable(headers, values)
+	case output == "csv":
+		outputdsv(headers, values, ",")
+	case output == "simple":
+		outputsimple(headers, values)
+	case output == "tsv":
+		outputdsv(headers, values, "\t")
+	case output == "yaml":
+		outputyaml(headers, values)
+	default:
+		errorf("unknown output type '" + output + "', available types are:\n- csv: comma-separated values\n- simple: space-separated values\n- table: auto-aligned table format (default)\n- tsv: tab-separated values\n- yaml: YAML format\n")
+	}
+}

modules/print/milestone.go

@@ -0,0 +1,24 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package print
+
+import (
+	"fmt"
+
+	"code.gitea.io/sdk/gitea"
+)
+
+// MilestoneDetails print an milestone formatted to stdout
+func MilestoneDetails(milestone *gitea.Milestone) {
+	fmt.Printf("%s\n",
+		milestone.Title,
+	)
+	if len(milestone.Description) != 0 {
+		fmt.Printf("\n%s\n", milestone.Description)
+	}
+	if milestone.Deadline != nil && !milestone.Deadline.IsZero() {
+		fmt.Printf("\nDeadline: %s\n", milestone.Deadline.Format("2006-01-02 15:04:05"))
+	}
+}

modules/print/print.go

@@ -0,0 +1,34 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package print
+
+import (
+	"fmt"
+
+	"github.com/muesli/termenv"
+)
+
+func getGlamourTheme() string {
+	if termenv.HasDarkBackground() {
+		return "dark"
+	}
+	return "light"
+}
+
+// formatSize get kb in int and return string
+func formatSize(kb int64) string {
+	if kb < 1024 {
+		return fmt.Sprintf("%d Kb", kb)
+	}
+	mb := kb / 1024
+	if mb < 1024 {
+		return fmt.Sprintf("%d Mb", mb)
+	}
+	gb := mb / 1024
+	if gb < 1024 {
+		return fmt.Sprintf("%d Gb", gb)
+	}
+	return fmt.Sprintf("%d Tb", gb/1024)
+}

modules/print/pull.go

@@ -0,0 +1,31 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package print
+
+import (
+	"fmt"
+
+	"code.gitea.io/sdk/gitea"
+	"github.com/charmbracelet/glamour"
+)
+
+// PullDetails print an pull rendered to stdout
+func PullDetails(pr *gitea.PullRequest) {
+
+	in := fmt.Sprintf("# #%d %s (%s)\n%s created %s\n\n%s\n", pr.Index,
+		pr.Title,
+		pr.State,
+		pr.Poster.UserName,
+		pr.Created.Format("2006-01-02 15:04:05"),
+		pr.Body,
+	)
+	out, err := glamour.Render(in, getGlamourTheme())
+	if err != nil {
+		// TODO: better Error handling
+		fmt.Printf("Error:\n%v\n\n", err)
+		return
+	}
+	fmt.Print(out)
+}

modules/print/repo.go

@@ -0,0 +1,44 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package print
+
+import (
+	"fmt"
+	"strings"
+
+	"code.gitea.io/sdk/gitea"
+)
+
+// RepoDetails print an repo formatted to stdout
+func RepoDetails(repo *gitea.Repository, topics []string) {
+	output := repo.FullName
+	if repo.Mirror {
+		output += " (mirror)"
+	}
+	if repo.Fork {
+		output += " (fork)"
+	}
+	if repo.Archived {
+		output += " (archived)"
+	}
+	if repo.Empty {
+		output += " (empty)"
+	}
+	output += "\n"
+	if len(topics) != 0 {
+		output += "Topics: " + strings.Join(topics, ", ") + "\n"
+	}
+	output += "\n"
+	output += repo.Description + "\n\n"
+	output += fmt.Sprintf(
+		"Open Issues: %d, Stars: %d, Forks: %d, Size: %s\n\n",
+		repo.OpenIssues,
+		repo.Stars,
+		repo.Forks,
+		formatSize(int64(repo.Size)),
+	)
+
+	fmt.Print(output)
+}

modules/print/times.go

@@ -0,0 +1,69 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package print
+
+import (
+	"fmt"
+	"log"
+	"strconv"
+	"time"
+
+	"code.gitea.io/sdk/gitea"
+)
+
+func formatDuration(seconds int64, outputType string) string {
+	switch outputType {
+	case "yaml":
+	case "csv":
+		return fmt.Sprint(seconds)
+	}
+	return time.Duration(1e9 * seconds).String()
+}
+
+// TrackedTimesList print list of tracked times to stdout
+func TrackedTimesList(times []*gitea.TrackedTime, outputType string, from, until time.Time, printTotal bool) {
+	var outputValues [][]string
+	var totalDuration int64
+
+	localLoc, err := time.LoadLocation("Local") // local timezone for time formatting
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	for _, t := range times {
+		if !from.IsZero() && from.After(t.Created) {
+			continue
+		}
+		if !until.IsZero() && until.Before(t.Created) {
+			continue
+		}
+
+		totalDuration += t.Time
+
+		outputValues = append(
+			outputValues,
+			[]string{
+				t.Created.In(localLoc).Format("2006-01-02 15:04:05"),
+				"#" + strconv.FormatInt(t.Issue.Index, 10),
+				t.UserName,
+				formatDuration(t.Time, outputType),
+			},
+		)
+	}
+
+	if printTotal {
+		outputValues = append(outputValues, []string{
+			"TOTAL", "", "", formatDuration(totalDuration, outputType),
+		})
+	}
+
+	headers := []string{
+		"Created",
+		"Issue",
+		"User",
+		"Duration",
+	}
+	OutputList(outputType, headers, outputValues)
+}