TheLovinator/feedvault.se
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Items will now be added when adding feed, add /feed/{id} and improve SQL

Browse source
This commit is contained in:
Joakim Hellsén 2024-02-17 04:50:23 +01:00
commit 99cd70165e
14 changed files with 807 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

70
feeds.go
View file

@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"log"
"time"
"github.com/TheLovinator1/FeedVault/db"
@ -12,11 +13,6 @@ import (
)
func makeCreateFeedParams(feedURL string, feed *gofeed.Feed) db.CreateFeedParams {
links := make([]string, len(feed.Items))
for i, item := range feed.Items {
links[i] = item.Link
}
var updatedTime time.Time
if feed.UpdatedParsed != nil {
updatedTime = *feed.UpdatedParsed
@ -32,20 +28,20 @@ func makeCreateFeedParams(feedURL string, feed *gofeed.Feed) db.CreateFeedParams
feedCustom = []byte("{}")
}
return db.CreateFeedParams{
params := db.CreateFeedParams{
Url: feedURL,
CreatedAt: pgtype.Timestamp{Time: time.Now(), Valid: true},
UpdatedAt: pgtype.Timestamp{Time: time.Now(), Valid: true},
DeletedAt: pgtype.Timestamp{Valid: false},
CreatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
UpdatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
DeletedAt: pgtype.Timestamptz{Valid: false},
Title: pgtype.Text{String: feed.Title, Valid: feed.Title != ""},
Description: pgtype.Text{String: feed.Description, Valid: feed.Description != ""},
Link: pgtype.Text{String: feed.Link, Valid: feed.Link != ""},
FeedLink: pgtype.Text{String: feed.FeedLink, Valid: feed.FeedLink != ""},
Links: links,
Links: feed.Links,
Updated: pgtype.Text{String: feed.Updated, Valid: feed.Updated != ""},
UpdatedParsed: pgtype.Timestamp{Time: updatedTime, Valid: !updatedTime.IsZero()},
UpdatedParsed: pgtype.Timestamptz{Time: updatedTime, Valid: !updatedTime.IsZero()},
Published: pgtype.Text{String: feed.Published, Valid: feed.Published != ""},
PublishedParsed: pgtype.Timestamp{Time: publishedTime, Valid: !publishedTime.IsZero()},
PublishedParsed: pgtype.Timestamptz{Time: publishedTime, Valid: !publishedTime.IsZero()},
Language: pgtype.Text{String: feed.Language, Valid: feed.Language != ""},
Copyright: pgtype.Text{String: feed.Copyright, Valid: feed.Copyright != ""},
Generator: pgtype.Text{String: feed.Generator, Valid: feed.Generator != ""},
@ -54,6 +50,45 @@ func makeCreateFeedParams(feedURL string, feed *gofeed.Feed) db.CreateFeedParams
FeedType: pgtype.Text{String: feed.FeedType, Valid: feed.FeedType != ""},
FeedVersion: pgtype.Text{String: feed.FeedVersion, Valid: feed.FeedVersion != ""},
}
log.Printf("Created feed params: %+v", params)
return params
}
func makeCreateItemParams(item *gofeed.Item, feedID int64) db.CreateItemParams {
itemCustom := []byte("{}")
if item.Custom != nil {
var err error
itemCustom, err = json.Marshal(item.Custom)
if err != nil {
fmt.Println("Error marshalling item custom data:", err)
itemCustom = []byte("{}")
}
}
params := db.CreateItemParams{
CreatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
UpdatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
DeletedAt: pgtype.Timestamptz{Valid: false},
Title: pgtype.Text{String: item.Title, Valid: item.Title != ""},
Description: pgtype.Text{String: item.Description, Valid: item.Description != ""},
Content: pgtype.Text{String: item.Content, Valid: item.Content != ""},
Link: pgtype.Text{String: item.Link, Valid: item.Link != ""},
Links: item.Links,
Updated: pgtype.Text{String: item.Updated, Valid: item.Updated != ""},
UpdatedParsed: pgtype.Timestamp{Time: *item.UpdatedParsed, Valid: item.UpdatedParsed != nil},
Published: pgtype.Text{String: item.Published, Valid: item.Published != ""},
PublishedParsed: pgtype.Timestamp{Time: *item.PublishedParsed, Valid: item.PublishedParsed != nil},
Guid: pgtype.Text{String: item.GUID, Valid: item.GUID != ""},
Categories: item.Categories,
Custom: itemCustom,
FeedID: feedID,
}
log.Printf("Created item params: %+v", params)
return params
}
func AddFeedToDB(feedURL string) error {
@ -71,10 +106,19 @@ func AddFeedToDB(feedURL string) error {
}
// Add the feed to the database
_, err = DB.CreateFeed(ctx, makeCreateFeedParams(feedURL, feed))
newFeed, err := DB.CreateFeed(ctx, makeCreateFeedParams(feedURL, feed))
if err != nil {
return fmt.Errorf("Error adding feed to database: %s", err)
}
log.Printf("Added feed to database: %+v", newFeed)
// Add the items to the database
for _, item := range feed.Items {
_, err := DB.CreateItem(ctx, makeCreateItemParams(item, newFeed.ID))
if err != nil {
log.Printf("Error adding item to database: %s", err)
}
}
fmt.Println(feed.Title)
return nil