Git/gitea-tea
1
0
Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2025-09-02 18:08:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update SDK to v0.13.0 (#179)

Browse Source 
check err

Notifications: Add Pinned Filter

migrate & adapt

update sdk to v0.13.0

Co-authored-by: 6543 <6543@obermui.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/179
Reviewed-by: techknowlogick <techknowlogick@gitea.io>
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
6543
2020-09-16 02:01:41 +00:00
committed by Lunny Xiao
parent ed961c795e
commit f47ac8f96e
63 changed files with 2024 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/config.go
View File

@ -40,16 +40,23 @@ type Login struct {
// Client returns a client to operate Gitea API
func (l *Login) Client() *gitea.Client {
client := gitea.NewClient(l.URL, l.Token)
httpClient := &http.Client{}
if l.Insecure {
cookieJar, _ := cookiejar.New(nil)
client.SetHTTPClient(&http.Client{
httpClient = &http.Client{
Jar: cookieJar,
Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
},
})
}}
}
client, err := gitea.NewClient(l.URL,
gitea.SetToken(l.Token),
gitea.SetHTTPClient(httpClient),
)
if err != nil {
log.Fatal(err)
}
return client
}

8
cmd/issues.go
View File

@ -59,7 +59,7 @@ func runIssueDetail(ctx *cli.Context, index string) error {
if err != nil {
return err
}
issue, err := login.Client().GetIssue(owner, repo, idx)
issue, _, err := login.Client().GetIssue(owner, repo, idx)
if err != nil {
return err
}
@ -86,7 +86,7 @@ func runIssuesList(ctx *cli.Context) error {
state = gitea.StateClosed
}
issues, err := login.Client().ListRepoIssues(owner, repo, gitea.ListIssueOption{
issues, _, err := login.Client().ListRepoIssues(owner, repo, gitea.ListIssueOption{
State: state,
Type: gitea.IssueTypeIssue,
})
@ -154,7 +154,7 @@ var CmdIssuesCreate = cli.Command{
func runIssuesCreate(ctx *cli.Context) error {
login, owner, repo := initCommand()
_, err := login.Client().CreateIssue(owner, repo, gitea.CreateIssueOption{
_, _, err := login.Client().CreateIssue(owner, repo, gitea.CreateIssueOption{
Title: ctx.String("title"),
Body: ctx.String("body"),
// TODO:
@ -212,6 +212,6 @@ func editIssueState(ctx *cli.Context, opts gitea.EditIssueOption) error {
return err
}
_, err = login.Client().EditIssue(owner, repo, index, opts)
_, _, err = login.Client().EditIssue(owner, repo, index, opts)
return err
}

10
cmd/labels.go
View File

@ -49,7 +49,7 @@ func runLabels(ctx *cli.Context) error {
var values [][]string
labels, err := login.Client().ListRepoLabels(owner, repo, gitea.ListLabelsOptions{})
labels, _, err := login.Client().ListRepoLabels(owner, repo, gitea.ListLabelsOptions{})
if err != nil {
log.Fatal(err)
}
@ -141,7 +141,7 @@ func runLabelCreate(ctx *cli.Context) error {
labelFile := ctx.String("file")
var err error
if len(labelFile) == 0 {
_, err = login.Client().CreateLabel(owner, repo, gitea.CreateLabelOption{
_, _, err = login.Client().CreateLabel(owner, repo, gitea.CreateLabelOption{
Name: ctx.String("name"),
Color: ctx.String("color"),
Description: ctx.String("description"),
@ -162,7 +162,7 @@ func runLabelCreate(ctx *cli.Context) error {
if color == "" || name == "" {
log.Printf("Line %d ignored because lack of enough fields: %s\n", i, line)
} else {
_, err = login.Client().CreateLabel(owner, repo, gitea.CreateLabelOption{
_, _, err = login.Client().CreateLabel(owner, repo, gitea.CreateLabelOption{
Name: name,
Color: color,
Description: description,
@ -227,7 +227,7 @@ func runLabelUpdate(ctx *cli.Context) error {
}
var err error
_, err = login.Client().EditLabel(owner, repo, id, gitea.EditLabelOption{
_, _, err = login.Client().EditLabel(owner, repo, id, gitea.EditLabelOption{
Name: pName,
Color: pColor,
Description: pDescription,
@ -257,7 +257,7 @@ var CmdLabelDelete = cli.Command{
func runLabelDelete(ctx *cli.Context) error {
login, owner, repo := initCommand()
err := login.Client().DeleteLabel(owner, repo, ctx.Int64("id"))
_, err := login.Client().DeleteLabel(owner, repo, ctx.Int64("id"))
if err != nil {
log.Fatal(err)
}

25
cmd/login.go
View File

@ -187,22 +187,25 @@ func runLoginAddMain(name, token, user, passwd, sshKey, giteaURL string, insecur
log.Fatal("Unable to load config file " + yamlConfigPath)
}
client := gitea.NewClient(giteaURL, token)
if len(token) == 0 {
client.SetBasicAuth(user, passwd)
}
httpClient := &http.Client{}
if insecure {
cookieJar, _ := cookiejar.New(nil)
client.SetHTTPClient(&http.Client{
httpClient = &http.Client{
Jar: cookieJar,
Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
},
})
}}
}
client, err := gitea.NewClient(giteaURL,
gitea.SetToken(token),
gitea.SetBasicAuth(user, passwd),
gitea.SetHTTPClient(httpClient),
)
if err != nil {
log.Fatal(err)
}
u, err := client.GetMyUserInfo()
u, _, err := client.GetMyUserInfo()
if err != nil {
log.Fatal(err)
}
@ -210,7 +213,7 @@ func runLoginAddMain(name, token, user, passwd, sshKey, giteaURL string, insecur
if len(token) == 0 {
// create token
host, _ := os.Hostname()
tl, err := client.ListAccessTokens(gitea.ListAccessTokensOptions{})
tl, _, err := client.ListAccessTokens(gitea.ListAccessTokensOptions{})
if err != nil {
return err
}
@ -221,7 +224,7 @@ func runLoginAddMain(name, token, user, passwd, sshKey, giteaURL string, insecur
break
}
}
t, err := client.CreateAccessToken(gitea.CreateAccessTokenOption{Name: tokenName})
t, _, err := client.CreateAccessToken(gitea.CreateAccessTokenOption{Name: tokenName})
if err != nil {
return err
}

21
cmd/notifications.go
View File

@ -24,13 +24,16 @@ var CmdNotifications = cli.Command{
Aliases: []string{"a"},
Usage: "show all notifications of related gitea instance",
},
/* // not supported jet
&cli.BoolFlag{
Name: "read",
Aliases: []string{"rd"},
Usage: "show read notifications instead unread",
},
*/
&cli.BoolFlag{
Name: "pinned",
Aliases: []string{"pd"},
Usage: "show pinned notifications instead unread",
},
&cli.IntFlag{
Name: "page",
Aliases: []string{"p"},
@ -54,15 +57,25 @@ func runNotifications(ctx *cli.Context) error {
PageSize: ctx.Int("limit"),
}
var status []gitea.NotifyStatus
if ctx.Bool("read") {
status = []gitea.NotifyStatus{gitea.NotifyStatusRead}
}
if ctx.Bool("pinned") {
status = append(status, gitea.NotifyStatusPinned)
}
if ctx.Bool("all") {
login := initCommandLoginOnly()
news, err = login.Client().ListNotifications(gitea.ListNotificationOptions{
news, _, err = login.Client().ListNotifications(gitea.ListNotificationOptions{
ListOptions: listOpts,
Status: status,
})
} else {
login, owner, repo := initCommand()
news, err = login.Client().ListRepoNotifications(owner, repo, gitea.ListNotificationOptions{
news, _, err = login.Client().ListRepoNotifications(owner, repo, gitea.ListNotificationOptions{
ListOptions: listOpts,
Status: status,
})
}
if err != nil {

10
cmd/pulls.go
View File

@ -52,7 +52,7 @@ func runPulls(ctx *cli.Context) error {
state = gitea.StateClosed
}
prs, err := login.Client().ListRepoPullRequests(owner, repo, gitea.ListPullRequestsOptions{
prs, _, err := login.Client().ListRepoPullRequests(owner, repo, gitea.ListPullRequestsOptions{
State: state,
})
@ -120,7 +120,7 @@ func runPullsCheckout(ctx *cli.Context) error {
if err != nil {
return err
}
pr, err := login.Client().GetPullRequest(owner, repo, idx)
pr, _, err := login.Client().GetPullRequest(owner, repo, idx)
if err != nil {
return err
}
@ -204,7 +204,7 @@ func runPullsClean(ctx *cli.Context) error {
if err != nil {
return err
}
pr, err := login.Client().GetPullRequest(owner, repo, idx)
pr, _, err := login.Client().GetPullRequest(owner, repo, idx)
if err != nil {
return err
}
@ -298,7 +298,7 @@ func runPullsCreate(ctx *cli.Context) error {
login, ownerArg, repoArg := initCommand()
client := login.Client()
repo, err := login.Client().GetRepo(ownerArg, repoArg)
repo, _, err := login.Client().GetRepo(ownerArg, repoArg)
if err != nil {
log.Fatal(err)
}
@ -347,7 +347,7 @@ func runPullsCreate(ctx *cli.Context) error {
fmt.Printf("Error occurred during 'git push':\n%s\n", err.Error())
}
pr, err := client.CreatePullRequest(ownerArg, repoArg, gitea.CreatePullRequestOption{
pr, _, err := client.CreatePullRequest(ownerArg, repoArg, gitea.CreatePullRequestOption{
Head: head,
Base: base,
Title: title,

6
cmd/releases.go
View File

@ -29,7 +29,7 @@ var CmdReleases = cli.Command{
func runReleases(ctx *cli.Context) error {
login, owner, repo := initCommand()
releases, err := login.Client().ListReleases(owner, repo, gitea.ListReleasesOptions{})
releases, _, err := login.Client().ListReleases(owner, repo, gitea.ListReleasesOptions{})
if err != nil {
log.Fatal(err)
}
@ -110,7 +110,7 @@ var CmdReleaseCreate = cli.Command{
func runReleaseCreate(ctx *cli.Context) error {
login, owner, repo := initCommand()
release, err := login.Client().CreateRelease(owner, repo, gitea.CreateReleaseOption{
release, _, err := login.Client().CreateRelease(owner, repo, gitea.CreateReleaseOption{
TagName: ctx.String("tag"),
Target: ctx.String("target"),
Title: ctx.String("title"),
@ -136,7 +136,7 @@ func runReleaseCreate(ctx *cli.Context) error {
filePath := filepath.Base(asset)
if _, err = login.Client().CreateReleaseAttachment(owner, repo, release.ID, file, filePath); err != nil {
if _, _, err = login.Client().CreateReleaseAttachment(owner, repo, release.ID, file, filePath); err != nil {
file.Close()
log.Fatal(err)
}

6
cmd/repos.go
View File

@ -58,11 +58,11 @@ func runReposList(ctx *cli.Context) error {
var err error
if org != "" {
rps, err = login.Client().ListOrgRepos(org, gitea.ListOrgReposOptions{})
rps, _, err = login.Client().ListOrgRepos(org, gitea.ListOrgReposOptions{})
} else if user != "" {
rps, err = login.Client().ListUserRepos(user, gitea.ListReposOptions{})
rps, _, err = login.Client().ListUserRepos(user, gitea.ListReposOptions{})
} else {
rps, err = login.Client().ListMyRepos(gitea.ListReposOptions{})
rps, _, err = login.Client().ListMyRepos(gitea.ListReposOptions{})
}
if err != nil {
log.Fatal(err)

12
cmd/times.go
View File

@ -66,17 +66,17 @@ func runTrackedTimes(ctx *cli.Context) error {
fmt.Println(ctx.Command.ArgsUsage)
if user == "" {
// get all tracked times on the repo
times, err = client.GetRepoTrackedTimes(owner, repo)
times, _, err = client.GetRepoTrackedTimes(owner, repo)
} else if strings.HasPrefix(user, "#") {
// get all tracked times on the specified issue
issue, err := argToIndex(user)
if err != nil {
return err
}
times, err = client.ListTrackedTimes(owner, repo, issue, gitea.ListTrackedTimesOptions{})
times, _, err = client.ListTrackedTimes(owner, repo, issue, gitea.ListTrackedTimesOptions{})
} else {
// get all tracked times by the specified user
times, err = client.GetUserTrackedTimes(owner, repo, user)
times, _, err = client.GetUserTrackedTimes(owner, repo, user)
}
if err != nil {
@ -185,7 +185,7 @@ func runTrackedTimesAdd(ctx *cli.Context) error {
log.Fatal(err)
}
_, err = login.Client().AddTime(owner, repo, issue, gitea.AddTimeOption{
_, _, err = login.Client().AddTime(owner, repo, issue, gitea.AddTimeOption{
Time: int64(duration.Seconds()),
})
if err != nil {
@ -227,7 +227,7 @@ func runTrackedTimesDelete(ctx *cli.Context) error {
log.Fatal(err)
}
err = client.DeleteTime(owner, repo, issue, timeID)
_, err = client.DeleteTime(owner, repo, issue, timeID)
if err != nil {
log.Fatal(err)
}
@ -262,7 +262,7 @@ func runTrackedTimesReset(ctx *cli.Context) error {
log.Fatal(err)
}
err = client.ResetIssueTime(owner, repo, issue)
_, err = client.ResetIssueTime(owner, repo, issue)
if err != nil {
log.Fatal(err)
}