Browse Source

Improve FindItems function with better error handling and logging

develop
parent
commit
f72f72e1cd
  1. 32
      internal/db/db.go

32
internal/db/db.go

@ -2,7 +2,9 @@ package db
import ( import (
"encoding/json" "encoding/json"
"fmt"
"log" "log"
"os"
"ssender/internal/models" "ssender/internal/models"
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
@ -41,33 +43,39 @@ func InitDb(rss models.Rss2, dbpath string) error {
func FindItems(rss models.Rss2, dbpath string) (*models.SendItems, error) { func FindItems(rss models.Rss2, dbpath string) (*models.SendItems, error) {
var sendItems models.SendItems var sendItems models.SendItems
db, err := bolt.Open(dbpath, 0600, nil)
// Check if DB file exists
if _, err := os.Stat(dbpath); os.IsNotExist(err) {
return nil, fmt.Errorf("database file does not exist: %s", dbpath)
}
// Open database
db, err := openDB(dbpath)
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer db.Close() defer db.Close()
for _, v := range rss.ItemList { log.Println("Finding new items in DB")
err = db.View(func(tx *bolt.Tx) error { err = db.View(func(tx *bolt.Tx) error {
// Assume bucket exists and has keys
b := tx.Bucket([]byte("rss")) b := tx.Bucket([]byte("rss"))
c := b.Cursor() if b == nil {
flag := false return fmt.Errorf("bucket 'rss' not found in database")
for key, _ := c.First(); key != nil; key, _ = c.Next() {
if v.Link == string(key) {
flag = true
break
} }
} for _, v := range rss.ItemList {
if flag { if b.Get([]byte(v.Link)) != nil {
sendItems.ItemList = append(sendItems.ItemList, v) sendItems.ItemList = append(sendItems.ItemList, v)
} }
}
return nil return nil
}) })
if err != nil { if err != nil {
return nil, err return nil, err
} }
}
log.Printf("Found %d new items", len(sendItems.ItemList))
return &sendItems, nil return &sendItems, nil
} }

Loading…
Cancel
Save