mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-28 04:36:11 +01:00
06f968d662
Backport #20925 This commit updates the `GET /api/v1/repos/{owner}/{repo}/archive/{archive}` endpoint which prior to this PR had a couple of issues. 1. The endpoint had a hard-coded 20s timeout for the archiver to complete after which a 500 (Internal Server Error) was returned to client. For a scripted API client there was no clear way of telling that the operation timed out and that it should retry. 2. Whenever the timeout _did occur_, the code used to panic. This was caused by the API endpoint "delegating" to the same call path as the web, which uses a slightly different way of reporting errors (HTML rather than JSON for example). More specifically, `api/v1/repo/file.go#GetArchive` just called through to `web/repo/repo.go#Download`, which expects the `Context` to have a `Render` field set, but which is `nil` for API calls. Hence, a `nil` pointer error. The code addresses (1) by dropping the hard-coded timeout. Instead, any timeout/cancelation on the incoming `Context` is used. The code addresses (2) by updating the API endpoint to use a separate call path for the API-triggered archive download. This avoids producing HTML-errors on errors (it now produces JSON errors). Signed-off-by: Peter Gardfjäll <peter.gardfjall.work@gmail.com> Signed-off-by: Peter Gardfjäll <peter.gardfjall.work@gmail.com> Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Peter Gardfjäll <peter.gardfjall.work@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
108 lines
2.7 KiB
Go
108 lines
2.7 KiB
Go
// Copyright 2017 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 timeutil
|
|
|
|
import (
|
|
"time"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
// TimeStamp defines a timestamp
|
|
type TimeStamp int64
|
|
|
|
// mock is NOT concurrency-safe!!
|
|
var mock time.Time
|
|
|
|
// Set sets the time to a mocked time.Time
|
|
func Set(now time.Time) {
|
|
mock = now
|
|
}
|
|
|
|
// Unset will unset the mocked time.Time
|
|
func Unset() {
|
|
mock = time.Time{}
|
|
}
|
|
|
|
// TimeStampNow returns now int64
|
|
func TimeStampNow() TimeStamp {
|
|
if !mock.IsZero() {
|
|
return TimeStamp(mock.Unix())
|
|
}
|
|
return TimeStamp(time.Now().Unix())
|
|
}
|
|
|
|
// Add adds seconds and return sum
|
|
func (ts TimeStamp) Add(seconds int64) TimeStamp {
|
|
return ts + TimeStamp(seconds)
|
|
}
|
|
|
|
// AddDuration adds time.Duration and return sum
|
|
func (ts TimeStamp) AddDuration(interval time.Duration) TimeStamp {
|
|
return ts + TimeStamp(interval/time.Second)
|
|
}
|
|
|
|
// Year returns the time's year
|
|
func (ts TimeStamp) Year() int {
|
|
return ts.AsTime().Year()
|
|
}
|
|
|
|
// AsTime convert timestamp as time.Time in Local locale
|
|
func (ts TimeStamp) AsTime() (tm time.Time) {
|
|
return ts.AsTimeInLocation(setting.DefaultUILocation)
|
|
}
|
|
|
|
// AsLocalTime convert timestamp as time.Time in local location
|
|
func (ts TimeStamp) AsLocalTime() time.Time {
|
|
return time.Unix(int64(ts), 0)
|
|
}
|
|
|
|
// AsTimeInLocation convert timestamp as time.Time in Local locale
|
|
func (ts TimeStamp) AsTimeInLocation(loc *time.Location) (tm time.Time) {
|
|
tm = time.Unix(int64(ts), 0).In(loc)
|
|
return
|
|
}
|
|
|
|
// AsTimePtr convert timestamp as *time.Time in Local locale
|
|
func (ts TimeStamp) AsTimePtr() *time.Time {
|
|
return ts.AsTimePtrInLocation(setting.DefaultUILocation)
|
|
}
|
|
|
|
// AsTimePtrInLocation convert timestamp as *time.Time in customize location
|
|
func (ts TimeStamp) AsTimePtrInLocation(loc *time.Location) *time.Time {
|
|
tm := time.Unix(int64(ts), 0).In(loc)
|
|
return &tm
|
|
}
|
|
|
|
// Format formats timestamp as given format
|
|
func (ts TimeStamp) Format(f string) string {
|
|
return ts.FormatInLocation(f, setting.DefaultUILocation)
|
|
}
|
|
|
|
// FormatInLocation formats timestamp as given format with spiecific location
|
|
func (ts TimeStamp) FormatInLocation(f string, loc *time.Location) string {
|
|
return ts.AsTimeInLocation(loc).Format(f)
|
|
}
|
|
|
|
// FormatLong formats as RFC1123Z
|
|
func (ts TimeStamp) FormatLong() string {
|
|
return ts.Format(time.RFC1123Z)
|
|
}
|
|
|
|
// FormatShort formats as short
|
|
func (ts TimeStamp) FormatShort() string {
|
|
return ts.Format("Jan 02, 2006")
|
|
}
|
|
|
|
// FormatDate formats a date in YYYY-MM-DD server time zone
|
|
func (ts TimeStamp) FormatDate() string {
|
|
return time.Unix(int64(ts), 0).String()[:10]
|
|
}
|
|
|
|
// IsZero is zero time
|
|
func (ts TimeStamp) IsZero() bool {
|
|
return ts.AsTimeInLocation(time.Local).IsZero()
|
|
}
|