diff options
author | gdeverlant <e.bekrek@yandex.com> | 2019-01-06 23:37:30 +0100 |
---|---|---|
committer | techknowlogick <hello@techknowlogick.com> | 2019-01-06 17:37:30 -0500 |
commit | d3dc07f282936849897f861346777b47c8c388d3 (patch) | |
tree | 2da810fc1d6671bf8659f9bf868e184698f0fc7c /models | |
parent | dd006db5a719b33aef7887faab48718e4b0f2786 (diff) | |
download | gitea-d3dc07f282936849897f861346777b47c8c388d3.tar.gz gitea-d3dc07f282936849897f861346777b47c8c388d3.zip |
Added URL mapping for Release attachments like on github.com (#1707)
Diffstat (limited to 'models')
-rw-r--r-- | models/attachment.go | 17 | ||||
-rw-r--r-- | models/release.go | 10 |
2 files changed, 27 insertions, 0 deletions
diff --git a/models/attachment.go b/models/attachment.go index 4a5101b385..808bc243dc 100644 --- a/models/attachment.go +++ b/models/attachment.go @@ -151,6 +151,11 @@ func GetAttachmentByUUID(uuid string) (*Attachment, error) { return getAttachmentByUUID(x, uuid) } +// GetAttachmentByReleaseIDFileName returns attachment by given releaseId and fileName. +func GetAttachmentByReleaseIDFileName(releaseID int64, fileName string) (*Attachment, error) { + return getAttachmentByReleaseIDFileName(x, releaseID, fileName) +} + func getAttachmentsByIssueID(e Engine, issueID int64) ([]*Attachment, error) { attachments := make([]*Attachment, 0, 10) return attachments, e.Where("issue_id = ? AND comment_id = 0", issueID).Find(&attachments) @@ -171,6 +176,18 @@ func getAttachmentsByCommentID(e Engine, commentID int64) ([]*Attachment, error) return attachments, x.Where("comment_id=?", commentID).Find(&attachments) } +// getAttachmentByReleaseIDFileName return a file based on the the following infos: +func getAttachmentByReleaseIDFileName(e Engine, releaseID int64, fileName string) (*Attachment, error) { + attach := &Attachment{ReleaseID: releaseID, Name: fileName} + has, err := e.Get(attach) + if err != nil { + return nil, err + } else if !has { + return nil, err + } + return attach, nil +} + // DeleteAttachment deletes the given attachment and optionally the associated file. func DeleteAttachment(a *Attachment, remove bool) error { _, err := DeleteAttachments([]*Attachment{a}, remove) diff --git a/models/release.go b/models/release.go index c1c8b933d0..0c78707d6b 100644 --- a/models/release.go +++ b/models/release.go @@ -14,6 +14,7 @@ import ( "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" + api "code.gitea.io/sdk/gitea" "github.com/go-xorm/builder" ) @@ -283,6 +284,15 @@ func GetReleasesByRepoID(repoID int64, opts FindReleasesOptions, page, pageSize return rels, err } +// GetReleasesByRepoIDAndNames returns a list of releases of repository according repoID and tagNames. +func GetReleasesByRepoIDAndNames(repoID int64, tagNames []string) (rels []*Release, err error) { + err = x. + Desc("created_unix"). + In("tag_name", tagNames). + Find(&rels, Release{RepoID: repoID}) + return rels, err +} + // GetReleaseCountByRepoID returns the count of releases of repository func GetReleaseCountByRepoID(repoID int64, opts FindReleasesOptions) (int64, error) { return x.Where(opts.toConds(repoID)).Count(&Release{}) |