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

internal/db/db.go

@@ -0,0 +1,100 @@
+package db
+
+import (
+	"encoding/json"
+	"log"
+	"ssender/internal/models"
+
+	"github.com/boltdb/bolt"
+)
+
+func InitDb(rss models.Rss2, dbpath string) error {
+	log.Println("Initialize DB")
+	db, err := bolt.Open(dbpath, 0600, nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer db.Close()
+
+	err = 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
+	})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func FindItems(rss models.Rss2, dbpath string) (*models.SendItems, error) {
+	var sendItems models.SendItems
+	db, err := bolt.Open(dbpath, 0600, nil)
+	if err != nil {
+		return nil, err
+	}
+	defer db.Close()
+
+	for _, v := range rss.ItemList {
+		err = 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
+		})
+		if err != nil {
+			return nil, err
+		}
+	}
+	return &sendItems, nil
+}
+
+func UpdateDb(dbpath string, senditems *models.SendItems) error {
+	log.Println("Update DB")
+	db, err := bolt.Open(dbpath, 0600, nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer db.Close()
+
+	err = 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
+	})
+	if err != nil {
+		return err
+	}
+	return nil
+}

internal/models/config.go

@@ -1,12 +1,5 @@
 package models
 
-import (
-	"log"
-
-	"github.com/SevereCloud/vksdk/v2/api"
-	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
-)
-
 type Config struct {
 	Dbpath   string `yaml:"dbpath"`
 	Telegram struct {
@@ -20,49 +13,4 @@ type Config struct {
 		Token   string `yaml:"token"`
 		OwnerId int64  `yaml:"ownerid"`
 	} `yaml:"vk"`
-	Facebook struct {
-		Send  bool   `yaml:"send"`
-		Token string `yaml:"token"`
-	} `yaml:"facebook"`
-}
-
-func (config Config) RunSend(senditems SendItems) {
-	for _, v := range senditems.ItemList {
-		if config.Telegram.Send {
-			log.Println("Send to telegram")
-			bot, err := tgbotapi.NewBotAPI(config.Telegram.Token)
-			if err != nil {
-				log.Panic(err)
-			}
-			bot.Debug = config.Telegram.SendDebug
-
-			// s := "<b>" + string(v.Title) + "</b>\n" + html.UnescapeString(string(v.Description)) +
-			// 	"\nhttps://t.me/iv?url=" + v.Link + "&rhash=da76512d0ff2a2" +
-			// 	"\n\nСсылка на пост: " + v.Link
-			msg := tgbotapi.NewMessage(config.Telegram.ChatId, v.Link)
-			msg.ParseMode = "Html"
-			_, err = bot.Send(msg)
-			if err != nil {
-				log.Panic(err)
-
-			}
-			log.Println("Sended to telegram")
-		}
-		if config.VK.Send {
-			log.Println("Send to VK")
-			vk := api.NewVK(config.VK.Token)
-			_, err := vk.WallPost(api.Params{
-				"owner_id":    config.VK.OwnerId,
-				"attachments": v.Link,
-			})
-			if err != nil {
-				log.Fatal(err)
-			}
-			log.Println("Sended to VK")
-		}
-		if config.Facebook.Send {
-			log.Println("Send to Facebook")
-			log.Println("Sending to facebook is not implemented yet")
-		}
-	}
 }

internal/rss/rss.go

@@ -0,0 +1,27 @@
+package rss
+
+import (
+	"encoding/xml"
+	"os"
+	"ssender/internal/models"
+)
+
+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
+}

internal/send/send.go

@@ -0,0 +1,48 @@
+package send
+
+import (
+	"log"
+	"ssender/internal/models"
+
+	"github.com/SevereCloud/vksdk/v2/api"
+	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+)
+
+func RunSend(senditems *models.SendItems, config models.Config) error {
+	for _, v := range senditems.ItemList {
+		if config.Telegram.Send {
+			log.Println("Send to telegram")
+			bot, err := tgbotapi.NewBotAPI(config.Telegram.Token)
+			if err != nil {
+				return err
+			}
+			bot.Debug = config.Telegram.SendDebug
+
+			// s := "<b>" + string(v.Title) + "</b>\n" + html.UnescapeString(string(v.Description)) +
+			// 	"\nhttps://t.me/iv?url=" + v.Link + "&rhash=da76512d0ff2a2" +
+			// 	"\n\nСсылка на пост: " + v.Link
+			msg := tgbotapi.NewMessage(config.Telegram.ChatId, v.Link)
+			msg.ParseMode = "Html"
+			_, err = bot.Send(msg)
+			if err != nil {
+				return err
+
+			}
+			log.Println("Sended to telegram")
+		}
+		if config.VK.Send {
+			log.Println("Send to VK")
+			vk := api.NewVK(config.VK.Token)
+			_, err := vk.WallPost(api.Params{
+				"owner_id":    config.VK.OwnerId,
+				"attachments": v.Link,
+			})
+			if err != nil {
+				return err
+			}
+			log.Println("Sended to VK")
+		}
+
+	}
+	return nil
+}

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.Fatalf("Config path not found in options!")
+	}
 	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 {
+			log.Fatal(err)
+		}
+	}
+
 	//Find new items
-		FindItems(*rss, cfg.Dbpath)
+	sendItems, err := db.FindItems(*rss, cfg.Dbpath)
+	if err != nil {
+		log.Fatal(err)
+	}
 
-		if len(senditems.ItemList) > 0 {
+	if len(sendItems.ItemList) > 0 {
 		// Run send data depended on configuration options
 		log.Println("Run send process")
-			cfg.RunSend(senditems)
+		err := send.RunSend(sendItems, *cfg)
-			UpdateDb(cfg.Dbpath)
+		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")
 }