nandi/glean · 222591d

nandi/gleanpublic⑂ Fork 0

⑂ 222591d

Group OPML feeds by category in exportUnverified

Julien Robert committed 2026-04-22T18:00:33+02:00 Browse files

222591d parent: 1aed63a

modified internal/feed/opml.go +28 -1 Viewed

@@ -104,6 +104,8 @@ func GenerateOPML(feeds []FeedURL, title string) ([]byte, error) {
104	104	}
105	105	opml.Head.Title = title
106	106
	107	+ categoryMap := make(map[string][]Outline)
	108	+ var categories []string
107	109	for _, f := range feeds {
108	110	outline := Outline{
109	111	Text: f.Title,
@@ -111,7 +113,23 @@ func GenerateOPML(feeds []FeedURL, title string) ([]byte, error) {
111	113	XMLURL: f.URL,
112	114	HTMLURL: f.SiteURL,
113	115	}
114		- opml.Body.Outlines = append(opml.Body.Outlines, outline)
	116	+ if f.Category != "" {
	117	+ categoryMap[f.Category] = append(categoryMap[f.Category], outline)
	118	+ if !contains(categories, f.Category) {
	119	+ categories = append(categories, f.Category)
	120	+ }
	121	+ } else {
	122	+ opml.Body.Outlines = append(opml.Body.Outlines, outline)
	123	+ }
	124	+ }
	125	+
	126	+ for _, cat := range categories {
	127	+ parent := Outline{
	128	+ Text: cat,
	129	+ Title: cat,
	130	+ Outlines: categoryMap[cat],
	131	+ }
	132	+ opml.Body.Outlines = append(opml.Body.Outlines, parent)
115	133	}
116	134
117	135	var buf bytes.Buffer
@@ -125,3 +143,12 @@ func GenerateOPML(feeds []FeedURL, title string) ([]byte, error) {
125	143
126	144	return buf.Bytes(), nil
127	145	}
	146	+
	147	+func contains(slice []string, s string) bool {
	148	+ for _, v := range slice {
	149	+ if v == s {
	150	+ return true
	151	+ }
	152	+ }
	153	+ return false
	154	+}

  	}
  	opml.Head.Title = title
++	categoryMap := make(map[string][]Outline)
++	var categories []string
  	for _, f := range feeds {
  		outline := Outline{
  			Text:    f.Title,
  			XMLURL:  f.URL,
  			HTMLURL: f.SiteURL,
  		}
--		opml.Body.Outlines = append(opml.Body.Outlines, outline)
++		if f.Category != "" {
++			categoryMap[f.Category] = append(categoryMap[f.Category], outline)
++			if !contains(categories, f.Category) {
++				categories = append(categories, f.Category)
++			}
++		} else {
++			opml.Body.Outlines = append(opml.Body.Outlines, outline)
++		}
++	}
++
++	for _, cat := range categories {
++		parent := Outline{
++			Text:     cat,
++			Title:    cat,
++			Outlines: categoryMap[cat],
++		}
++		opml.Body.Outlines = append(opml.Body.Outlines, parent)
  	}
  	var buf bytes.Buffer
  	return buf.Bytes(), nil
  }
++
++func contains(slice []string, s string) bool {
++	for _, v := range slice {
++		if v == s {
++			return true
++		}
++	}
++	return false
++}

modified internal/server/feeds_handler.go +3 -2 Viewed

@@ -277,8 +277,9 @@ func (s Server) handleOPMLDownload(w http.ResponseWriter, r http.Request) {
277	277	var feedURLs []feed.FeedURL
278	278	for _, sub := range subs {
279	279	feedURLs = append(feedURLs, feed.FeedURL{
280		- URL: sub.FeedURL,
281		- Title: sub.FeedTitle,
	280	+ URL: sub.FeedURL,
	281	+ Title: sub.FeedTitle,
	282	+ Category: sub.Category.String,
282	283	})
283	284	}
284	285

  	var feedURLs []feed.FeedURL
  	for _, sub := range subs {
  		feedURLs = append(feedURLs, feed.FeedURL{
--			URL:   sub.FeedURL,
++			URL:      sub.FeedURL,
--			Title: sub.FeedTitle,
++			Title:    sub.FeedTitle,
++			Category: sub.Category.String,
  		})
  	}