Single X-Categories header

[feeder.git] / cmd / feed2mdir / main.go

diff --git a/cmd/feed2mdir/main.go b/cmd/feed2mdir/main.go
index cac223700db4a7dae8ec28300db276e7f7460945..70922b871fefaf19827cbafbbad0b7aedf2b923b 100644 (file)
--- a/cmd/feed2mdir/main.go
+++ b/cmd/feed2mdir/main.go
@@ -42,12 +42,24 @@ func main() {
        if err != nil {
                log.Fatalln(err)
        }
+
+       guids := make(map[string]struct{}, len(feed.Items))
+       useGUID := true
+       for _, item := range feed.Items {
+               if _, exists := guids[item.GUID]; exists {
+                       useGUID = false
+                       break
+               } else {
+                       guids[item.GUID] = struct{}{}
+               }
+       }
+
+       h := sha512.New()
        news := 0
        var when *time.Time
        now := time.Now()
-       max := int(*maxEntries) - 1
        for n, item := range feed.Items {
-               if n == max {
+               if n == int(*maxEntries) {
                        break
                }
                when = nil
@@ -58,13 +70,23 @@ func main() {
                } else {
                        when = &now
                }
-               fn := hex.EncodeToString(h.Sum(nil)[:sha512.Size/2])
                var what string
                if len(item.Content) == 0 {
                        what = item.Description
                } else {
                        what = item.Content
                }
+               what = strings.TrimPrefix(what, "<![CDATA[")
+               what = strings.TrimSuffix(what, "]]>")
+               h.Reset()
+               if useGUID {
+                       h.Write([]byte(item.GUID))
+               } else {
+                       h.Write([]byte(item.Title))
+                       h.Write([]byte{0})
+                       h.Write([]byte(what))
+               }
+               fn := hex.EncodeToString(h.Sum(nil)[:sha512.Size/2])
                exists := false
                for _, d := range []string{"cur", "new"} {
                        entries, err := os.ReadDir(path.Join(mdir, d))
@@ -98,8 +120,8 @@ func main() {
                for _, author := range item.Authors {
                        fd.WriteString("X-Author: " + author.Name + "\n")
                }
-               for _, cat := range item.Categories {
-                       fd.WriteString("X-Category: " + cat + "\n")
+               if len(item.Categories) > 0 {
+                       fd.WriteString("X-Categories: " + strings.Join(item.Categories, ", ") + "\n")
                }
                fd.WriteString("\n")
                what = base64.StdEncoding.EncodeToString([]byte(what))