Per-feed max number of entries

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

diff --git a/cmd/feed2mdir/main.go b/cmd/feed2mdir/main.go
index 70922b871fefaf19827cbafbbad0b7aedf2b923b..815b7d17c8041dad262d0bbc9d250c0ef2e3bab7 100644 (file)
--- a/cmd/feed2mdir/main.go
+++ b/cmd/feed2mdir/main.go
@@ -34,7 +34,7 @@ import (
 )
 
 func main() {
-       maxEntries := flag.Uint("max-entries", 100, "Max entries to process")
+       maxEntries := flag.Uint("max-entries", 0, "Max entries to process (0=unlimited)")
        flag.Parse()
        mdir := flag.Arg(0)
        fp := gofeed.NewParser()
@@ -58,8 +58,9 @@ func main() {
        news := 0
        var when *time.Time
        now := time.Now()
+       latest := &time.Time{}
        for n, item := range feed.Items {
-               if n == int(*maxEntries) {
+               if *maxEntries > 0 && n == int(*maxEntries) {
                        break
                }
                when = nil
@@ -70,6 +71,9 @@ func main() {
                } else {
                        when = &now
                }
+               if latest.Before(*when) {
+                       latest = when
+               }
                var what string
                if len(item.Content) == 0 {
                        what = item.Description
@@ -114,11 +118,16 @@ func main() {
                fd.WriteString("MIME-Version: 1.0\n")
                fd.WriteString("Content-Type: text/html; charset=utf-8\n")
                fd.WriteString("Content-Transfer-Encoding: base64\n")
+               for _, author := range item.Authors {
+                       if len(author.Name) > 0 {
+                               fd.WriteString("X-Author: " + author.Name + "\n")
+                       }
+               }
                for _, link := range item.Links {
                        fd.WriteString("X-URL: " + link + "\n")
                }
-               for _, author := range item.Authors {
-                       fd.WriteString("X-Author: " + author.Name + "\n")
+               for _, enc := range item.Enclosures {
+                       fd.WriteString("X-Enclosure: " + enc.URL + "\n")
                }
                if len(item.Categories) > 0 {
                        fd.WriteString("X-Categories: " + strings.Join(item.Categories, ", ") + "\n")
@@ -138,17 +147,9 @@ func main() {
                }
                news++
        }
-       when = nil
-       if feed.PublishedParsed != nil {
-               when = feed.PublishedParsed
-       } else if feed.UpdatedParsed != nil {
-               when = feed.UpdatedParsed
-       }
-       if when != nil {
-               for _, d := range []string{"cur", "new"} {
-                       if err = os.Chtimes(path.Join(mdir, d), *when, *when); err != nil {
-                               log.Fatalln(err)
-                       }
+       for _, d := range []string{"cur", "new"} {
+               if err = os.Chtimes(path.Join(mdir, d), *latest, *latest); err != nil {
+                       log.Fatalln(err)
                }
        }
        fmt.Println(feed.Title)