You can now get authors
This commit is contained in:
parent
3113b844bc
commit
5016f576b9
9 changed files with 597 additions and 189 deletions
187
feeds.go
187
feeds.go
|
|
@ -2,104 +2,13 @@ package main
|
|||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"github.com/TheLovinator1/FeedVault/db"
|
||||
"github.com/jackc/pgx/v5/pgtype"
|
||||
"github.com/mmcdole/gofeed"
|
||||
)
|
||||
|
||||
func makeCreateFeedParams(feedURL string, feed *gofeed.Feed) db.CreateFeedParams {
|
||||
var updatedTime time.Time
|
||||
if feed.UpdatedParsed != nil {
|
||||
updatedTime = *feed.UpdatedParsed
|
||||
}
|
||||
var publishedTime time.Time
|
||||
if feed.PublishedParsed != nil {
|
||||
publishedTime = *feed.PublishedParsed
|
||||
}
|
||||
|
||||
feedCustom, err := json.Marshal(feed.Custom)
|
||||
if err != nil {
|
||||
fmt.Println("Error marshalling feed custom data:", err)
|
||||
feedCustom = []byte("{}")
|
||||
}
|
||||
|
||||
params := db.CreateFeedParams{
|
||||
Url: feedURL,
|
||||
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: feed.Links,
|
||||
Updated: pgtype.Text{String: feed.Updated, Valid: feed.Updated != ""},
|
||||
UpdatedParsed: pgtype.Timestamptz{Time: updatedTime, Valid: !updatedTime.IsZero()},
|
||||
Published: pgtype.Text{String: feed.Published, Valid: feed.Published != ""},
|
||||
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 != ""},
|
||||
Categories: feed.Categories,
|
||||
Custom: feedCustom,
|
||||
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 {
|
||||
var updatedTime time.Time
|
||||
if item.UpdatedParsed != nil {
|
||||
updatedTime = *item.UpdatedParsed
|
||||
}
|
||||
var publishedTime time.Time
|
||||
if item.PublishedParsed != nil {
|
||||
publishedTime = *item.PublishedParsed
|
||||
}
|
||||
|
||||
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.Timestamptz{Time: updatedTime, Valid: !updatedTime.IsZero()},
|
||||
Published: pgtype.Text{String: item.Published, Valid: item.Published != ""},
|
||||
PublishedParsed: pgtype.Timestamptz{Time: publishedTime, Valid: !publishedTime.IsZero()},
|
||||
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 {
|
||||
// Cancel the request after 60 seconds if it hasn't finished
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
||||
|
|
@ -123,102 +32,14 @@ func AddFeedToDB(feedURL string) error {
|
|||
|
||||
// Add the items to the database
|
||||
for _, item := range feed.Items {
|
||||
newItem, err := DB.CreateItem(ctx, makeCreateItemParams(item, newFeed.ID))
|
||||
if err != nil {
|
||||
log.Printf("Error adding item to database: %s", err)
|
||||
}
|
||||
log.Printf("Item added to database")
|
||||
|
||||
// Add extensions to the database
|
||||
for _, ext := range item.Extensions {
|
||||
for _, exts := range ext {
|
||||
for _, e := range exts {
|
||||
attrsCustom := []byte("{}")
|
||||
if e.Attrs != nil {
|
||||
var err error
|
||||
attrsCustom, err = json.Marshal(e.Attrs)
|
||||
if err != nil {
|
||||
fmt.Println("Error marshalling extension attributes:", err)
|
||||
attrsCustom = []byte("{}")
|
||||
}
|
||||
log.Printf("Extension attributes: %s", attrsCustom)
|
||||
}
|
||||
|
||||
childrenCustom := []byte("{}")
|
||||
if e.Children != nil {
|
||||
var err error
|
||||
childrenCustom, err = json.Marshal(e.Children)
|
||||
if err != nil {
|
||||
fmt.Println("Error marshalling extension children:", err)
|
||||
childrenCustom = []byte("{}")
|
||||
}
|
||||
log.Printf("Extension children: %s", childrenCustom)
|
||||
}
|
||||
|
||||
_, err := DB.CreateItemExtension(ctx, db.CreateItemExtensionParams{
|
||||
CreatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
|
||||
UpdatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
|
||||
DeletedAt: pgtype.Timestamptz{Valid: false},
|
||||
Name: pgtype.Text{String: e.Name, Valid: e.Name != ""},
|
||||
Value: pgtype.Text{String: e.Value, Valid: e.Value != ""},
|
||||
Attrs: attrsCustom,
|
||||
Children: childrenCustom,
|
||||
ItemID: newItem.ID,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log.Printf("Error adding extension to database: %s", err)
|
||||
}
|
||||
|
||||
log.Printf("Extension added to database")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
addItemToDB(item, ctx, newFeed)
|
||||
}
|
||||
|
||||
// Add extensions to the database
|
||||
// TODO: Check if this is correct and works
|
||||
for _, ext := range feed.Extensions {
|
||||
for _, exts := range ext {
|
||||
for _, e := range exts {
|
||||
attrsCustom := []byte("{}")
|
||||
if e.Attrs != nil {
|
||||
var err error
|
||||
attrsCustom, err = json.Marshal(e.Attrs)
|
||||
if err != nil {
|
||||
fmt.Println("Error marshalling extension attributes:", err)
|
||||
attrsCustom = []byte("{}")
|
||||
}
|
||||
}
|
||||
addFeedExtensionToDB(ctx, feed, newFeed)
|
||||
|
||||
childrenCustom := []byte("{}")
|
||||
if e.Children != nil {
|
||||
var err error
|
||||
childrenCustom, err = json.Marshal(e.Children)
|
||||
if err != nil {
|
||||
fmt.Println("Error marshalling extension children:", err)
|
||||
childrenCustom = []byte("{}")
|
||||
}
|
||||
}
|
||||
|
||||
_, err := DB.CreateFeedExtension(ctx, db.CreateFeedExtensionParams{
|
||||
CreatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
|
||||
UpdatedAt: pgtype.Timestamptz{Time: time.Now(), Valid: true},
|
||||
DeletedAt: pgtype.Timestamptz{Valid: false},
|
||||
Name: pgtype.Text{String: e.Name, Valid: e.Name != ""},
|
||||
Value: pgtype.Text{String: e.Value, Valid: e.Value != ""},
|
||||
Attrs: attrsCustom,
|
||||
Children: childrenCustom,
|
||||
FeedID: newFeed.ID,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
log.Printf("Error adding extension to database: %s", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Add authors to the database
|
||||
addFeedAuthors(ctx, feed, newFeed)
|
||||
|
||||
fmt.Println(feed.Title)
|
||||
return nil
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue