From 879b33d3858008d676c3a71a8e07e87cbd2e408b Mon Sep 17 00:00:00 2001 From: Yevhen Odynets Date: Tue, 28 Oct 2025 11:36:11 +0200 Subject: [PATCH] all fixed --- config/default.yaml | 2 -- config/scope/stb.yaml | 6 +++--- internal/flag.go | 2 +- internal/mail/mail.go | 5 +++++ pkg/repository/prescene.go | 2 +- pkg/repository/stb.go | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/config/default.yaml b/config/default.yaml index e7aad44..946c6e2 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -2,7 +2,5 @@ scope: allow: [info, web, rutracker, prescene, stb, metal-archives, console] default: console mail: - amok.space: - dial-tls: mail.amok.space:993 kplus.net.ua: dial-tls: s21.thehost.com.ua:993 \ No newline at end of file diff --git a/config/scope/stb.yaml b/config/scope/stb.yaml index a231978..8691d24 100644 --- a/config/scope/stb.yaml +++ b/config/scope/stb.yaml @@ -1,9 +1,9 @@ role: console stb: - endpoint: stb@amok.space - #mailboxes: ["INBOX"] + endpoint: stb@kplus.net.ua + mailboxes: ["INBOX"] #mailboxes: ["INBOX", "Junk Mail", "Done"] - mailboxes: ["Junk Mail"] + #mailboxes: ["Junk Mail"] #mailboxes: ["Done"] search-criteria: ["Your Share The Brutality digest", "noreply@sharethebrutality.info"] move-processed-to-mailbox: diff --git a/internal/flag.go b/internal/flag.go index d0abd1a..f51f889 100644 --- a/internal/flag.go +++ b/internal/flag.go @@ -24,7 +24,7 @@ Commands: -section -s Select section e.g.: rutracker, bandcamp etc. The Go runtime version: %s -Report bugs to https://git.amok.space/yevhen/resource-scraper/issues` +Report bugs to https://git.kplus.net.ua/yevhen/resource-scraper/issues` const ( version = "0.1" diff --git a/internal/mail/mail.go b/internal/mail/mail.go index ab040ff..9d288cd 100644 --- a/internal/mail/mail.go +++ b/internal/mail/mail.go @@ -68,8 +68,12 @@ func (s *EmailService) Login() { err := s.client.Login(s.User, s.pass).Wait() if s.CheckErr("Login", err) { + fmt.Println("========================================") + fmt.Println(err.Error()) + fmt.Println("========================================") return } + s.success(s.User + " logged") } @@ -117,6 +121,7 @@ func (s *EmailService) ListMessages(mailboxes []string, criteria *imap.SearchCri } messages, err := s.client.Fetch(seqSet, fetchOptions).Collect() + if s.CheckErr("Fetch", err) { continue } diff --git a/pkg/repository/prescene.go b/pkg/repository/prescene.go index 1366688..77cdb3b 100644 --- a/pkg/repository/prescene.go +++ b/pkg/repository/prescene.go @@ -44,7 +44,7 @@ func (s *Prescene) GetPage(pageNumbers []string) ([]model.ExternalSources, error endpoint += fmt.Sprintf(viper.GetString(constant.CfgKeyEndpointNext), t) } - //doc, err := parser.HTMLSourceFromURL("https://mdb.amok.space/$/scnlog.html") + //doc, err := parser.HTMLSourceFromURL("https://mdb.kplus.net.ua /$/scnlog.html") if result, err := parseUrl(endpoint, s.db); err == nil { entries = append(entries, result...) } else { diff --git a/pkg/repository/stb.go b/pkg/repository/stb.go index d971eab..4078867 100644 --- a/pkg/repository/stb.go +++ b/pkg/repository/stb.go @@ -144,7 +144,7 @@ func (s *ShareTheBrutality) Processing(sender map[string]string) []model.Externa entries = append(entries, es) } - fmt.Println(entries) + //fmt.Println(entries) //os.Exit(0) result, status := _table.BatchInsertOnDuplicate(entries, s.db, columns)