mirror of
https://codeberg.org/Codeberg/pages-server.git
synced 2024-11-05 14:07:01 +00:00
091e6c8ed9
- Logs are currently indicating that it's returning `nil` in valid scenarios, therefor this patch adds extra logging in this code to better understand what it is doing in this function. Co-authored-by: Gusted <williamzijl7@hotmail.com> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/130 Reviewed-by: 6543 <6543@obermui.de> Co-authored-by: Gusted <gusted@noreply.codeberg.org> Co-committed-by: Gusted <gusted@noreply.codeberg.org>
84 lines
2.6 KiB
Go
84 lines
2.6 KiB
Go
package upstream
|
|
|
|
import (
|
|
"mime"
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"codeberg.org/codeberg/pages/server/cache"
|
|
"codeberg.org/codeberg/pages/server/gitea"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
type branchTimestamp struct {
|
|
Branch string
|
|
Timestamp time.Time
|
|
}
|
|
|
|
// GetBranchTimestamp finds the default branch (if branch is "") and returns the last modification time of the branch
|
|
// (or nil if the branch doesn't exist)
|
|
func GetBranchTimestamp(giteaClient *gitea.Client, owner, repo, branch string, branchTimestampCache cache.SetGetKey) *branchTimestamp {
|
|
log := log.With().Strs("BranchInfo", []string{owner, repo, branch}).Logger()
|
|
if result, ok := branchTimestampCache.Get(owner + "/" + repo + "/" + branch); ok {
|
|
if result == nil {
|
|
log.Debug().Msg("branchTimestampCache found item, but result is empty")
|
|
return nil
|
|
}
|
|
log.Debug().Msg("branchTimestampCache found item, returning result")
|
|
return result.(*branchTimestamp)
|
|
}
|
|
result := &branchTimestamp{
|
|
Branch: branch,
|
|
}
|
|
if len(branch) == 0 {
|
|
// Get default branch
|
|
defaultBranch, err := giteaClient.GiteaGetRepoDefaultBranch(owner, repo)
|
|
if err != nil {
|
|
log.Err(err).Msg("Could't fetch default branch from repository")
|
|
_ = branchTimestampCache.Set(owner+"/"+repo+"/", nil, defaultBranchCacheTimeout)
|
|
return nil
|
|
}
|
|
log.Debug().Msg("Succesfully fetched default branch from Gitea")
|
|
result.Branch = defaultBranch
|
|
}
|
|
|
|
timestamp, err := giteaClient.GiteaGetRepoBranchTimestamp(owner, repo, result.Branch)
|
|
if err != nil {
|
|
log.Err(err).Msg("Could not get latest commit's timestamp from branch")
|
|
return nil
|
|
}
|
|
log.Debug().Msg("Succesfully fetched latest commit's timestamp from branch, adding to cache")
|
|
result.Timestamp = timestamp
|
|
_ = branchTimestampCache.Set(owner+"/"+repo+"/"+branch, result, branchExistenceCacheTimeout)
|
|
return result
|
|
}
|
|
|
|
func (o *Options) getMimeTypeByExtension() string {
|
|
if o.ForbiddenMimeTypes == nil {
|
|
o.ForbiddenMimeTypes = make(map[string]bool)
|
|
}
|
|
mimeType := mime.TypeByExtension(path.Ext(o.TargetPath))
|
|
mimeTypeSplit := strings.SplitN(mimeType, ";", 2)
|
|
if o.ForbiddenMimeTypes[mimeTypeSplit[0]] || mimeType == "" {
|
|
if o.DefaultMimeType != "" {
|
|
mimeType = o.DefaultMimeType
|
|
} else {
|
|
mimeType = "application/octet-stream"
|
|
}
|
|
}
|
|
return mimeType
|
|
}
|
|
|
|
func (o *Options) generateUri() string {
|
|
return path.Join(o.TargetOwner, o.TargetRepo, "raw", o.TargetBranch, o.TargetPath)
|
|
}
|
|
|
|
func (o *Options) generateUriClientArgs() (targetOwner, targetRepo, ref, resource string) {
|
|
return o.TargetOwner, o.TargetRepo, o.TargetBranch, o.TargetPath
|
|
}
|
|
|
|
func (o *Options) timestamp() string {
|
|
return strconv.FormatInt(o.BranchTimestamp.Unix(), 10)
|
|
}
|