index: add this-week-time-format

Also allow specific time format for messages received within the last
7 days.

Signed-off-by: Robin Jarry <robin@jarry.cc>

6 files changed, 36 insertions, 8 deletions

diff --git a/config/aerc.conf.in b/config/aerc.conf.in
index cd40af51..c57c7744 100644
--- a/config/aerc.conf.in
+++ b/config/aerc.conf.in
@@ -23,6 +23,13 @@ timestamp-format=2006-01-02 03:04 PM
 this-day-time-format=
 
 #
+# Index-only time format for messages that were received/sent within the last
+# 7 days. If this is not specified, timestamp-format is used instead.
+#
+# Default: ""
+this-week-time-format=
+
+#
 # Index-only time format for messages that were received/sent this year.
 # If this is not specified, timestamp-format is used instead.
 #
diff --git a/config/config.go b/config/config.go
index dcfdd243..58aa0620 100644
--- a/config/config.go
+++ b/config/config.go
@@ -30,6 +30,7 @@ type UIConfig struct {
 	IndexFormat         string        `ini:"index-format"`
 	TimestampFormat     string        `ini:"timestamp-format"`
 	ThisDayTimeFormat   string        `ini:"this-day-time-format"`
+	ThisWeekTimeFormat  string        `ini:"this-week-time-format"`
 	ThisYearTimeFormat  string        `ini:"this-year-time-format"`
 	ShowHeaders         []string      `delim:","`
 	RenderAccountTabs   string        `ini:"render-account-tabs"`
@@ -496,6 +497,7 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
 			IndexFormat:        "%D %-17.17n %s",
 			TimestampFormat:    "2006-01-02 03:04 PM",
 			ThisDayTimeFormat:  "",
+			ThisWeekTimeFormat: "",
 			ThisYearTimeFormat: "",
 			ShowHeaders: []string{
 				"From", "To", "Cc", "Bcc", "Subject", "Date",
diff --git a/config/triggers.go b/config/triggers.go
index f00f6383..3005d59b 100644
--- a/config/triggers.go
+++ b/config/triggers.go
@@ -39,6 +39,7 @@ func (trig *TriggersConfig) ExecNewEmail(account *AccountConfig,
 			formatstr, args, err := format.ParseMessageFormat(
 				part, conf.Ui.TimestampFormat,
 				conf.Ui.ThisDayTimeFormat,
+				conf.Ui.ThisWeekTimeFormat,
 				conf.Ui.ThisYearTimeFormat,
 				format.Ctx{
 					FromAddress: account.From,
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 2c3fc10f..4bf72a60 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -93,6 +93,13 @@ These options are configured in the *[ui]* section of aerc.conf.
 
 	Default: ""
 
+*this-week-time-format*
+	Index-only time format for messages that were received/sent within the
+	last 7 days. If this is not specified, *timestamp-format* is used
+	instead.
+
+	Default: ""
+
 *this-year-time-format*
 	Index-only time format for messages that were received/sent this year.
 	If this is not specified, *timestamp-format* is used instead.
diff --git a/lib/format/format.go b/lib/format/format.go
index 1aba7627..8681de8e 100644
--- a/lib/format/format.go
+++ b/lib/format/format.go
@@ -48,7 +48,8 @@ type Ctx struct {
 }
 
 func ParseMessageFormat(format string, timeFmt string, thisDayTimeFmt string,
-	thisYearTimeFmt string, ctx Ctx) (string, []interface{}, error) {
+	thisWeekTimeFmt string, thisYearTimeFmt string, ctx Ctx) (
+	string, []interface{}, error) {
 	retval := make([]byte, 0, len(format))
 	var args []interface{}
 
@@ -141,7 +142,8 @@ func ParseMessageFormat(format string, timeFmt string, thisDayTimeFmt string,
 			retval = append(retval, 's')
 			args = append(args,
 				dummyIfZeroDate(date.Local(),
-					timeFmt, thisDayTimeFmt, thisYearTimeFmt))
+					timeFmt, thisDayTimeFmt,
+					thisWeekTimeFmt, thisYearTimeFmt))
 		case 'D':
 			date := envelope.Date
 			if date.IsZero() {
@@ -150,7 +152,8 @@ func ParseMessageFormat(format string, timeFmt string, thisDayTimeFmt string,
 			retval = append(retval, 's')
 			args = append(args,
 				dummyIfZeroDate(date.Local(),
-					timeFmt, thisDayTimeFmt, thisYearTimeFmt))
+					timeFmt, thisDayTimeFmt,
+					thisWeekTimeFmt, thisYearTimeFmt))
 		case 'f':
 			if len(envelope.From) == 0 {
 				return "", nil,
@@ -333,16 +336,22 @@ handle_end_error:
 }
 
 func dummyIfZeroDate(date time.Time, format string, todayFormat string,
-	thisYearFormat string) string {
+	thisWeekFormat string, thisYearFormat string) string {
 	if date.IsZero() {
 		return strings.Repeat("?", len(format))
 	}
-	year, month, day := date.Date()
-	thisYear, thisMonth, thisDay := time.Now().Date()
+	year := date.Year()
+	day := date.YearDay()
+	now := time.Now()
+	thisYear := now.Year()
+	thisDay := now.YearDay()
 	if year == thisYear {
-		if month == thisMonth && day == thisDay && todayFormat != "" {
+		if day == thisDay && todayFormat != "" {
 			return date.Format(todayFormat)
 		}
+		if day > thisDay-7 && thisWeekFormat != "" {
+			return date.Format(thisWeekFormat)
+		}
 		if thisYearFormat != "" {
 			return date.Format(thisYearFormat)
 		}
diff --git a/widgets/msglist.go b/widgets/msglist.go
index 79f05080..324e14d8 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -155,7 +155,9 @@ func (ml *MessageList) Draw(ctx *ui.Context) {
 		ctx.Fill(0, row, ctx.Width(), 1, ' ', style)
 		fmtStr, args, err := format.ParseMessageFormat(
 			uiConfig.IndexFormat, uiConfig.TimestampFormat,
-			uiConfig.ThisDayTimeFormat, uiConfig.ThisYearTimeFormat,
+			uiConfig.ThisDayTimeFormat,
+			uiConfig.ThisWeekTimeFormat,
+			uiConfig.ThisYearTimeFormat,
 			format.Ctx{
 				FromAddress: ml.aerc.SelectedAccount().acct.From,
 				AccountName: ml.aerc.SelectedAccount().Name(),