yash
/
recipes2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix errors

This commit is contained in:
yyasha 2024-01-20 21:49:14 +03:00
parent f363ad2f27
commit 5aaa644fc5
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
internal/parser/parser.go
View File

@ -22,6 +22,13 @@ var client *httpclient.Client = httpclient.New().WithBaseURL(baseUrl)
var PHPSESSID string var PHPSESSID string
var parseKey string var parseKey string
var (
KeyNotFoundErr = errors.New("key not found")
CookieNotFoundErr = errors.New("cookie not found")
NotSuccessReqErr = errors.New("not success request")
EmptyLinkErr = errors.New("empty link")
)
// SaveAllPages saves all pages to storage. // SaveAllPages saves all pages to storage.
func SaveAllPages(log slog.Logger) error { func SaveAllPages(log slog.Logger) error {
const op = "parser.SaveAllPages" const op = "parser.SaveAllPages"
@ -69,8 +76,7 @@ func SavePage(log slog.Logger, page int) (int, error) {
continue continue
} }
if !resp.Success { if !resp.Success {
err = errors.New("not success request") return 0, fmt.Errorf("%s: %w", op, NotSuccessReqErr)
return 0, fmt.Errorf("%s: %w", op, err)
} }
body = strings.NewReader(resp.Data.Results) body = strings.NewReader(resp.Data.Results)
break break
@ -113,7 +119,7 @@ func GetRecipe(r *models.Recipe) error {
const op = "parser.GetRecipe" const op = "parser.GetRecipe"
if r.Link == "" { if r.Link == "" {
return fmt.Errorf("%s: %w", op, errors.New("empty link")) return fmt.Errorf("%s: %w", op, EmptyLinkErr)
} }
// send request // send request
body, err := client. body, err := client.
@ -167,11 +173,10 @@ func GetRecipe(r *models.Recipe) error {
var advices []string var advices []string
s.Find("div.recipe-footer__additional-text>p").Each(func(i int, q *goquery.Selection) { s.Find("div.recipe-footer__additional-text>p").Each(func(i int, q *goquery.Selection) {
if q.Find("br").Length() > 0 { if q.Find("br").Length() > 0 {
html, err := q.Html() html, _ := q.Html()
if err != nil { // if err != nil {
// return fmt.Errorf("%s: %w", op, err)
return fmt.Errorf("%s: %w", op, err) // }
}
advice_list := q.SetHtml(strings.Replace(html, "<br/>", "\n", -1)).Text() advice_list := q.SetHtml(strings.Replace(html, "<br/>", "\n", -1)).Text()
advices_arr := strings.Split(advice_list, "\n") advices_arr := strings.Split(advice_list, "\n")
var advices_arr_res []string = make([]string, 0, len(advices_arr)) var advices_arr_res []string = make([]string, 0, len(advices_arr))
@ -272,9 +277,8 @@ func GetKey(log slog.Logger) error {
log.Debug("New KEY =", parseKey) log.Debug("New KEY =", parseKey)
return nil return nil
} }
err = errors.New("key not found")
return fmt.Errorf("%s: %w", op, err) return fmt.Errorf("%s: %w", op, KeyNotFoundErr)
} }
func GetPHPSESSID(log slog.Logger) error { func GetPHPSESSID(log slog.Logger) error {
@ -301,7 +305,6 @@ func GetPHPSESSID(log slog.Logger) error {
return nil return nil
} }
} }
err = errors.New("cookie not found")
return fmt.Errorf("%s: %w", op, err) return fmt.Errorf("%s: %w", op, CookieNotFoundErr)
} }