tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-18 16:14:26 +00:00
Code Releases Activity

Simplify mirror repository API logic (#30963) (#31009)

Browse Source 
Backport #30963 by wxiaoguang

Fix #30921

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot 2024-05-18 16:26:20 +08:00 committed by GitHub
parent bd3787c774
commit 8eac16de21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/structs/repo.go
View File

@ -217,7 +217,7 @@ type EditRepoOption struct {
Archived *bool `json:"archived,omitempty"` Archived *bool `json:"archived,omitempty"`
// set to a string like `8h30m0s` to set the mirror interval time // set to a string like `8h30m0s` to set the mirror interval time
MirrorInterval *string `json:"mirror_interval,omitempty"` MirrorInterval *string `json:"mirror_interval,omitempty"`
// enable prune - remove obsolete remote-tracking references // enable prune - remove obsolete remote-tracking references when mirroring
EnablePrune *bool `json:"enable_prune,omitempty"` EnablePrune *bool `json:"enable_prune,omitempty"`
} }

12
routers/api/v1/repo/repo.go
View File

@ -1062,16 +1062,10 @@ func updateRepoArchivedState(ctx *context.APIContext, opts api.EditRepoOption) e
func updateMirror(ctx *context.APIContext, opts api.EditRepoOption) error { func updateMirror(ctx *context.APIContext, opts api.EditRepoOption) error {
repo := ctx.Repo.Repository repo := ctx.Repo.Repository
// only update mirror if interval or enable prune are provided // Skip this update if the repo is not a mirror, do not return error.
if opts.MirrorInterval == nil && opts.EnablePrune == nil { // Because reporting errors only makes the logic more complex&fragile, it doesn't really help end users.
return nil
}
// these values only make sense if the repo is a mirror
if !repo.IsMirror { if !repo.IsMirror {
err := fmt.Errorf("repo is not a mirror, can not change mirror interval") return nil
ctx.Error(http.StatusUnprocessableEntity, err.Error(), err)
return err
} }
// get the mirror from the repo // get the mirror from the repo

2
templates/swagger/v1_json.tmpl generated
View File

@ -20610,7 +20610,7 @@
"x-go-name": "Description" "x-go-name": "Description"
}, },
"enable_prune": { "enable_prune": {
"description": "enable prune - remove obsolete remote-tracking references", "description": "enable prune - remove obsolete remote-tracking references when mirroring",
"type": "boolean", "type": "boolean",
"x-go-name": "EnablePrune" "x-go-name": "EnablePrune"
}, },