рефакторинг кода

main.go

@@ -1,14 +1,13 @@
 package main
 
 import (
-	"encoding/json"
-	"encoding/xml"
 	"log"
 	"os"
 	"ssender/internal/config"
-	"ssender/internal/models"
+	"ssender/internal/db"
+	"ssender/internal/rss"
+	"ssender/internal/send"
 
-	"github.com/boltdb/bolt"
 	"github.com/jessevdk/go-flags"
 )
 
@@ -18,108 +17,9 @@ type Options struct {
 	InitDB     bool   `short:"i" long:"initdb" description:"Run initialize from current file"`
 }
 
-var ConfigPath = "/etc/ssender/config.yml"
+var (
-
+	ConfigPath = "/etc/ssender/config.yml"
-func NewRSS(rssPath string) (*models.Rss2, error) {
+)
-	rss := &models.Rss2{}
-
-	// Open rss2 file
-	file, err := os.Open(rssPath)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	d := xml.NewDecoder(file)
-
-	// Start RSS decoding from file
-	if err := d.Decode(&rss); err != nil {
-		return nil, err
-	}
-
-	return rss, nil
-}
-
-var senditems models.SendItems
-
-func FindItems(rss models.Rss2, dbpath string) {
-	db, err := bolt.Open(dbpath, 0600, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	for _, v := range rss.ItemList {
-		db.View(func(tx *bolt.Tx) error {
-			// Assume bucket exists and has keys
-			b := tx.Bucket([]byte("rss"))
-			c := b.Cursor()
-			flag := false
-			for key, _ := c.First(); key != nil; key, _ = c.Next() {
-				if v.Link == string(key) {
-					flag = true
-					break
-				}
-			}
-			if flag {
-				senditems.ItemList = append(senditems.ItemList, v)
-			}
-			return nil
-		})
-	}
-}
-
-func InitDb(rss models.Rss2, dbpath string) {
-	log.Println("Initialize DB")
-	db, err := bolt.Open(dbpath, 0600, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucketIfNotExists([]byte("rss"))
-		if err != nil {
-			return err
-		}
-		for _, v := range rss.ItemList {
-			encoded, err := json.Marshal(v)
-			if err != nil {
-				return err
-			}
-			err = b.Put([]byte(v.Link), encoded)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
-
-func UpdateDb(dbpath string) {
-	log.Println("Update DB")
-	db, err := bolt.Open(dbpath, 0600, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("rss"))
-		for _, v := range senditems.ItemList {
-			encoded, err := json.Marshal(v)
-			if err != nil {
-				return err
-			}
-			err = b.Put([]byte(v.Link), encoded)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-
-}
 
 func main() {
 	log.Println("Run processing")
@@ -139,10 +39,11 @@ func main() {
 	}
 	log.Println("Flags processed")
 
-	if options.ConfigPath != "" {
+	if options.ConfigPath == "" {
-		log.Printf("Config from: %s\n", options.ConfigPath)
+		log.Fatalf("Config path not found in options!")
-		ConfigPath = options.ConfigPath
 	}
+	log.Printf("Config from: %s\n", options.ConfigPath)
+	ConfigPath = options.ConfigPath
 
 	// Get config
 	cfg, err := config.NewConfig(ConfigPath)
@@ -153,22 +54,37 @@ func main() {
 
 	// Parse rss file
 	log.Printf("Parse file %s \n", options.FileParse)
-	rss, err := NewRSS(options.FileParse)
+	rss, err := rss.NewRSS(options.FileParse)
 	if err != nil {
 		log.Fatal(err)
 	}
+
 	if options.InitDB {
-		InitDb(*rss, cfg.Dbpath)
+		err := db.InitDb(*rss, cfg.Dbpath)
-	} else {
+		if err != nil {
-		//Find new items
+			log.Fatal(err)
-		FindItems(*rss, cfg.Dbpath)
+		}
+	}
 
-		if len(senditems.ItemList) > 0 {
+	//Find new items
-			// Run send data depended on configuration options
+	sendItems, err := db.FindItems(*rss, cfg.Dbpath)
-			log.Println("Run send process")
+	if err != nil {
-			cfg.RunSend(senditems)
+		log.Fatal(err)
-			UpdateDb(cfg.Dbpath)
+	}
+
+	if len(sendItems.ItemList) > 0 {
+		// Run send data depended on configuration options
+		log.Println("Run send process")
+		err := send.RunSend(sendItems, *cfg)
+		if err != nil {
+			log.Fatal(err)
+		}
+		// Run update db
+		err = db.UpdateDb(cfg.Dbpath, sendItems)
+		if err != nil {
+			log.Fatal(err)
 		}
 	}
+
 	log.Println("End processing")
 }