Merge branch 'develop' into dev-chunk

main.go

@@ -22,7 +22,6 @@ import (
 	_ "code.gitea.io/gitea/modules/markup/markdown"
 	_ "code.gitea.io/gitea/modules/markup/orgmode"
 	_ "code.gitea.io/gitea/modules/timer"
-	_ "code.gitea.io/gitea/modules/worker"
 
 	"github.com/urfave/cli"
 )

models/attachment.go

@@ -28,19 +28,19 @@ const (
 
 // Attachment represent a attachment of issue/comment/release.
 type Attachment struct {
-	ID            int64  `xorm:"pk autoincr"`
-	UUID          string `xorm:"uuid UNIQUE"`
-	IssueID       int64  `xorm:"INDEX"`
-	DatasetID     int64  `xorm:"INDEX DEFAULT 0"`
-	ReleaseID     int64  `xorm:"INDEX"`
-	UploaderID    int64  `xorm:"INDEX DEFAULT 0"` // Notice: will be zero before this column added
-	CommentID     int64
-	Name          string
-	DownloadCount int64              `xorm:"DEFAULT 0"`
-	Size          int64              `xorm:"DEFAULT 0"`
-	IsPrivate     bool               `xorm:"DEFAULT false"`
-	DecompressState int32			 `xorm:"DEFAULT 0"`
-	CreatedUnix   timeutil.TimeStamp `xorm:"created"`
+	ID              int64  `xorm:"pk autoincr"`
+	UUID            string `xorm:"uuid UNIQUE"`
+	IssueID         int64  `xorm:"INDEX"`
+	DatasetID       int64  `xorm:"INDEX DEFAULT 0"`
+	ReleaseID       int64  `xorm:"INDEX"`
+	UploaderID      int64  `xorm:"INDEX DEFAULT 0"` // Notice: will be zero before this column added
+	CommentID       int64
+	Name            string
+	DownloadCount   int64              `xorm:"DEFAULT 0"`
+	Size            int64              `xorm:"DEFAULT 0"`
+	IsPrivate       bool               `xorm:"DEFAULT false"`
+	DecompressState int32              `xorm:"DEFAULT 0"`
+	CreatedUnix     timeutil.TimeStamp `xorm:"created"`
 }
 
 func (a *Attachment) AfterUpdate() {

models/migrations/migrations.go

@@ -212,7 +212,6 @@ var migrations = []Migration{
 	NewMigration("Add ResolveDoerID to Comment table", addResolveDoerIDCommentColumn),
 	// v139 -> v140
 	NewMigration("prepend refs/heads/ to issue refs", prependRefsHeadsToIssueRefs),
-	NewMigration("add dataset migration", addDatasetTable),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v140.go

@@ -1,35 +0,0 @@
-// Copyright 2019 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 migrations
-
-import (
-	"fmt"
-
-	"code.gitea.io/gitea/modules/timeutil"
-	"xorm.io/xorm"
-)
-
-func addDatasetTable(x *xorm.Engine) error {
-	type Dataset struct {
-		ID            int64  `xorm:"pk autoincr"`
-		Title         string `xorm:"INDEX NOT NULL"`
-		Status        int32  `xorm:"INDEX"`
-		Category      string
-		Description   string `xorm:"TEXT"`
-		DownloadTimes int64
-		License       string
-		Task          string
-		ReleaseID     int64              `xorm:"INDEX"`
-		UserID        int64              `xorm:"INDEX"`
-		RepoID        int64              `xorm:"INDEX"`
-		CreatedUnix   timeutil.TimeStamp `xorm:"INDEX created"`
-		UpdatedUnix   timeutil.TimeStamp `xorm:"INDEX updated"`
-	}
-
-	if err := x.Sync2(new(Dataset)); err != nil {
-		return fmt.Errorf("Sync2: %v", err)
-	}
-	return nil
-}

modules/decompression/decompression.go

@@ -0,0 +1,7 @@
+package decompression
+
+import "code.gitea.io/gitea/modules/worker"
+
+func NewContext() {
+	worker.NewTaskCenter()
+}

modules/setting/setting.go

@@ -420,9 +420,9 @@ var (
 	UILocation = time.Local
 
 	//Machinery config
-	Broker 				string
-	DefaultQueue		string
-	ResultBackend		string
+	Broker        string
+	DefaultQueue  string
+	ResultBackend string
 )
 
 // DateLang transforms standard language locale name to corresponding value in datetime plugin.

modules/timer/timer.go

@@ -7,15 +7,15 @@ import (
 )
 
 const (
-	DecompressTimer		= time.Minute * 10
+	DecompressTimer = time.Minute * 10
 )
 
 func init() {
 	ticker := time.NewTicker(DecompressTimer)
 	go func() {
 		for {
-			<- ticker.C
+			<-ticker.C
 			repo.HandleUnDecompressAttachment()
 		}
-	} ()
+	}()
 }

modules/worker/task.go

@@ -10,10 +10,10 @@ import (
 
 // 方法名
 const (
-	DecompressTaskName          = "Decompress"
+	DecompressTaskName = "Decompress"
 )
 
-func SendDecompressTask(ctx context.Context, uuid string) error{
+func SendDecompressTask(ctx context.Context, uuid string) error {
 	args := []tasks.Arg{{Name: "uuid", Type: "string", Value: uuid}}
 	task, err := tasks.NewSignature(DecompressTaskName, args)
 	if err != nil {
@@ -22,7 +22,7 @@ func SendDecompressTask(ctx context.Context, uuid string) error{
 	}
 
 	task.RetryCount = 3
-	_,err = AsyncTaskCenter.SendTaskWithContext(ctx, task)
+	_, err = AsyncTaskCenter.SendTaskWithContext(ctx, task)
 	if err != nil {
 		log.Error("SendTaskWithContext failed:", err.Error())
 		return err

modules/worker/worker.go

@@ -1,6 +1,7 @@
 package worker
 
 import (
+	"code.gitea.io/gitea/modules/setting"
 	"github.com/RichardKnop/machinery/v1"
 	mchConf "github.com/RichardKnop/machinery/v1/config"
 )
@@ -9,21 +10,15 @@ var (
 	AsyncTaskCenter *machinery.Server
 )
 
-func init() {
-	tc, err := NewTaskCenter()
+func NewTaskCenter() {
+	cnf := &mchConf.Config{
+		Broker:        setting.Broker,
+		DefaultQueue:  setting.DefaultQueue,
+		ResultBackend: setting.ResultBackend,
+	}
+	tc, err := machinery.NewServer(cnf)
 	if err != nil {
 		panic(err)
 	}
 	AsyncTaskCenter = tc
 }
-
-func NewTaskCenter() (*machinery.Server, error) {
-	cnf := &mchConf.Config{
-		Broker:        "redis://localhost:6379",
-		DefaultQueue:  "DecompressTasksQueue",
-		ResultBackend: "redis://localhost:6379",
-	}
-	// Create server instance
-	return machinery.NewServer(cnf)
-}
-

routers/init.go

@@ -15,6 +15,7 @@ import (
 	"code.gitea.io/gitea/modules/auth/sso"
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/cron"
+	"code.gitea.io/gitea/modules/decompression"
 	"code.gitea.io/gitea/modules/eventsource"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/highlight"
@@ -61,6 +62,7 @@ func NewServices() {
 	mailer.NewContext()
 	_ = cache.NewContext()
 	notification.NewContext()
+	decompression.NewContext()
 }
 
 // In case of problems connecting to DB, retry connection. Eg, PGSQL in Docker Container on Synology

routers/repo/attachment.go

@@ -27,8 +27,8 @@ import (
 
 const (
 	//result of decompress
-	DecompressSuccess			= "0"
-	DecompressFailed			= "1"
+	DecompressSuccess = "0"
+	DecompressFailed  = "1"
 )
 
 func RenderAttachmentSettings(ctx *context.Context) {
@@ -549,13 +549,13 @@ func UpdateMultipart(ctx *context.Context) {
 }
 
 func HandleUnDecompressAttachment() {
-	attachs,err := models.GetUnDecompressAttachments()
+	attachs, err := models.GetUnDecompressAttachments()
 	if err != nil {
 		log.Error("GetUnDecompressAttachments failed:", err.Error())
 		return
 	}
 
-	for _,attach := range attachs {
+	for _, attach := range attachs {
 		err = worker.SendDecompressTask(contexExt.Background(), attach.UUID)
 		if err != nil {
 			log.Error("SendDecompressTask(%s) failed:%s", attach.UUID, err.Error())