show full OpenSubsonic date where available
This commit is contained in:
@@ -3,7 +3,6 @@ package browsing
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"strconv"
|
||||
|
||||
"github.com/dweymouth/supersonic/backend"
|
||||
"github.com/dweymouth/supersonic/backend/mediaprovider"
|
||||
@@ -370,9 +369,9 @@ func formatMiscLabelStr(a *mediaprovider.AlbumWithTracks) string {
|
||||
if a.TrackCount == 1 {
|
||||
tracks = lang.L("track")
|
||||
}
|
||||
yearStr := strconv.Itoa(a.Year)
|
||||
if a.ReissueYear > a.Year {
|
||||
yearStr += fmt.Sprintf(" (%s %d)", lang.L("reissued"), a.ReissueYear)
|
||||
yearStr := util.FormatItemDate(a.Date)
|
||||
if y := a.ReissueDate.Year; y != nil && *y > a.YearOrZero() {
|
||||
yearStr += fmt.Sprintf(" (%s %d)", lang.L("reissued"), util.FormatItemDate(a.ReissueDate))
|
||||
}
|
||||
return fmt.Sprintf("%s · %d %s · %s%s", yearStr, a.TrackCount, tracks, discs, util.SecondsToTimeString(float64(a.Duration)))
|
||||
}
|
||||
|
||||
@@ -203,12 +203,12 @@ func (a *ArtistPage) getGridViewAlbumsModel() []widgets.GridViewItemModel {
|
||||
return nil
|
||||
}
|
||||
sortFunc := func(x, y int) bool {
|
||||
return a.artistInfo.Albums[x].Year < a.artistInfo.Albums[y].Year
|
||||
return a.artistInfo.Albums[x].YearOrZero() < a.artistInfo.Albums[y].YearOrZero()
|
||||
}
|
||||
switch a.cfg.DiscographySort {
|
||||
case discographySorts[1]: /*year descending*/
|
||||
sortFunc = func(x, y int) bool {
|
||||
return a.artistInfo.Albums[x].Year > a.artistInfo.Albums[y].Year
|
||||
return a.artistInfo.Albums[x].YearOrZero() > a.artistInfo.Albums[y].YearOrZero()
|
||||
}
|
||||
case discographySorts[2]: /*name*/
|
||||
sortFunc = func(x, y int) bool {
|
||||
@@ -222,7 +222,7 @@ func (a *ArtistPage) getGridViewAlbumsModel() []widgets.GridViewItemModel {
|
||||
Name: al.Name,
|
||||
ID: al.ID,
|
||||
CoverArtID: al.CoverArtID,
|
||||
Secondary: []string{strconv.Itoa(al.Year)},
|
||||
Secondary: []string{strconv.Itoa(al.YearOrZero())},
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -25,6 +25,75 @@ import (
|
||||
"golang.org/x/net/html"
|
||||
)
|
||||
|
||||
type DateFormat int
|
||||
|
||||
const (
|
||||
DateFormatDMY DateFormat = iota
|
||||
DateFormatMDY
|
||||
DateFormatYMD
|
||||
)
|
||||
|
||||
func dateFormatForLocale(locale string) DateFormat {
|
||||
var region string
|
||||
if i := strings.Index(locale, "-"); i > 0 {
|
||||
region = locale[i+1:]
|
||||
}
|
||||
switch strings.ToUpper(region) {
|
||||
case "US":
|
||||
return DateFormatMDY
|
||||
case "CN", "JP", "KR", "HU", "MN", "LT":
|
||||
return DateFormatYMD
|
||||
default:
|
||||
return DateFormatDMY
|
||||
}
|
||||
}
|
||||
|
||||
func shortMonthName(month int) string {
|
||||
var months = [12]string{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"}
|
||||
if month >= 1 && month <= 12 {
|
||||
return lang.L(months[month-1])
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func FormatItemDate(date mediaprovider.ItemDate) string {
|
||||
var sb strings.Builder
|
||||
df := dateFormatForLocale(fyne.CurrentDevice().Locale().String())
|
||||
switch df {
|
||||
case DateFormatDMY:
|
||||
if d := date.Day; d != nil {
|
||||
sb.WriteString(fmt.Sprintf("%d ", *d))
|
||||
}
|
||||
if m := date.Month; m != nil {
|
||||
sb.WriteString(shortMonthName(*m) + " ")
|
||||
}
|
||||
if y := date.Year; y != nil {
|
||||
sb.WriteString(fmt.Sprintf("%d", *y))
|
||||
}
|
||||
case DateFormatMDY:
|
||||
if m := date.Month; m != nil {
|
||||
sb.WriteString(shortMonthName(*m) + " ")
|
||||
}
|
||||
if d := date.Day; d != nil {
|
||||
sb.WriteString(fmt.Sprintf("%d, ", *d))
|
||||
}
|
||||
if y := date.Year; y != nil {
|
||||
sb.WriteString(fmt.Sprintf("%d", *y))
|
||||
}
|
||||
case DateFormatYMD:
|
||||
if y := date.Year; y != nil {
|
||||
sb.WriteString(fmt.Sprintf("%d ", *y))
|
||||
}
|
||||
if m := date.Month; m != nil {
|
||||
sb.WriteString(shortMonthName(*m) + " ")
|
||||
}
|
||||
if d := date.Day; d != nil {
|
||||
sb.WriteString(fmt.Sprintf("%d", *d))
|
||||
}
|
||||
}
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
var BoldRichTextStyle = widget.RichTextStyle{TextStyle: fyne.TextStyle{Bold: true}, Inline: true}
|
||||
|
||||
func MakeOpaque(c color.Color) color.Color {
|
||||
|
||||
@@ -61,8 +61,8 @@ func (g gridViewAlbumIterator) NextN(n int) []GridViewItemModel {
|
||||
Secondary: al.ArtistNames,
|
||||
SecondaryIDs: al.ArtistIDs,
|
||||
}
|
||||
if al.Year > 0 {
|
||||
model.Suffix = strconv.Itoa(al.Year)
|
||||
if y := al.Date.Year; y != nil {
|
||||
model.Suffix = strconv.Itoa(*al.Date.Year)
|
||||
}
|
||||
return model
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user