Try out different rss package

cmd/data/articles.go

@@ -11,27 +11,25 @@ import (
 )
 
 type Article struct {
+	Tags     *TagList
 	Title    string
 	Author   string
 	Created  time.Time
 	Desc     string
 	Content  string
-	Tags     []string
 	UUID     uuid.UUID
 	AuthorID int64
 }
 
-// TODO: setCh
 type ArticleList struct {
 	addCh    chan *Article
 	delCh    chan uuid.UUID
-	getCh    chan []Article
 	retCh    chan *Article
+	getCh    chan []Article
 	articles []*Article
 	wg       sync.WaitGroup
 }
 
-// TODO: setCh
 type TagList struct {
 	addCh chan string
 	getCh chan []string
@@ -39,16 +37,16 @@ type TagList struct {
 	wg    sync.WaitGroup
 }
 
-func initArticleList() *ArticleList {
+func minArticleList() *ArticleList {
 	return &ArticleList{
 		addCh: make(chan *Article),
 		delCh: make(chan uuid.UUID),
-		getCh: make(chan []Article),
 		retCh: make(chan *Article),
+		getCh: make(chan []Article),
 	}
 }
 
-func initTagList() *TagList {
+func minTagList() *TagList {
 	return &TagList{
 		addCh: make(chan string),
 		getCh: make(chan []string),
@@ -91,8 +89,8 @@ func (tl *TagList) start() {
 }
 
 func NewArticleList() *ArticleList {
-	list := initArticleList()
+	list := minArticleList()
-	list.articles = make([]*Article, 0)
+	list.articles = []*Article{}
 
 	list.wg.Add(1)
 	go list.start()
@@ -108,7 +106,6 @@ func (al *ArticleList) Add(a *Article) {
 func (al *ArticleList) Release(uuid uuid.UUID) (*Article, bool) {
 	al.delCh <- uuid
 	article := <-al.retCh
-
 	if article == nil {
 		return nil, false
 	}
@@ -126,8 +123,10 @@ func (al *ArticleList) Save(filename string) error {
 	}
 	defer file.Close()
 
+	encoder := gob.NewEncoder(file)
 	articles := al.Get()
-	if err = gob.NewEncoder(file).Encode(articles); err != nil {
+	err = encoder.Encode(articles)
+	if err != nil {
 		return fmt.Errorf("error ecoding key: %v", err)
 	}
 
@@ -140,8 +139,10 @@ func LoadArticleList(filename string) (*ArticleList, error) {
 		return nil, fmt.Errorf("error opening key file: %v", err)
 	}
 
+	decoder := gob.NewDecoder(file)
 	articleList := NewArticleList()
-	if err = gob.NewDecoder(file).Decode(&articleList.articles); err != nil {
+	err = decoder.Decode(&articleList.articles)
+	if err != nil {
 		return nil, fmt.Errorf("error decoding key: %v", err)
 	}
 
@@ -149,8 +150,8 @@ func LoadArticleList(filename string) (*ArticleList, error) {
 }
 
 func NewTagList() *TagList {
-	list := initTagList()
+	list := minTagList()
-	list.tags = make([]string, 0)
+	list.tags = []string{}
 
 	list.wg.Add(1)
 	go list.start()
@@ -174,8 +175,10 @@ func (tl *TagList) Save(filename string) error {
 	}
 	defer file.Close()
 
+	encoder := gob.NewEncoder(file)
 	tags := tl.Get()
-	if err = gob.NewEncoder(file).Encode(tags); err != nil {
+	err = encoder.Encode(tags)
+	if err != nil {
 		return fmt.Errorf("error ecoding key: %v", err)
 	}
 
@@ -187,10 +190,11 @@ func LoadTagList(filename string) (*TagList, error) {
 	if err != nil {
 		return nil, fmt.Errorf("error opening key file: %v", err)
 	}
-	defer file.Close()
 
+	decoder := gob.NewDecoder(file)
 	tagList := NewTagList()
-	if err = gob.NewDecoder(file).Decode(&tagList.tags); err != nil {
+	err = decoder.Decode(&tagList.tags)
+	if err != nil {
 		return nil, fmt.Errorf("error decoding key: %v", err)
 	}
 

cmd/data/db.go

@@ -45,7 +45,8 @@ func (db *DB) AddUser(user *User, pass string) error {
         (username, password, first_name, last_name, role)
     VALUES (?, ?, ?, ?, ?)
     `
-	if _, err = db.Exec(query, user.UserName, string(hashedPass), user.FirstName, user.LastName, user.Role); err != nil {
+	_, err = db.Exec(query, user.UserName, string(hashedPass), user.FirstName, user.LastName, user.Role)
+	if err != nil {
 		return fmt.Errorf("error inserting user into DB: %v", err)
 	}
 
@@ -103,7 +104,8 @@ func (db *DB) ChangePassword(id int64, oldPass, newPass string) error {
     SET password = ?
     WHERE id = ?
     `
-	if _, err = db.Exec(query, string(newHashedPass), id); err != nil {
+	_, err = db.Exec(query, string(newHashedPass), id)
+	if err != nil {
 		return fmt.Errorf("error updating password in DB: %v", err)
 	}
 
@@ -132,7 +134,8 @@ func (db *DB) GetUser(id int64) (*User, error) {
     `
 
 	row := db.QueryRow(query, id)
-	if err := row.Scan(&user.ID, &user.UserName, &user.FirstName, &user.LastName, &user.Role); err != nil {
+	if err := row.Scan(&user.ID, &user.UserName, &user.FirstName,
+		&user.LastName, &user.Role); err != nil {
 		return nil, fmt.Errorf("error reading user information: %v", err)
 	}
 

cmd/data/rss.go

@@ -1,104 +0,0 @@
-package data
-
-import (
-	"encoding/gob"
-	"fmt"
-	"os"
-	"sync"
-
-	"git.streifling.com/jason/rss"
-)
-
-type Channel struct {
-	addCh   chan *rss.Item
-	setCh   chan rss.Channel
-	getCh   chan rss.Channel
-	channel rss.Channel
-	wg      sync.WaitGroup
-}
-
-func initChannel() *Channel {
-	return &Channel{
-		addCh: make(chan *rss.Item),
-		setCh: make(chan rss.Channel),
-		getCh: make(chan rss.Channel),
-		channel: rss.Channel{
-			Items: make([]*rss.Item, 0),
-		},
-	}
-}
-
-func (c *Channel) start() {
-	c.wg.Done()
-	for {
-		select {
-		case item := <-c.addCh:
-			c.channel.Items = append(c.channel.Items, item)
-		case c.getCh <- c.channel:
-		case c.channel = <-c.setCh:
-		}
-	}
-}
-
-func NewChannel(title, link, desc string) *Channel {
-	channel := initChannel()
-	channel.channel = rss.Channel{
-		Title:       title,
-		Link:        link,
-		Description: desc,
-	}
-
-	channel.wg.Add(1)
-	go channel.start()
-	channel.wg.Wait()
-
-	return channel
-}
-
-func (c *Channel) Get() rss.Channel {
-	return <-c.getCh
-}
-
-func (f *Channel) Set(channel rss.Channel) {
-	f.setCh <- channel
-}
-
-func LoadChannel(filename string) (*Channel, error) {
-	file, err := os.Open(filename)
-	if err != nil {
-		return nil, fmt.Errorf("error opening file %v: %v", filename, err)
-	}
-	defer file.Close()
-
-	channel := initChannel()
-	channel.wg.Add(1)
-	go channel.start()
-	channel.wg.Wait()
-
-	tmpChannel := new(rss.Channel)
-	if err = gob.NewDecoder(file).Decode(tmpChannel); err != nil {
-		return nil, fmt.Errorf("error decoding channel from file %v: %v", filename, err)
-	}
-
-	channel.Set(*tmpChannel)
-	return channel, nil
-}
-
-func (c *Channel) Save(filename string) error {
-	file, err := os.Create(filename)
-	if err != nil {
-		return fmt.Errorf("error creating file %v: %v", filename, err)
-	}
-	defer file.Close()
-
-	channel := c.Get()
-	if err = gob.NewEncoder(file).Encode(channel); err != nil {
-		return fmt.Errorf("error encoding file %v: %v", filename, err)
-	}
-
-	return nil
-}
-
-func (c *Channel) Add(i *rss.Item) {
-	c.addCh <- i
-}

cmd/data/sessions.go

@@ -17,7 +17,8 @@ type CookieStore struct {
 func NewKey() ([]byte, error) {
 	key := make([]byte, 32)
 
-	if _, err := io.ReadFull(rand.Reader, key); err != nil {
+	_, err := io.ReadFull(rand.Reader, key)
+	if err != nil {
 		return nil, fmt.Errorf("error generating key: %v", err)
 	}
 
@@ -32,7 +33,9 @@ func SaveKey(key []byte, filename string) error {
 	defer file.Close()
 	file.Chmod(0600)
 
-	if err = gob.NewEncoder(file).Encode(key); err != nil {
+	encoder := gob.NewEncoder(file)
+	err = encoder.Encode(key)
+	if err != nil {
 		return fmt.Errorf("error ecoding key: %v", err)
 	}
 
@@ -46,7 +49,9 @@ func LoadKey(filename string) ([]byte, error) {
 	}
 
 	key := make([]byte, 32)
-	if err = gob.NewDecoder(file).Decode(&key); err != nil {
+	decoder := gob.NewDecoder(file)
+	err = decoder.Decode(&key)
+	if err != nil {
 		return nil, fmt.Errorf("error decoding key: %v", err)
 	}
 

cmd/ui/articles.go

@@ -58,9 +58,6 @@ func FinishArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 			return
 		}
 
-		r.ParseForm()
-		article.Tags = append(article.Tags, r.Form["tags"]...)
-
 		session, err := s.Get(r, "cookie")
 		if err != nil {
 			tmpl, err := template.ParseFiles("web/templates/login.html")
@@ -74,7 +71,7 @@ func FinishArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 		article.AuthorID = session.Values["id"].(int64)
 
 		al.Add(article)
-		al.Save("tmp/unpublished-articles.gob")
+		al.Save("tmp/articles.gob")
 
 		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)
@@ -119,7 +116,7 @@ func ReviewArticle(al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	}
 }
 
-func PublishArticle(c *data.Channel, al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
+func PublishArticle(f *rss.Feed, al *data.ArticleList, s *data.CookieStore) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		uuid, err := uuid.Parse(r.PostFormValue("uuid"))
 		if err != nil {
@@ -144,15 +141,13 @@ func PublishArticle(c *data.Channel, al *data.ArticleList, s *data.CookieStore)
 			template.Must(tmpl, err).ExecuteTemplate(w, "page-content", msg)
 		}
 
-		c.Add(&rss.Item{
+		item := rss.NewItem()
-			Title:       article.Title,
+		item.Title = article.Title
-			Author:      session.Values["name"].(string),
+		item.Author = article.Author
-			PubDate:     article.Created.Format(time.RFC1123Z),
+		item.Description = article.Desc
-			Description: article.Desc,
+		item.Content = &rss.Content{Value: article.Content}
-			Content:     &rss.Content{Value: article.Content},
+		f.Channels[0].AddItem(item)
-			Categories:  article.Tags,
+		f.Save("tmp/rss.gob")
-		})
-		c.Save("tmp/rss.gob")
 
 		tmpl, err := template.ParseFiles("web/templates/hub.html")
 		tmpl = template.Must(tmpl, err)

cmd/ui/rss.go

@@ -6,15 +6,11 @@ import (
 	"net/http"
 
 	"git.streifling.com/jason/rss"
-	"streifling.com/jason/cpolis/cmd/data"
 )
 
-func ShowRSS(c *data.Channel) http.HandlerFunc {
+func ShowRSS(f *rss.Feed) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		channel := c.Get()
+		rss, err := f.ToXML()
-		feed := rss.NewFeed()
-		feed.Channels = append(feed.Channels, &channel)
-		rss, err := feed.ToXML()
 		if err != nil {
 			log.Println(err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)

go.mod

@@ -3,10 +3,9 @@ module streifling.com/jason/cpolis
 go 1.22.0
 
 require (
-	git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188
+	git.streifling.com/jason/rss v0.0.0-20240305145359-7d49b2cb25fc
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/google/uuid v1.6.0
-	github.com/gorilla/feeds v1.1.2
 	github.com/gorilla/sessions v1.2.2
 	github.com/microcosm-cc/bluemonday v1.0.26
 	github.com/yuin/goldmark v1.7.0

go.sum

@@ -1,11 +1,7 @@
-git.streifling.com/jason/rss v0.0.0-20240305152729-9d8cc6464565 h1:/eO9NTksh+9yLz3HiYNR7BJo/iMTxxW5/d9h8I6vR6E=
+git.streifling.com/jason/rss v0.0.0-20240305140009-a59d3f112892 h1:miU3U9H8zSoYprEaG7xaGLMb4CcGLjGt7McC8Wrf+Vs=
-git.streifling.com/jason/rss v0.0.0-20240305152729-9d8cc6464565/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
+git.streifling.com/jason/rss v0.0.0-20240305140009-a59d3f112892/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
-git.streifling.com/jason/rss v0.0.0-20240305160544-c8551159fe32 h1:G25NZzsD73rOkGYgV2vPUDviB0JXk5qi+dXOwB6J56U=
+git.streifling.com/jason/rss v0.0.0-20240305145359-7d49b2cb25fc h1:vJ36ouI2wTK+jFktnqyAfFHoYnoznAgAo1nUzvMzCvQ=
-git.streifling.com/jason/rss v0.0.0-20240305160544-c8551159fe32/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
+git.streifling.com/jason/rss v0.0.0-20240305145359-7d49b2cb25fc/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
-git.streifling.com/jason/rss v0.0.0-20240305160829-6cd08bb65d2a h1:TWQ9gwe7eWjaLUrZ0CJSc+sUUOw3VoGHlR3F8mH6vqs=
-git.streifling.com/jason/rss v0.0.0-20240305160829-6cd08bb65d2a/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
-git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188 h1:C8M/j3f+cl5Y7YfGpU/ynb/SC/4tTYMDsyGFt3rswM8=
-git.streifling.com/jason/rss v0.0.0-20240305164907-524bf9676188/go.mod h1:gpZF0nZbQSstMpyHD9DTAvlQEG7v4pjO5c7aIMWM4Jg=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
@@ -16,20 +12,12 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
-github.com/gorilla/feeds v1.1.2 h1:pxzZ5PD3RJdhFH2FsJJ4x6PqMqbgFk1+Vez4XWBW8Iw=
-github.com/gorilla/feeds v1.1.2/go.mod h1:WMib8uJP3BbY+X8Szd1rA5Pzhdfh+HCCAYT2z7Fza6Y=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
 github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
 github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA=
 github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=

main.go

@@ -29,10 +29,10 @@ func main() {
 	}
 	defer db.Close()
 
-	feed, err := data.LoadChannel("tmp/rss.gob")
+	feed, err := data.OpenFeed("tmp/rss.gob")
 	if err != nil {
 		log.Println(err)
-		feed = data.NewChannel("Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
+		feed = data.NewFeed("Freimaurer Distrikt Niedersachsen und Sachsen-Anhalt",
 			"https://distrikt-ni-st.de",
 			"Freiheit, Gleichheit, Brüderlichkeit, Toleranz und Humanität")
 	}
@@ -47,7 +47,7 @@ func main() {
 	}
 	store := data.NewCookieStore(key)
 
-	articleList, err := data.LoadArticleList("tmp/unpublished-articles.gob")
+	articleList, err := data.LoadArticleList("tmp/articles.gob")
 	if err != nil {
 		articleList = data.NewArticleList()
 	}