diff --git a/api.go b/api.go index 89158d3..245afdc 100644 --- a/api.go +++ b/api.go @@ -77,7 +77,7 @@ func (api *Api) GetReadingList(ctx context.Context, listIndex int) (*ReadingList } func (api *Api) GetNovelByID(novelID NovelID) (*Novel, error) { - doc, err := api.Get(context.Background(), fmt.Sprintf("https://www.novelupdates.com/series/%s/", novelID)) + doc, err := api.Get(fmt.Sprintf("https://www.novelupdates.com/series/%s/", novelID)) if err != nil { return nil, ErrApiRequestFailed.Wrap(err) } @@ -135,7 +135,7 @@ func (api *Api) GetChapterEntriesByNovelID(novelID NovelID) *Cursor[NovelChapter go func() { defer close(out) - doc, err := api.Get(ctx, fmt.Sprintf("https://www.novelupdates.com/series/%s/?pg=%d", novelID, 1)) + doc, err := api.Get(fmt.Sprintf("https://www.novelupdates.com/series/%s/?pg=%d", novelID, 1)) if err != nil { fmt.Fprintln(os.Stderr, err) return @@ -190,7 +190,7 @@ func (api *Api) getPageCount(doc *goquery.Document) (int, error) { } func (api *Api) getChapterEntriesByPageIndex(ctx context.Context, novelID NovelID, pageIndex int) ([]NovelChapterEntry, error) { - doc, err := api.Get(ctx, fmt.Sprintf("https://www.novelupdates.com/series/%s/?pg=%d", novelID, pageIndex)) + doc, err := api.Get(fmt.Sprintf("https://www.novelupdates.com/series/%s/?pg=%d", novelID, pageIndex)) if err != nil { return nil, ErrApiRequestFailed.Wrap(err) } diff --git a/curl.go b/curl.go index 6f3b66a..5d09343 100644 --- a/curl.go +++ b/curl.go @@ -14,7 +14,7 @@ func (api *Api) GetWithCookie(ctx context.Context, url string) (*goquery.Documen return nil, ErrNoCookieSet.New() } - curl := exec.CommandContext(ctx, "curl", + curl := exec.Command("curl", "-s", url, "-H", fmt.Sprintf("User-Agent: %s", api.UserAgent), "-H", fmt.Sprintf("Cookie: %s", api.Cookie), @@ -39,8 +39,8 @@ func (api *Api) GetWithCookie(ctx context.Context, url string) (*goquery.Documen return goquery.NewDocumentFromReader(r) } -func (api *Api) Get(ctx context.Context, url string) (*goquery.Document, error) { - curl := exec.CommandContext(ctx, "curl", +func (api *Api) Get(url string) (*goquery.Document, error) { + curl := exec.Command("curl", "-s", url, "-H", fmt.Sprintf("User-Agent: %s", api.UserAgent), "-H", fmt.Sprintf("Accept-Encoding: %s", "gzip"), @@ -58,7 +58,7 @@ func (api *Api) Get(ctx context.Context, url string) (*goquery.Document, error) r, err := gzip.NewReader(stdout) if err != nil { - return nil, ErrInvalidGzipData.New(err) + return nil, ErrInvalidGzipData.Wrap(err) } return goquery.NewDocumentFromReader(r)