Compare commits

...

10 commits
v0.1.7 ... main

Author SHA1 Message Date
nquidox
2fa14a7797 new price parsing methods + tests
All checks were successful
/ Make image (push) Successful in 39s
2026-01-05 17:51:02 +03:00
nquidox
ae0a07ae1b new get price method
All checks were successful
/ Make image (push) Successful in 38s
2026-01-04 15:19:21 +03:00
nquidox
784a1a74ff small fix
All checks were successful
/ Make image (push) Successful in 38s
2025-12-28 17:08:31 +03:00
nquidox
3375dadf06 change query seq
Some checks failed
/ Make image (push) Has been cancelled
2025-12-28 17:07:40 +03:00
nquidox
fedd9f1bbf parsers registration change
All checks were successful
/ Make image (push) Successful in 39s
2025-12-26 18:49:22 +03:00
nquidox
4aa4daa295 extended navigation
All checks were successful
/ Make image (push) Successful in 38s
2025-12-26 18:17:26 +03:00
nquidox
dc257c195b query update
All checks were successful
/ Make image (push) Successful in 38s
2025-12-26 16:56:40 +03:00
nquidox
45e633a8d0 ctx bugfix
All checks were successful
/ Make image (push) Successful in 39s
2025-12-26 16:36:51 +03:00
nquidox
e48160dfa3 mandarake parser rework
All checks were successful
/ Make image (push) Successful in 39s
2025-12-26 16:19:09 +03:00
nquidox
d63d345a9b external chromedp
All checks were successful
/ Make image (push) Successful in 39s
2025-12-20 16:31:27 +03:00
9 changed files with 410 additions and 387 deletions

View file

@ -1,6 +1,7 @@
APP_LOG_LEVEL=error APP_LOG_LEVEL=error
APP_NUMCPUS=-1 APP_NUMCPUS=-1
APP_CHECK_PERIOD=6 APP_CHECK_PERIOD=6
EXTERNAL_BROWSER=
GRPC_SERVER_HOST=0.0.0.0 GRPC_SERVER_HOST=0.0.0.0
GRPC_SERVER_PORT=9060 GRPC_SERVER_PORT=9060
@ -13,3 +14,7 @@ GRPC_SURUGAYA_SCRAPPER_PORT=9070
TASK_RETRY_COUNT=3 TASK_RETRY_COUNT=3
TASK_RETRY_MINUTES=5 TASK_RETRY_MINUTES=5
ORIGIN_SURUGAYA_ENABLED=false
ORIGIN_MANDARAKE_ENABLED=false
ORIGIN_AMIAMI_ENABLED=false

View file

@ -12,6 +12,8 @@ type Config struct {
CheckPeriod int CheckPeriod int
TasksCfg TasksConfig TasksCfg TasksConfig
GrpcCfg GrpcConfig GrpcCfg GrpcConfig
OriginEnabled OriginEnabled
ExternalBrowser string
} }
type GrpcConfig struct { type GrpcConfig struct {
@ -28,11 +30,18 @@ type TasksConfig struct {
RetryMinutes int RetryMinutes int
} }
type OriginEnabled struct {
Surugaya bool
Mandarake bool
Amiami bool
}
func NewConfig() *Config { func NewConfig() *Config {
return &Config{ return &Config{
LogLevel: getEnv("APP_LOG_LEVEL", "debug"), LogLevel: getEnv("APP_LOG_LEVEL", "debug"),
NumCPUs: getEnvInt("APP_NUMCPUS", -1), NumCPUs: getEnvInt("APP_NUMCPUS", -1),
CheckPeriod: getEnvInt("APP_CHECK_PERIOD", 6), CheckPeriod: getEnvInt("APP_CHECK_PERIOD", 6),
ExternalBrowser: getEnv("EXTERNAL_BROWSER", ""),
GrpcCfg: GrpcConfig{ GrpcCfg: GrpcConfig{
ServerHost: getEnv("GRPC_SERVER_HOST", "0.0.0.0"), ServerHost: getEnv("GRPC_SERVER_HOST", "0.0.0.0"),
@ -47,6 +56,12 @@ func NewConfig() *Config {
RetryCount: getEnvInt("TASK_RETRY_COUNT", 3), RetryCount: getEnvInt("TASK_RETRY_COUNT", 3),
RetryMinutes: getEnvInt("TASK_RETRY_MINUTES", 5), RetryMinutes: getEnvInt("TASK_RETRY_MINUTES", 5),
}, },
OriginEnabled: OriginEnabled{
Surugaya: getEnvBool("ORIGIN_SURUGAYA_ENABLED", false),
Mandarake: getEnvBool("ORIGIN_MANDARAKE_ENABLED", false),
Amiami: getEnvBool("ORIGIN_AMIAMI_ENABLED", false),
},
} }
} }
@ -68,3 +83,15 @@ func getEnvInt(key string, fallback int) int {
} }
return fallback return fallback
} }
func getEnvBool(key string, fallback bool) bool {
if value, ok := os.LookupEnv(key); ok {
val, err := strconv.ParseBool(value)
if err != nil {
log.WithField("default", false).Warn("Config | Can't parse value as bool")
return fallback
}
return val
}
return fallback
}

View file

@ -11,6 +11,7 @@ import (
"task-processor/config" "task-processor/config"
"task-processor/internal/appState" "task-processor/internal/appState"
"task-processor/internal/parsers" "task-processor/internal/parsers"
"task-processor/internal/parsers/mandarake"
"task-processor/internal/processor" "task-processor/internal/processor"
"task-processor/internal/remote" "task-processor/internal/remote"
"task-processor/internal/shared" "task-processor/internal/shared"
@ -70,9 +71,18 @@ func (app *App) Run() {
surugayaScrapper := newSurugayaScrapperClient(app.config.GrpcCfg.SurugayaScrapperHost + ":" + app.config.GrpcCfg.SurugayaScrapperPort) surugayaScrapper := newSurugayaScrapperClient(app.config.GrpcCfg.SurugayaScrapperHost + ":" + app.config.GrpcCfg.SurugayaScrapperPort)
//task processor //task processor
handlers := map[string]parsers.TaskHandler{ handlers := make(map[string]parsers.TaskHandler)
shared.OriginSurugaya: parsers.NewSurugayaParser(ctx, surugayaScrapper),
shared.OriginMandarake: parsers.NewMandarakeParser(app.numCPUs), if app.config.OriginEnabled.Surugaya {
handlers[shared.OriginSurugaya] = parsers.NewSurugayaParser(ctx, surugayaScrapper)
}
if app.config.OriginEnabled.Mandarake {
handlers[shared.OriginMandarake] = mandarake.NewParser(mandarake.ParserDeps{
Enabled: app.config.OriginEnabled.Mandarake,
ExternalBrowser: app.config.ExternalBrowser,
GoroutinesNumber: app.numCPUs,
})
} }
taskProcessor := processor.New(processor.Deps{ taskProcessor := processor.New(processor.Deps{

View file

@ -1,375 +0,0 @@
package parsers
import (
"context"
"fmt"
"github.com/chromedp/cdproto/network"
"github.com/chromedp/chromedp"
log "github.com/sirupsen/logrus"
"golang.org/x/net/html"
"net/http"
"net/http/cookiejar"
"net/url"
"regexp"
"slices"
"strconv"
"strings"
"sync"
"task-processor/internal/appState"
"task-processor/internal/shared"
"time"
)
type MandarakeParser struct {
goroutinesNumber int
parseParams parseParams
client *http.Client
}
type parseParams struct {
userAgent string
cookieUrl string
single price
ranged price
taxMult float64
}
type price struct {
tag string
attrKey string
attrVal string
subTag string
substring string
}
func NewMandarakeParser(goroutinesNumber int) *MandarakeParser {
p := parseParams{
userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
cookieUrl: "https://www.mandarake.co.jp/",
single: price{
tag: "div",
attrKey: "class",
attrVal: "price",
subTag: "p",
substring: "円",
},
ranged: price{
tag: "div",
attrKey: "class",
attrVal: "price_range",
subTag: "p",
substring: "円"},
taxMult: 1.1,
}
return &MandarakeParser{
goroutinesNumber: goroutinesNumber,
parseParams: p,
}
}
func (s *MandarakeParser) HandleTasks(tasks []shared.Task, sender chan shared.TaskResult, state *appState.State) {
log.Debug("Handling Mandarake tasks")
if err := s.initClient2(); err != nil {
log.WithError(err).Error("Mandarake handler | Error initializing client")
return
}
receiver := make(chan shared.Task, len(tasks))
for _, task := range tasks {
receiver <- task
}
close(receiver)
wg := sync.WaitGroup{}
for i := 0; i < s.goroutinesNumber; i++ {
wg.Add(1)
go func() {
defer wg.Done()
s.worker(receiver, sender, state)
}()
}
wg.Wait()
log.Debug("Finished handling Mandarake tasks")
}
func (s *MandarakeParser) worker(receiver chan shared.Task, sender chan shared.TaskResult, state *appState.State) {
for task := range receiver {
log.WithField("task id", task.MerchUuid).Debug("Mandarake worker | Processing task")
page, err := s.getPage(task.Link)
if err != nil {
log.WithError(err).Error("Mandarake worker | Error getting page for task")
continue
}
if page == nil {
log.Debug("Mandarake worker | Page for task is nil")
continue
}
p := int32(s.getMinPrice(page))
sender <- shared.TaskResult{
MerchUuid: task.MerchUuid,
Origin: task.Origin,
Price: p,
}
}
}
// Deprecated: use initClient2 instead.
func (s *MandarakeParser) initClient() error {
//preload cookies for client
req, err := http.NewRequest("GET", s.parseParams.cookieUrl, nil)
if err != nil {
return err
}
//TODO сделать один клиент с одним джаром
client := http.Client{}
req.Header.Set("User-Agent", s.parseParams.userAgent)
result, err := client.Do(req)
if err != nil {
return err
}
defer result.Body.Close()
c := result.Cookies()
log.WithField("cookies", c).Debug("Mandarake handler | Get cookies")
//make client
jar, err := cookiejar.New(nil)
if err != nil {
log.WithError(err).Error("Mandarake | Cookie jar")
return err
}
u, err := url.Parse(s.parseParams.cookieUrl)
if err != nil {
log.WithError(err).Error("Mandarake | Parse cookie URL")
return err
}
jar.SetCookies(u, c)
taskClient := &http.Client{
Timeout: time.Second * 30,
Jar: jar,
}
s.client = taskClient
return nil
}
func (s *MandarakeParser) getPage(url string) (*html.Node, error) {
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err
}
req.Header.Set("User-Agent", s.parseParams.userAgent)
result, err := s.client.Do(req)
if err != nil {
return nil, err
}
doc, err := html.Parse(result.Body)
if err != nil {
return nil, err
}
return doc, nil
}
func (s *MandarakeParser) getMinPrice(page *html.Node) int {
singlePriceNode := s.findNode(page, s.parseParams.single)
if singlePriceNode == nil {
return 0
}
singlePriceStr := s.findData(singlePriceNode, s.parseParams.single)
if singlePriceStr == nil {
return 0
}
var prices []int
prices = append(prices, s.getPrice(singlePriceStr))
priceRangeNode := s.findNode(page, s.parseParams.ranged)
if priceRangeNode != nil {
priceFromRange := s.findData(priceRangeNode, s.parseParams.ranged)
if priceFromRange != nil {
withTax := int(float64(s.getPrice(priceFromRange)) * s.parseParams.taxMult)
prices = append(prices, withTax)
}
}
return slices.Min(prices)
}
func (s *MandarakeParser) findNode(doc *html.Node, params price) *html.Node {
if doc == nil {
return nil
}
var (
crawler func(*html.Node)
result *html.Node
)
crawler = func(node *html.Node) {
if result != nil {
return
}
if node.Type == html.ElementNode && node.Data == params.tag {
for _, attr := range node.Attr {
if attr.Key == params.attrKey && attr.Val == params.attrVal {
result = node
return
}
}
}
for child := node.FirstChild; child != nil; child = child.NextSibling {
crawler(child)
}
}
crawler(doc)
return result
}
func (s *MandarakeParser) findData(doc *html.Node, params price) []string {
if doc == nil {
return nil
}
var (
crawler func(*html.Node)
values []string
getText func(*html.Node) string
)
getText = func(n *html.Node) string {
if n.Type == html.TextNode {
return n.Data
}
var result strings.Builder
for c := n.FirstChild; c != nil; c = c.NextSibling {
result.WriteString(getText(c))
}
return result.String()
}
crawler = func(node *html.Node) {
if node.Type == html.ElementNode && node.Data == params.subTag {
text := strings.TrimSpace(getText(node))
if strings.Contains(text, params.substring) {
values = append(values, text)
}
}
for child := node.FirstChild; child != nil; child = child.NextSibling {
crawler(child)
}
}
crawler(doc)
return values
}
func (s *MandarakeParser) getPrice(rawStr []string) int {
re := regexp.MustCompile(`\([^)]*?([0-9,]+)[^)]*?\)`)
for _, str := range rawStr {
matches := re.FindStringSubmatch(str)
if len(matches) > 1 {
priceStr := strings.ReplaceAll(matches[1], ",", "")
price, err := strconv.Atoi(priceStr)
if err != nil {
fmt.Println(err)
return 0
}
return price
}
}
return 0
}
//new client
func (s *MandarakeParser) initClient2() error {
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
ctx, _ = chromedp.NewContext(ctx)
if err := chromedp.Run(ctx,
chromedp.Navigate(s.parseParams.cookieUrl),
chromedp.WaitVisible("body", chromedp.ByQuery),
); err != nil {
return fmt.Errorf("failed to navigate: %w", err)
}
var cookies []*network.Cookie
err := chromedp.Run(ctx, chromedp.ActionFunc(func(ctx context.Context) error {
var err error
cookies, err = network.GetCookies().Do(ctx)
return err
}))
if err != nil {
return fmt.Errorf("failed to get cookies: %w", err)
}
var httpCookies []*http.Cookie
for _, c := range cookies {
httpCookies = append(httpCookies, &http.Cookie{
Name: c.Name,
Value: c.Value,
Path: c.Path,
Domain: c.Domain,
Expires: float64ToTime(c.Expires),
Secure: c.Secure,
HttpOnly: c.HTTPOnly,
SameSite: convertSameSite(c.SameSite),
})
}
jar, err := cookiejar.New(nil)
if err != nil {
return err
}
u, err := url.Parse(s.parseParams.cookieUrl)
if err != nil {
return err
}
jar.SetCookies(u, httpCookies)
client := &http.Client{
Jar: jar,
Timeout: 30 * time.Second,
}
s.client = client
return nil
}
func convertSameSite(s network.CookieSameSite) http.SameSite {
switch s {
case network.CookieSameSiteStrict:
return http.SameSiteStrictMode
case network.CookieSameSiteLax:
return http.SameSiteLaxMode
case network.CookieSameSiteNone:
return http.SameSiteNoneMode
default:
return http.SameSiteDefaultMode
}
}
func float64ToTime(unixFloat float64) time.Time {
sec := int64(unixFloat)
nsec := int64((unixFloat - float64(sec)) * 1e9)
return time.Unix(sec, nsec)
}

View file

@ -0,0 +1,64 @@
package mandarake
import (
"context"
"github.com/chromedp/chromedp"
log "github.com/sirupsen/logrus"
"sync"
"task-processor/internal/appState"
"task-processor/internal/shared"
)
func (s *Parser) HandleTasks(tasks []shared.Task, sender chan shared.TaskResult, state *appState.State) {
log.Debug(logHeader + logWorker + "handling tasks")
allocCtx, allocCancel := chromedp.NewRemoteAllocator(s.baseCtx, s.externalBrowser)
receiver := make(chan shared.Task, len(tasks))
for _, task := range tasks {
receiver <- task
}
close(receiver)
wg := sync.WaitGroup{}
for i := 0; i < s.goroutinesNumber; i++ {
wg.Add(1)
go func() {
defer wg.Done()
s.worker(allocCtx, receiver, sender, state)
}()
}
wg.Wait()
allocCancel()
log.Debug(logHeader + logWorker + "finished handling tasks")
}
func (s *Parser) worker(ctx context.Context, receiver chan shared.Task, sender chan shared.TaskResult, state *appState.State) {
for task := range receiver {
log.WithField("task_uuid", task.MerchUuid).Debug(logHeader + logWorker + "processing task")
//pageCtx, pageCancel := chromedp.NewContext(ctx, chromedp.WithLogf(func(string, ...any) {}))
//
//price, err := s.getPrice(pageCtx, task)
//pageCancel()
//price, err := s.getMinimalPrice(task)
//if err != nil {
// log.WithField("task_uuid", task.MerchUuid).Warn(logHeader + logWorker + logTaskWarning + "failed to process, zero price")
// sender <- shared.TaskResult{
// MerchUuid: task.MerchUuid,
// Origin: task.Origin,
// Price: zeroPrice,
// }
// continue
//}
//price will be zeroPrice value in case of any error or if price not found
price := s.getMinimalPrice(task)
sender <- shared.TaskResult{
MerchUuid: task.MerchUuid,
Origin: task.Origin,
Price: price,
}
}
}

View file

@ -0,0 +1,40 @@
package mandarake
import (
"context"
log "github.com/sirupsen/logrus"
)
const (
zeroPrice int32 = 0
taxMultiplier float64 = 1.1
logHeader = "Mandarake parser | "
logWorker = "worker: "
logTaskWarning = "task warning: "
logGetPrice = "get price: "
)
type Parser struct {
baseCtx context.Context
externalBrowser string
goroutinesNumber int
}
type ParserDeps struct {
Enabled bool
ExternalBrowser string
GoroutinesNumber int
}
func NewParser(deps ParserDeps) *Parser {
if !deps.Enabled {
log.Info(logHeader + "disabled")
return nil
}
return &Parser{
baseCtx: context.Background(),
externalBrowser: deps.ExternalBrowser,
goroutinesNumber: deps.GoroutinesNumber,
}
}

View file

@ -0,0 +1,174 @@
package mandarake
import (
"context"
"github.com/chromedp/chromedp"
log "github.com/sirupsen/logrus"
"regexp"
"slices"
"strconv"
"strings"
"task-processor/internal/shared"
)
func (s *Parser) getPrice(ctx context.Context, task shared.Task) (int32, error) {
var (
singlePrice string
rangedPrice string
prices []int32
)
if err := chromedp.Run(ctx,
chromedp.Navigate(task.Link),
chromedp.WaitReady("body"),
chromedp.Text(`div.price`, &singlePrice, chromedp.ByQuery, chromedp.AtLeast(0)),
chromedp.Text(`div.price_range`, &rangedPrice, chromedp.ByQuery, chromedp.AtLeast(0)),
); err != nil {
log.WithError(err).Error(logHeader + logGetPrice + "failed to get single price tag")
return zeroPrice, err
}
singlePrice = strings.TrimSpace(singlePrice)
prices = append(prices, s.getSinglePriceWithTax(singlePrice))
rangedPrice = strings.TrimSpace(rangedPrice)
if rangedPrice != "" {
prices = append(prices, s.getMinimalPriceFromRangeWithTax(rangedPrice))
}
minimal := slices.Min(prices)
log.Infof(logHeader+"uuid: %s, price: %d", task.MerchUuid, minimal)
return minimal, nil
}
func (s *Parser) getMinimalPrice(task shared.Task) int32 {
ctx := context.Background()
allocCtx, allocCancel := chromedp.NewRemoteAllocator(ctx, s.externalBrowser)
defer allocCancel()
sessionCtx, sessionCancel := chromedp.NewContext(allocCtx, chromedp.WithLogf(log.Printf))
defer sessionCancel()
var (
singlePrice string
rangedPrice string
)
if err := chromedp.Run(sessionCtx,
chromedp.Navigate(task.Link),
chromedp.WaitVisible("body", chromedp.ByQuery),
chromedp.Evaluate(`(document.querySelector('div.price')?.innerText || '').trim()`, &singlePrice),
chromedp.Evaluate(`(document.querySelector('div.price_range')?.innerText || '').trim()`, &rangedPrice),
); err != nil {
return zeroPrice
}
minimal := s.processPrices(singlePrice, rangedPrice)
log.Infof(logHeader+"uuid: %s, price: %d", task.MerchUuid, minimal)
return minimal
}
func (s *Parser) processPrices(singlePrice, rangedPrice string) int32 {
var prices []int32
//in case of any errors or no price return zeroPrice const
//if success add to prices slice
if singlePrice != "" {
singlePrice = strings.TrimSpace(singlePrice)
counted, err := s.parseSinglePrice(singlePrice)
if err != nil {
log.WithFields(log.Fields{
"err": err.Error(),
"singlePrice": singlePrice,
}).Error(logHeader + logGetPrice + "failed to parse single price, returning zero price")
return zeroPrice
}
prices = append(prices, counted)
} else {
log.Warn(logHeader + logGetPrice + "single price not found")
return zeroPrice
}
//optional, adds price only if no errors and has non zero value
if rangedPrice != "" {
rangedPrice = strings.TrimSpace(rangedPrice)
counted, err := s.parseRangedPrice(rangedPrice)
if err != nil {
log.WithFields(log.Fields{
"err": err.Error(),
"rangedPrice": rangedPrice,
}).Error(logHeader + logGetPrice + "failed to parse ranged price")
} else {
if counted > 0 {
prices = append(prices, counted)
}
}
}
return slices.Min(prices)
}
func (s *Parser) getSinglePriceWithTax(rawPrice string) int32 {
re := regexp.MustCompile(`(\d+)\s*円`)
matches := re.FindStringSubmatch(rawPrice)
if len(matches) < 2 {
log.Error("Mandarake | Single price not found, returning zero price")
return zeroPrice
}
priceStr := matches[1]
price, err := strconv.Atoi(priceStr)
if err != nil {
log.Error("Mandarake | Failed to convert single price, returning zero price")
return zeroPrice
}
return int32(price)
}
func (s *Parser) getMinimalPriceFromRangeWithTax(priceRange string) int32 {
re := regexp.MustCompile(`他([\d,]+)円`)
matches := re.FindStringSubmatch(priceRange)
if len(matches) < 2 {
log.Error("Price not found in range, returning zero price")
return zeroPrice
}
priceStr := strings.ReplaceAll(matches[1], ",", "")
price, err := strconv.Atoi(priceStr)
if err != nil {
log.Error("Failed to convert minimal price in range, returning zero price")
return zeroPrice
}
return int32(float64(price) * taxMultiplier)
}
func (s *Parser) parseSinglePrice(rawPrice string) (int32, error) {
deCommaStr := strings.ReplaceAll(rawPrice, ",", "")
split := strings.Split(deCommaStr, "円")
finalPrice, err := s.countTax(split[0])
if err != nil {
return zeroPrice, err
}
return finalPrice, nil
}
func (s *Parser) parseRangedPrice(rawPrice string) (int32, error) {
deCommaStr := strings.ReplaceAll(rawPrice, ",", "")
split := strings.Split(deCommaStr, "円")
rm1 := strings.ReplaceAll(split[0], "(", "")
rm2 := strings.ReplaceAll(rm1, "他", "")
finalPrice, err := s.countTax(rm2)
if err != nil {
return zeroPrice, err
}
return finalPrice, nil
}
func (s *Parser) countTax(priceStr string) (int32, error) {
intPrice, err := strconv.Atoi(priceStr)
if err != nil {
return zeroPrice, err
}
return int32(float64(intPrice) * taxMultiplier), nil
}

View file

@ -0,0 +1,77 @@
package mandarake
import (
"context"
"testing"
)
func TestParser_processPrices(t *testing.T) {
type fields struct {
baseCtx context.Context
externalBrowser string
goroutinesNumber int
}
type args struct {
singlePrice string
rangedPrice string
}
var placeholderFields = fields{
baseCtx: context.Background(),
externalBrowser: "",
goroutinesNumber: 10,
}
//single := "18,000円 (税込 19,800円)"
//ranged := "(他15,000円16,000円もあります)"
tests := []struct {
name string
fields fields
args args
want int32
}{
//Cases
{name: "Full success", fields: placeholderFields, args: args{
singlePrice: "18,000円 (税込 19,800円)",
rangedPrice: "(他15,000円16,000円もあります)",
}, want: 16500},
{name: "Single price only success 1", fields: placeholderFields, args: args{
singlePrice: "18,000円 (税込 19,800円)",
rangedPrice: "",
}, want: 19800},
{name: "Single price only success 2", fields: placeholderFields, args: args{
singlePrice: "18,000円 (税込 19,800円)",
rangedPrice: "no numbers in this string",
}, want: 19800},
{name: "zero single price success 1", fields: placeholderFields, args: args{
singlePrice: "",
rangedPrice: "",
}, want: 0},
{name: "zero single price success 2", fields: placeholderFields, args: args{
singlePrice: "no numbers in this string",
rangedPrice: "",
}, want: 0},
{name: "zero single price success 3", fields: placeholderFields, args: args{
singlePrice: "no numbers in this string",
rangedPrice: "no numbers in this string",
}, want: 0},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
s := &Parser{
baseCtx: tt.fields.baseCtx,
externalBrowser: tt.fields.externalBrowser,
goroutinesNumber: tt.fields.goroutinesNumber,
}
if got := s.processPrices(tt.args.singlePrice, tt.args.rangedPrice); got != tt.want {
t.Errorf("processPrices() = %v, want %v", got, tt.want)
}
})
}
}

View file

@ -26,6 +26,7 @@ func (p *Processor) StartWork(receivedTasks []shared.TaskResponse) {
wg.Add(1) wg.Add(1)
go func(origin string, tasks []shared.Task) { go func(origin string, tasks []shared.Task) {
defer wg.Done() defer wg.Done()
log.Info("Running task handler for origin: ", origin)
p.handlers[origin].HandleTasks(tasks, p.out, p.state) p.handlers[origin].HandleTasks(tasks, p.out, p.state)
}(origin, tasks) }(origin, tasks)
} }