switch to new opml

This commit is contained in:
Nazar Kanaev 2021-03-18 23:34:00 +00:00
parent ea5af73901
commit 62e2ca4c16

View File

@ -328,18 +328,20 @@ func (s *Server) handleOPMLImport(c *router.Context) {
doc, err := opml.Parse(file) doc, err := opml.Parse(file)
if err != nil { if err != nil {
log.Print(err) log.Print(err)
c.Out.WriteHeader(http.StatusBadRequest)
return return
} }
for _, outline := range doc.Outlines {
if outline.Type == "rss" { for _, f := range doc.Feeds {
s.db.CreateFeed(outline.Title, outline.Description, outline.SiteURL, outline.FeedURL, nil) s.db.CreateFeed(f.Title, "", f.SiteUrl, f.FeedUrl, nil)
} else { }
folder := s.db.CreateFolder(outline.Title) for _, f := range doc.Folders {
for _, o := range outline.AllFeeds() { folder := s.db.CreateFolder(f.Title)
s.db.CreateFeed(o.Title, o.Description, o.SiteURL, o.FeedURL, &folder.Id) for _, ff := range f.AllFeeds() {
} s.db.CreateFeed(f.Title, "", ff.SiteUrl, ff.FeedUrl, &folder.Id)
} }
} }
s.worker.FetchAllFeeds() s.worker.FetchAllFeeds()
c.Out.WriteHeader(http.StatusOK) c.Out.WriteHeader(http.StatusOK)
} else { } else {
@ -352,37 +354,39 @@ func (s *Server) handleOPMLExport(c *router.Context) {
c.Out.Header().Set("Content-Type", "application/xml; charset=utf-8") c.Out.Header().Set("Content-Type", "application/xml; charset=utf-8")
c.Out.Header().Set("Content-Disposition", `attachment; filename="subscriptions.opml"`) c.Out.Header().Set("Content-Disposition", `attachment; filename="subscriptions.opml"`)
rootFeeds := make([]*storage.Feed, 0) doc := opml.NewFolder("")
feedsByFolderID := make(map[int64][]*storage.Feed) feedsByFolderID := make(map[int64][]*storage.Feed)
for _, feed := range s.db.ListFeeds() { for _, feed := range s.db.ListFeeds() {
feed := feed feed := feed
if feed.FolderId == nil { if feed.FolderId == nil {
rootFeeds = append(rootFeeds, &feed) doc.Feeds = append(doc.Feeds, &opml.Feed{
Title: feed.Title,
FeedUrl: feed.FeedLink,
SiteUrl: feed.Link,
})
} else { } else {
id := *feed.FolderId id := *feed.FolderId
if feedsByFolderID[id] == nil {
feedsByFolderID[id] = make([]*storage.Feed, 0)
}
feedsByFolderID[id] = append(feedsByFolderID[id], &feed) feedsByFolderID[id] = append(feedsByFolderID[id], &feed)
} }
} }
builder := opml.NewBuilder()
for _, feed := range rootFeeds {
builder.AddFeed(feed.Title, feed.Description, feed.FeedLink, feed.Link)
}
for _, folder := range s.db.ListFolders() { for _, folder := range s.db.ListFolders() {
folderFeeds := feedsByFolderID[folder.Id] folderFeeds := feedsByFolderID[folder.Id]
if len(folderFeeds) == 0 { if len(folderFeeds) == 0 {
continue continue
} }
feedFolder := builder.AddFolder(folder.Title) opmlfolder := opml.NewFolder(folder.Title)
for _, feed := range folderFeeds { for _, feed := range folderFeeds {
feedFolder.AddFeed(feed.Title, feed.Description, feed.FeedLink, feed.Link) opmlfolder.Feeds = append(opmlfolder.Feeds, &opml.Feed{
Title: feed.Title,
FeedUrl: feed.FeedLink,
SiteUrl: feed.Link,
})
} }
} }
c.Out.Write([]byte(builder.String())) c.Out.Write([]byte(doc.OPML()))
} }
} }