Fix feeds not updating if they dont contain a feedurl

This commit is contained in:
Alex McGrath
2021-02-06 00:17:32 +00:00
committed by Senan Kelly
parent b57860a967
commit 76875de87b
3 changed files with 5 additions and 4 deletions

View File

@@ -431,7 +431,7 @@ func (c *Controller) ServePodcastAddDo(r *http.Request) *Response {
flashW: []string{fmt.Sprintf("could not create feed: %v", err)}, flashW: []string{fmt.Sprintf("could not create feed: %v", err)},
} }
} }
if _, err = c.Podcasts.AddNewPodcast(feed, user.ID); err != nil { if _, err = c.Podcasts.AddNewPodcast(rssURL, feed, user.ID); err != nil {
return &Response{ return &Response{
redirect: "/admin/home", redirect: "/admin/home",
flashW: []string{fmt.Sprintf("could not create feed: %v", err)}, flashW: []string{fmt.Sprintf("could not create feed: %v", err)},

View File

@@ -50,7 +50,7 @@ func (c *Controller) ServeCreatePodcastChannel(r *http.Request) *spec.Response {
if err != nil { if err != nil {
return spec.NewError(10, "failed to parse feed: %s", err) return spec.NewError(10, "failed to parse feed: %s", err)
} }
if _, err = c.Podcasts.AddNewPodcast(feed, user.ID); err != nil { if _, err = c.Podcasts.AddNewPodcast(rssURL, feed, user.ID); err != nil {
return spec.NewError(10, "failed to add feed: %s", err) return spec.NewError(10, "failed to add feed: %s", err)
} }
return spec.NewResponse() return spec.NewResponse()

View File

@@ -70,13 +70,14 @@ func (p *Podcasts) GetPodcastEpisodes(podcastID int) ([]*db.PodcastEpisode, erro
return episodes, nil return episodes, nil
} }
func (p *Podcasts) AddNewPodcast(feed *gofeed.Feed, userID int) (*db.Podcast, error) { func (p *Podcasts) AddNewPodcast(rssURL string, feed *gofeed.Feed,
userID int) (*db.Podcast, error) {
podcast := db.Podcast{ podcast := db.Podcast{
Description: feed.Description, Description: feed.Description,
ImageURL: feed.Image.URL, ImageURL: feed.Image.URL,
UserID: userID, UserID: userID,
Title: feed.Title, Title: feed.Title,
URL: feed.FeedLink, URL: rssURL,
} }
podPath := podcast.Fullpath(p.PodcastBasePath) podPath := podcast.Fullpath(p.PodcastBasePath)
err := os.Mkdir(podPath, 0755) err := os.Mkdir(podPath, 0755)