minor changes
This commit is contained in:
@@ -29,7 +29,7 @@ func New(services *service.Service) *Handler {
|
||||
"prescene": h.Prescene,
|
||||
"rutracker": h.Rutracker,
|
||||
"stb": h.STB,
|
||||
//"web": h.Web,
|
||||
//"web": h.Web,
|
||||
}
|
||||
|
||||
return h
|
||||
|
||||
@@ -30,7 +30,12 @@ func (h *Handler) Prescene() string {
|
||||
pagesToScrape = append(pagesToScrape, strconv.Itoa(page))
|
||||
}
|
||||
|
||||
_, err := h.services.Prescene.GetPage(pagesToScrape)
|
||||
_, err := h.services.Prescene.GetSrrDb()
|
||||
if err != nil {
|
||||
slog.Error("error occurred while getting page: ", "err", err.Error())
|
||||
}
|
||||
|
||||
_, err = h.services.Prescene.GetPage(pagesToScrape)
|
||||
if err != nil {
|
||||
slog.Error("error occurred while getting page: ", "err", err.Error())
|
||||
}
|
||||
|
||||
@@ -17,7 +17,5 @@ func (h *Handler) Rutracker() string {
|
||||
slog.Error("error occurred while getting topic: ", "err", err.Error())
|
||||
}
|
||||
|
||||
//fmt.Printf("%+v", rt)
|
||||
|
||||
return "rt"
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/davecgh/go-spew/spew"
|
||||
"github.com/dromara/carbon/v2"
|
||||
"github.com/go-shiori/dom"
|
||||
"github.com/jmoiron/sqlx"
|
||||
@@ -25,6 +26,17 @@ type Prescene struct {
|
||||
db *sqlx.DB
|
||||
}
|
||||
|
||||
func (s *Prescene) GetSrrDb() ([]model.ExternalSources, error) {
|
||||
entries := make([]model.ExternalSources, 0)
|
||||
now := time.Now()
|
||||
yesterday := now.Add(-24 * time.Hour)
|
||||
todayStr := now.Format("2006-01-02")
|
||||
yesterdayStr := yesterday.Format("2006-01-02")
|
||||
spew.Dump(entries, todayStr, yesterdayStr)
|
||||
|
||||
return []model.ExternalSources{}, nil
|
||||
}
|
||||
|
||||
func NewPresceneRepository(db *sqlx.DB) *Prescene {
|
||||
return &Prescene{db: db}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ func NewRutrackerRepository(db *sqlx.DB) *Rutracker {
|
||||
|
||||
func (s *Rutracker) GetTopic(topics []string) ([]model.ExternalSources, error) {
|
||||
endpoint := viper.GetString(constant.CfgKeyEndpoint)
|
||||
|
||||
entries := make([]model.ExternalSources, 0)
|
||||
columns := []string{"`type`", "type_id", "title", "type_subsection_id", "releaser", "created"}
|
||||
|
||||
@@ -46,13 +47,17 @@ func (s *Rutracker) GetTopic(topics []string) ([]model.ExternalSources, error) {
|
||||
es.Type = constant.ScopeRuTracker
|
||||
es.TypeId, _ = strconv.Atoi(u.Query().Get("t"))
|
||||
es.Title = e.Title
|
||||
|
||||
es.TypeSubsectionId, _ = strconv.Atoi(t)
|
||||
es.Releaser = e.Author.Name
|
||||
es.Created = carbon.Parse(e.Updated, "Europe/Kyiv")
|
||||
esModel := table.ExternalSources{Columns: columns}
|
||||
entry := esModel.InsertOnDuplicate(es, s.db)
|
||||
entries = append(entries, entry)
|
||||
//fmt.Printf("%+v\n\n\n", entry)
|
||||
|
||||
///fmt.Println(entries)
|
||||
|
||||
fmt.Printf("%+v\n\n\n", entry)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ func BatchInsertOnDuplicate(entries []model.ExternalSources, db *sqlx.DB, column
|
||||
var status string
|
||||
errCount := 0
|
||||
|
||||
for i := 0; i < len(entries); i++ {
|
||||
for i := range entries {
|
||||
entry := es.InsertOnDuplicate(entries[i], db)
|
||||
if entry.Error != nil {
|
||||
slog.Error("insert/update entry", "err", entry.Error)
|
||||
|
||||
@@ -16,3 +16,7 @@ func NewPresceneService(repo _interface.Prescene) *PresceneService {
|
||||
func (p *PresceneService) GetPage(pageNumbers []string) ([]model.ExternalSources, error) {
|
||||
return p.repo.GetPage(pageNumbers)
|
||||
}
|
||||
|
||||
func (p *PresceneService) GetSrrDb() ([]model.ExternalSources, error) {
|
||||
return p.repo.GetSrrDb()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user