implement atom

app/app.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"go.balki.me/tss/log"
+	"go.balki.me/tss/parser"
 	"go.balki.me/tss/proxy"
 	"go.balki.me/tss/telegram"
 )
@@ -65,7 +66,7 @@ func ProcessFeed(feed FeedCfg, scheduler Scheduler, dbDir string, tgram telegram
 		return
 	}
 
-	entries, err := ParseFeed(data)
+	entries, err := parser.ParseFeed(feed.Type, data)
 	if err != nil {
 		log.Error("feed parsing failed", "feed", feed.Name, "data", data, "error", err)
 		return
@@ -74,13 +75,13 @@ func ProcessFeed(feed FeedCfg, scheduler Scheduler, dbDir string, tgram telegram
 	scheduler.Good(feed.Name)
 
 	var records []Record
-	var newEntries []FeedEntry
+	var newEntries []parser.FeedEntry
 	if db.IsNewFeed() {
 		ftl := int(feed.FirstTimeLimit)
 		if feed.FirstTimeLimit == NoLimit || len(entries) <= ftl {
 			newEntries = entries
 		} else {
-			var filteredEntries []FeedEntry
+			var filteredEntries []parser.FeedEntry
 			newEntries, filteredEntries = entries[:ftl], entries[ftl:]
 			for _, entry := range filteredEntries {
 				records = append(records, Record{

app/config.go

@@ -4,6 +4,7 @@ import (
 	"os"
 	"path"
 
+	"go.balki.me/tss/parser"
 	"gopkg.in/yaml.v3"
 )
 
@@ -12,14 +13,15 @@ type FeedLimit int
 const NoLimit FeedLimit = -1
 
 type FeedCfg struct {
-	Name           string    `yaml:"name"`
-	Channel        string    `yaml:"channel"`
-	Rhash          string    `yaml:"rhash"`
-	Url            string    `yaml:"url"`
-	Cron           string    `yaml:"cron"`
-	Proxy          string    `yaml:"proxy"`
-	FTL            *int      `yaml:"first_time_limit"`
-	FirstTimeLimit FeedLimit `yaml:"-"`
+	Name           string          `yaml:"name"`
+	Channel        string          `yaml:"channel"`
+	Rhash          string          `yaml:"rhash"`
+	Url            string          `yaml:"url"`
+	Cron           string          `yaml:"cron"`
+	Proxy          string          `yaml:"proxy"`
+	Type           parser.FeedType `yaml:"type"`
+	FTL            *int            `yaml:"first_time_limit"`
+	FirstTimeLimit FeedLimit       `yaml:"-"`
 }
 
 type Config struct {

app/db.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"go.balki.me/tss/log"
+	"go.balki.me/tss/parser"
 )
 
 type Status string
@@ -27,12 +28,12 @@ type Record struct {
 	Time      time.Time
 	Status    Status
 	Filter    string
-	FeedEntry FeedEntry
+	FeedEntry parser.FeedEntry
 }
 
 type DB interface {
 	IsNewFeed() bool
-	Filter(entries []FeedEntry) ([]FeedEntry, error)
+	Filter(entries []parser.FeedEntry) ([]parser.FeedEntry, error)
 	Save([]Record) error
 }
 
@@ -72,8 +73,8 @@ func NewDB(storageDir, feedName string) (DB, error) {
 	return &db, nil
 }
 
-func (d *db) Filter(entries []FeedEntry) ([]FeedEntry, error) {
-	var filteredEntries []FeedEntry
+func (d *db) Filter(entries []parser.FeedEntry) ([]parser.FeedEntry, error) {
+	var filteredEntries []parser.FeedEntry
 	for _, entry := range entries {
 		if _, ok := d.seenLinks[entry.Link]; !ok {
 			filteredEntries = append(filteredEntries, entry)

app/parser.go

@@ -1,28 +0,0 @@
-package app
-
-import (
-	"encoding/xml"
-)
-
-type FeedEntry struct {
-	Title       string `xml:"title"`
-	Link        string `xml:"link"`
-	Author      string `xml:"author"`
-	Guid        string `xml:"guid"`
-	Description string `xml:"description"`
-	Content     string `xml:",innerxml"`
-}
-
-func ParseFeed(data []byte) ([]FeedEntry, error) {
-
-	v := struct {
-		Items []FeedEntry `xml:"channel>item"`
-	}{}
-
-	err := xml.Unmarshal(data, &v)
-	if err != nil {
-		return nil, err
-	}
-
-	return v.Items, nil
-}