mirror of
https://github.com/miniflux/v2.git
synced 2025-08-01 17:38:37 +00:00
Move internal packages to an internal folder
For reference: https://go.dev/doc/go1.4#internalpackages
This commit is contained in:
parent
c234903255
commit
168a870c02
433 changed files with 1121 additions and 1123 deletions
46
internal/timezone/timezone.go
Normal file
46
internal/timezone/timezone.go
Normal file
|
@ -0,0 +1,46 @@
|
|||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package timezone // import "miniflux.app/v2/internal/timezone"
|
||||
|
||||
import (
|
||||
"time"
|
||||
)
|
||||
|
||||
// Convert converts provided date time to actual timezone.
|
||||
func Convert(tz string, t time.Time) time.Time {
|
||||
userTimezone := getLocation(tz)
|
||||
|
||||
if t.Location().String() == "" {
|
||||
// In this case, the provided date is already converted to the user timezone by Postgres,
|
||||
// but the timezone information is not set in the time struct.
|
||||
// We cannot use time.In() because the date will be converted a second time.
|
||||
t = time.Date(
|
||||
t.Year(),
|
||||
t.Month(),
|
||||
t.Day(),
|
||||
t.Hour(),
|
||||
t.Minute(),
|
||||
t.Second(),
|
||||
t.Nanosecond(),
|
||||
userTimezone,
|
||||
)
|
||||
} else if t.Location() != userTimezone {
|
||||
t = t.In(userTimezone)
|
||||
}
|
||||
|
||||
return t
|
||||
}
|
||||
|
||||
// Now returns the current time with the given timezone.
|
||||
func Now(tz string) time.Time {
|
||||
return time.Now().In(getLocation(tz))
|
||||
}
|
||||
|
||||
func getLocation(tz string) *time.Location {
|
||||
loc, err := time.LoadLocation(tz)
|
||||
if err != nil {
|
||||
loc = time.Local
|
||||
}
|
||||
return loc
|
||||
}
|
74
internal/timezone/timezone_test.go
Normal file
74
internal/timezone/timezone_test.go
Normal file
|
@ -0,0 +1,74 @@
|
|||
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package timezone // import "miniflux.app/v2/internal/timezone"
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestNow(t *testing.T) {
|
||||
tz := "Europe/Paris"
|
||||
now := Now(tz)
|
||||
|
||||
if now.Location().String() != tz {
|
||||
t.Fatalf(`Unexpected timezone, got %q instead of %q`, now.Location(), tz)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNowWithInvalidTimezone(t *testing.T) {
|
||||
tz := "Invalid Timezone"
|
||||
expected := time.Local
|
||||
now := Now(tz)
|
||||
|
||||
if now.Location().String() != expected.String() {
|
||||
t.Fatalf(`Unexpected timezone, got %q instead of %q`, now.Location(), expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertTimeWithNoTimezoneInformation(t *testing.T) {
|
||||
tz := "Canada/Pacific"
|
||||
input := time.Date(2018, 3, 1, 14, 2, 3, 0, time.FixedZone("", 0))
|
||||
output := Convert(tz, input)
|
||||
|
||||
if output.Location().String() != tz {
|
||||
t.Fatalf(`Unexpected timezone, got %q instead of %s`, output.Location(), tz)
|
||||
}
|
||||
|
||||
hours, minutes, secs := output.Clock()
|
||||
if hours != 14 || minutes != 2 || secs != 3 {
|
||||
t.Fatalf(`Unexpected time, got hours=%d, minutes=%d, secs=%d`, hours, minutes, secs)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertTimeWithDifferentTimezone(t *testing.T) {
|
||||
tz := "Canada/Central"
|
||||
input := time.Date(2018, 3, 1, 14, 2, 3, 0, time.UTC)
|
||||
output := Convert(tz, input)
|
||||
|
||||
if output.Location().String() != tz {
|
||||
t.Fatalf(`Unexpected timezone, got %q instead of %s`, output.Location(), tz)
|
||||
}
|
||||
|
||||
hours, minutes, secs := output.Clock()
|
||||
if hours != 8 || minutes != 2 || secs != 3 {
|
||||
t.Fatalf(`Unexpected time, got hours=%d, minutes=%d, secs=%d`, hours, minutes, secs)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertTimeWithIdenticalTimezone(t *testing.T) {
|
||||
tz := "Canada/Central"
|
||||
loc, _ := time.LoadLocation(tz)
|
||||
input := time.Date(2018, 3, 1, 14, 2, 3, 0, loc)
|
||||
output := Convert(tz, input)
|
||||
|
||||
if output.Location().String() != tz {
|
||||
t.Fatalf(`Unexpected timezone, got %q instead of %s`, output.Location(), tz)
|
||||
}
|
||||
|
||||
hours, minutes, secs := output.Clock()
|
||||
if hours != 14 || minutes != 2 || secs != 3 {
|
||||
t.Fatalf(`Unexpected time, got hours=%d, minutes=%d, secs=%d`, hours, minutes, secs)
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue