aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--internal/template/feed.tpl.go2
-rw-r--r--internal/template/template.go12
2 files changed, 11 insertions, 3 deletions
diff --git a/internal/template/feed.tpl.go b/internal/template/feed.tpl.go
index 2bf07f3..3f6470f 100644
--- a/internal/template/feed.tpl.go
+++ b/internal/template/feed.tpl.go
@@ -70,7 +70,7 @@ const feedTpl = `{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feedi
<hr width="100%"/>
<table width="100%" cellpadding="0" cellspacing="0">
{{template "bottomLine" (dict "descr" "Date:" "content" .Item.Published)}}
- {{template "bottomLine" (dict "descr" "Author:" "content" .Item.Author.Name)}}
+ {{with .Item.Author}}{{template "bottomLine" (dict "descr" "Author:" "content" .Name)}}{{end}}
{{template "bottomLine" (dict "descr" "Subject:" "content" .Item.Title)}}
{{template "bottomLine" (dict "descr" "Filed under:" "content" (join ", " .Item.Categories))}}
</table>`
diff --git a/internal/template/template.go b/internal/template/template.go
index a239484..dd31f51 100644
--- a/internal/template/template.go
+++ b/internal/template/template.go
@@ -3,7 +3,10 @@ package template
import (
"fmt"
"html/template"
+ "strconv"
"strings"
+
+ "github.com/Necoro/feed2imap-go/internal/log"
)
func dict(v ...string) map[string]string {
@@ -29,12 +32,17 @@ func lastUrlPart(url string) string {
return split[len(split)-1]
}
-func byteCount(b int64) string {
+func byteCount(str string) string {
+ b, err := strconv.ParseUint(str, 10, 64)
+ if err != nil {
+ log.Printf("Cannot convert '%s' to byte count: %s", str, err)
+ }
+
const unit = 1024
if b < unit {
return fmt.Sprintf("%d B", b)
}
- div, exp := int64(unit), 0
+ div, exp := uint64(unit), 0
for n := b / unit; n >= unit; n /= unit {
div *= unit
exp++