mvp before debug

app/app.go

@@ -2,9 +2,12 @@ package app
 
 import (
 	"io"
+	"net/http"
+	"time"
 
 	"go.balki.me/tss/log"
 	"go.balki.me/tss/proxy"
+	"go.balki.me/tss/telegram"
 )
 
 func Run(configPath string) {
@@ -15,6 +18,9 @@ func Run(configPath string) {
 	}
 
 	scheduler, err := NewScheduler(cfg.LastSuccessPath)
+	if err != nil {
+		log.Panic("failed to create scheduler", "path", cfg.LastSuccessPath, "error", err)
+	}
 
 	defer func() {
 		if err := scheduler.Save(); err != nil {
@@ -22,45 +28,20 @@ func Run(configPath string) {
 		}
 	}()
 
-	// tgram := NewTelegramSender(cfg.TelegramProxy)
+	tgramProxy, err := proxy.GetTransport(cfg.TelegramProxy)
+	if err != nil {
+		log.Panic("failed to get proxy transport", "proxyURL", cfg.TelegramProxy, "error", err)
+	}
+
+	tgram := telegram.NewTelegramSender(tgramProxy, cfg.TelegramAuthToken)
 
 	for _, feed := range cfg.Feeds {
 		log.Info("processing feed", "feed", feed.Name)
-		ProcessFeed(feed, scheduler, cfg.DbDir)
+		ProcessFeed(feed, scheduler, cfg.DbDir, tgram)
 	}
-
-	/*
-		for _, feed := range cfg.Feeds {
-			log.Println("Processing feed", feed.Name)
-			data, err := Download(feed.Url, feed.Proxy)
-			if err != nil {
-				log.Fatal(err)
-			}
-		}
-
-		for _, feed := range c.Feeds {
-			log.Println("Processing feed", feed.Name)
-
-			links, err := parseFeed(data)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			for _, link := range links {
-				if alreadySent(link) {
-					continue
-				}
-				err := sendTelegram(link, feed.Channel, feed.Rhash)
-				if err != nil {
-					log.Fatal(err)
-				}
-			}
-		}
-		fmt.Println(configPath)
-	*/
 }
 
-func ProcessFeed(feed FeedCfg, scheduler *Scheduler, dbDir string) {
+func ProcessFeed(feed FeedCfg, scheduler *Scheduler, dbDir string, tgram telegram.TelegramSender) {
 	sd, err := scheduler.ShouldDownload(feed.Name, feed.Cron)
 	if err != nil {
 		log.Error("shouldDownload failed", "feed", feed.Name, "err", err)
@@ -90,17 +71,39 @@ func ProcessFeed(feed FeedCfg, scheduler *Scheduler, dbDir string) {
 		return
 	}
 
-	_, err = db.Filter(entries)
+	filteredEntries, err := db.Filter(entries)
 	if err != nil {
 		log.Error("failed to filter entries", "feed", feed.Name, "error", err)
 	}
+
+	var records []Record
+	for _, entry := range filteredEntries {
+		now := time.Now()
+		r := Record{
+			Time:      now,
+			FeedEntry: entry,
+		}
+		err := tgram.SendLink(entry.Link, feed.Channel, feed.Rhash)
+		if err != nil {
+			log.Error("failed to send to telegram", "feed", feed.Name, "link", entry.Link, "channel", feed.Channel, "rhash", feed.Rhash, "error", err)
+			r.Status = Error
+		} else {
+			r.Status = Sent
+		}
+		records = append(records, r)
+	}
+	err = db.Save(records)
+	if err != nil {
+		log.Error("failed to save sent records", "feed", feed.Name, "num_records", len(records), "error", err)
+	}
 }
 
 func Download(url string, proxyUrl string) ([]byte, error) {
-	client, err := proxy.GetClient(proxyUrl)
+	transport, err := proxy.GetTransport(proxyUrl)
 	if err != nil {
 		return nil, err
 	}
+	client := &http.Client{Transport: transport}
 	res, err := client.Get(url)
 	if err != nil {
 		return nil, err

app/config.go

@@ -17,12 +17,14 @@ type FeedCfg struct {
 }
 
 type Config struct {
-	Proxy           string    `yaml:"proxy"`
-	TelegramProxy   string    `yaml:"telegram_proxy"`
-	DataDir         string    `yaml:"data_dir"`
-	LastSuccessPath string    `yaml:"last_loaded_path"`
-	DbDir           string    `yaml:"db_dir"`
-	Feeds           []FeedCfg `yaml:"feeds"`
+	Proxy         string `yaml:"proxy"`
+	TelegramProxy string `yaml:"telegram_proxy"`
+	//TODO: read from credential file
+	TelegramAuthToken string    `yaml:"telegram_auth_token"`
+	DataDir           string    `yaml:"data_dir"`
+	LastSuccessPath   string    `yaml:"last_loaded_path"`
+	DbDir             string    `yaml:"db_dir"`
+	Feeds             []FeedCfg `yaml:"feeds"`
 }
 
 func ParseConfig(configPath string) (*Config, error) {