Merge branch 'go-1.16'

9 files changed, 85 insertions, 79 deletions

diff --git a/.editorconfig b/.editorconfig
index 03f964f..0111a8e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,4 +9,5 @@ indent_size = 4
 
 [*.tpl]
 indent_style = space
-indent_size = 2
\ No newline at end of file
+indent_size = 2
+end_of_line = crlf
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..777829e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Default
+* text=auto
+
+# Templates should have CRLF
+*.tpl text eol=crlf
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 2286985..e1cf719 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.15
+    - name: Set up Go 1.16
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15
+        go-version: 1.16
       id: go
 
     - name: Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cb80408..687b92d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.15
+    - name: Set up Go 1.16
       uses: actions/setup-go@v2
       with:
-        go-version: 1.15
+        go-version: 1.16
       id: go
 
     - name: Checkout
diff --git a/go.mod b/go.mod
index 36796c2..2f0fc80 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/Necoro/feed2imap-go
 
-go 1.15
+go 1.16
 
 require (
 	github.com/PuerkitoBio/goquery v1.6.1
diff --git a/internal/feed/template/html.tpl b/internal/feed/template/html.tpl
new file mode 100644
index 0000000..aa7d341
--- /dev/null
+++ b/internal/feed/template/html.tpl
@@ -0,0 +1,58 @@
+{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}}
+{{define "bottomLine"}}
+  {{if .content}}
+    <tr>
+      <td style="text-align: right; padding: 0">
+        <span style="color: #ababab">{{.descr}}</span>&nbsp;&nbsp;
+      </td>
+      <td style="padding: 0">
+        <span style="color: #ababab">{{.content}}</span>
+      </td>
+    </tr>
+  {{end}}
+{{end}}
+<table style="border: 2px black groove; background: #ededed; width: 100%; margin-bottom: 5px">
+  <tr>
+    <td style="text-align: right; padding: 4px"><strong>Feed</strong></td>
+    <td style="width: 100%; padding: 4px">
+      {{with .Feed.Link}}<a href="{{.}}">{{end}}
+        <strong>{{or .Feed.Title .Feed.Link "Unnammed feed"}}</strong>
+        {{if .Feed.Link}}</a>{{end}}
+    </td>
+  </tr>
+  <tr>
+    <td style="text-align: right; padding: 4px"><strong>Item</strong></td>
+    <td style="width: 100%; padding: 4px">
+      {{with .Item.Link}}<a href="{{.}}">{{end}}
+        <strong>{{or .Item.Title .Item.Link}}</strong>
+        {{if .Item.Link}}</a>{{end}}
+    </td>
+  </tr>
+</table>
+{{with .Body}}
+  {{html .}}
+{{end}}
+{{with .Item.Enclosures}}
+  <table style="border: 2px black groove; background: #ededed; width: 100%; margin-top: 5px">
+    <tr>
+      <td style="width: 100%"><strong>Files:</strong></td>
+    </tr>
+    {{range .}}
+      <tr>
+        <td>
+          &nbsp;&nbsp;&nbsp;
+          <a href={{.URL}}>{{.URL | lastUrlPart}}</a> ({{with .Length}}{{. | byteCount}}, {{end}}{{.Type}})
+        </td>
+      </tr>
+    {{end}}
+  </table>
+{{end}}
+<hr style="width: 100%"/>
+<table style="width: 100%; border-spacing: 0">
+  {{template "bottomLine" (dict "descr" "Date:" "content" .Date)}}
+  {{template "bottomLine" (dict "descr" "Author:" "content" .Creator)}}
+  {{template "bottomLine" (dict "descr" "Filed under:" "content" (join ", " .Categories))}}
+  {{with .FeedLink}}
+    {{template "bottomLine" (dict "descr" "Feed-Link:" "content" (print "<a style=\"color: #ababab;\" href=\"" . "\">" . "</a>" | html))}}
+  {{end}}
+</table>
\ No newline at end of file
diff --git a/internal/feed/template/html.tpl.go b/internal/feed/template/html.tpl.go
deleted file mode 100644
index be84030..0000000
--- a/internal/feed/template/html.tpl.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package template
-
-var Html = fromString("Feed", htmlTpl, true)
-
-//noinspection HtmlDeprecatedAttribute,HtmlUnknownTarget
-const htmlTpl = `{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}}
-{{define "bottomLine"}}
-  {{if .content}}
-    <tr>
-      <td style="text-align: right; padding: 0">
-        <span style="color: #ababab">{{.descr}}</span>&nbsp;&nbsp;
-      </td>
-      <td style="padding: 0">
-        <span style="color: #ababab">{{.content}}</span>
-      </td>
-    </tr>
-  {{end}}
-{{end}}
-<table style="border: 2px black groove; background: #ededed; width: 100%; margin-bottom: 5px">
-    <tr>
-        <td style="text-align: right; padding: 4px"><strong>Feed</strong></td>
-        <td style="width: 100%; padding: 4px">
-            {{with .Feed.Link}}<a href="{{.}}">{{end}}
-                <strong>{{or .Feed.Title .Feed.Link "Unnammed feed"}}</strong>
-                {{if .Feed.Link}}</a>{{end}}
-        </td>
-    </tr>
-    <tr>
-        <td style="text-align: right; padding: 4px"><strong>Item</strong></td>
-        <td style="width: 100%; padding: 4px">
-            {{with .Item.Link}}<a href="{{.}}">{{end}}
-                <strong>{{or .Item.Title .Item.Link}}</strong>
-                {{if .Item.Link}}</a>{{end}}
-        </td>
-    </tr>
-</table>
-{{with .Body}}
-  {{html .}}
-{{end}}
-{{with .Item.Enclosures}}
-    <table style="border: 2px black groove; background: #ededed; width: 100%; margin-top: 5px">
-        <tr>
-            <td style="width: 100%"><strong>Files:</strong></td>
-        </tr>
-        {{range .}}
-            <tr>
-                <td>
-                    &nbsp;&nbsp;&nbsp;
-                    <a href={{.URL}}>{{.URL | lastUrlPart}}</a> ({{with .Length}}{{. | byteCount}}, {{end}}{{.Type}})
-                </td>
-            </tr>
-        {{end}}
-    </table>
-{{end}}
-<hr style="width: 100%"/>
-<table style="width: 100%; border-spacing: 0">
-  {{template "bottomLine" (dict "descr" "Date:" "content" .Date)}}
-  {{template "bottomLine" (dict "descr" "Author:" "content" .Creator)}}
-  {{template "bottomLine" (dict "descr" "Filed under:" "content" (join ", " .Categories))}}
-  {{with .FeedLink}}
-    {{template "bottomLine" (dict "descr" "Feed-Link:" "content" (print "<a style=\"color: #ababab;\" href=\"" . "\">" . "</a>" | html))}}
-  {{end}}
-</table>`
diff --git a/internal/feed/template/template.go b/internal/feed/template/template.go
index d8eb850..9804190 100644
--- a/internal/feed/template/template.go
+++ b/internal/feed/template/template.go
@@ -1,6 +1,7 @@
 package template
 
 import (
+	_ "embed"
 	"fmt"
 	html "html/template"
 	"io"
@@ -15,6 +16,15 @@ type Template interface {
 	Execute(wr io.Writer, data interface{}) error
 }
 
+//go:embed html.tpl
+var htmlTpl string
+
+//go:embed text.tpl
+var textTpl string
+
+var Html = fromString("Feed", htmlTpl, true)
+var Text = fromString("Feed", textTpl, false)
+
 func must(t Template, err error) Template {
 	if err != nil {
 		panic(err)
diff --git a/internal/feed/template/text.tpl.go b/internal/feed/template/text.tpl
index 19aa9b2..57eef18 100644
--- a/internal/feed/template/text.tpl.go
+++ b/internal/feed/template/text.tpl
@@ -1,9 +1,4 @@
-package template
-
-var Text = fromString("Feed", textTpl, false)
-
-//noinspection HtmlDeprecatedAttribute,HtmlUnknownTarget
-const textTpl = `{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}}
+{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}}
 {{- with .Item.Link -}}
 <{{.}}>
 
@@ -17,7 +12,7 @@ Files:
   {{ .URL}} ({{with .Length}}{{. | byteCount}}, {{end}}{{.Type}})
 {{- end -}}
 {{- end}}
--- 
+--
 Feed: {{ with .Feed.Title -}}{{.}}{{- end }}
 {{ with .Feed.Link -}}
   <{{.}}>
@@ -31,12 +26,12 @@ Item: {{ with .Item.Title -}}
 {{ with .Date -}}
   Date: {{.}}
 {{ end -}}
-{{ with .Creator -}} 
+{{ with .Creator -}}
   Author: {{.}}
 {{ end -}}
-{{ with (join ", " .Categories) -}} 
+{{ with (join ", " .Categories) -}}
   Filed under: {{.}}
 {{ end -}}
 {{ with .FeedLink -}}
   Feed-Link: {{.}}
-{{ end -}}`
+{{ end -}}
\ No newline at end of file