Lavande/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-01-02 21:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: golang lint

Browse Source
This commit is contained in:
Jason Song
2022-11-26 20:14:03 +08:00
parent 3b119f3d78
commit 0bd9553219
11 changed files with 93 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/bots/run.go
View File

@@ -6,7 +6,6 @@ package bots
import (
"context"
"encoding/json"
"fmt"
"time"
@@ -14,6 +13,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/models/webhook"
"code.gitea.io/gitea/modules/json"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"

5
models/bots/run_job_list.go
View File

@@ -52,10 +52,7 @@ func (jobs RunJobList) LoadRuns(ctx context.Context, withRepo bool) error {
}
func (jobs RunJobList) LoadAttributes(ctx context.Context, withRepo bool) error {
if err := jobs.LoadRuns(ctx, withRepo); err != nil {
return err
}
return nil
return jobs.LoadRuns(ctx, withRepo)
}
type FindRunJobOptions struct {

3
models/bots/task.go
View File

@@ -317,7 +317,8 @@ func CreateTaskForRunner(ctx context.Context, runner *Runner) (*Task, bool, erro
// TODO: a more efficient way to filter labels
var job *RunJob
labels := append(runner.AgentLabels, runner.CustomLabels...)
labels := runner.AgentLabels
labels = append(labels, runner.CustomLabels...)
log.Trace("runner labels: %v", labels)
for _, v := range jobs {
if isSubset(labels, v.RunsOn) {

5
models/bots/task_list.go
View File

@@ -50,10 +50,7 @@ func (tasks TaskList) LoadJobs(ctx context.Context) error {
}
func (tasks TaskList) LoadAttributes(ctx context.Context) error {
if err := tasks.LoadJobs(ctx); err != nil {
return err
}
return nil
return tasks.LoadJobs(ctx)
}
type FindTaskOptions struct {

12
models/dbfs/dbfile.go
View File

@@ -87,7 +87,7 @@ func (f *file) Read(p []byte) (n int, err error) {
return 0, os.ErrInvalid
}
fileMeta, err := findFileMetaById(f.ctx, f.metaID)
fileMeta, err := findFileMetaByID(f.ctx, f.metaID)
if err != nil {
return 0, err
}
@@ -101,7 +101,7 @@ func (f *file) Write(p []byte) (n int, err error) {
return 0, os.ErrInvalid
}
fileMeta, err := findFileMetaById(f.ctx, f.metaID)
fileMeta, err := findFileMetaByID(f.ctx, f.metaID)
if err != nil {
return 0, err
}
@@ -198,10 +198,6 @@ func timeToFileTimestamp(t time.Time) int64 {
return t.UnixMicro()
}
func fileTimestampToTime(t int64) time.Time {
return time.UnixMicro(t)
}
func (f *file) loadMetaByPath() (*FileMeta, error) {
var fileMeta FileMeta
if ok, err := db.GetEngine(f.ctx).Where("full_path = ?", f.fullPath).Get(&fileMeta); err != nil {
@@ -328,14 +324,14 @@ func (f *file) size() (int64, error) {
if f.metaID == 0 {
return 0, os.ErrNotExist
}
fileMeta, err := findFileMetaById(f.ctx, f.metaID)
fileMeta, err := findFileMetaByID(f.ctx, f.metaID)
if err != nil {
return 0, err
}
return fileMeta.FileSize, nil
}
func findFileMetaById(ctx context.Context, metaID int64) (*FileMeta, error) {
func findFileMetaByID(ctx context.Context, metaID int64) (*FileMeta, error) {
var fileMeta FileMeta
if ok, err := db.GetEngine(ctx).Where("id = ?", metaID).Get(&fileMeta); err != nil {
return nil, err