chore: remove cookie jar.

bookstairs · Nov 20, 2022 · df08035 · df08035
1 parent 7b68831
commit df08035
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 137 deletions.
diff --git a/internal/client/client.go b/internal/client/client.go
@@ -3,7 +3,6 @@ package client
 import (
 	"errors"
 	"fmt"
-	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -19,7 +18,6 @@ var (
 )
 
 const (
-	CookieFile       = "cookies.json"
 	DefaultUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko)" +
 		" Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.42"
 )
@@ -55,15 +53,6 @@ func (c *Config) ConfigPath() (string, error) {
 	return mkdir(filepath.Join(c.ConfigRoot, c.Host))
 }
 
-func (c *Config) newCookieJar() (http.CookieJar, error) {
-	configPath, err := c.ConfigPath()
-	if err != nil {
-		return nil, err
-	}
-
-	return newCookieJar(filepath.Join(configPath, CookieFile))
-}
-
 func (c *Config) redirectPolicy() []any {
 	policies := []any{
 		resty.FlexibleRedirectPolicy(5),
@@ -154,10 +143,14 @@ func New(c *Config) (*Client, error) {
 		SetAllowGetMethodPayload(true).
 		SetTimeout(5*time.Minute).
 		SetContentLength(true).
-		SetDebug(log.EnableDebug).
-		SetDisableWarn(true).
 		SetHeader("User-Agent", c.userAgent())
 
+	if !log.EnableDebug {
+		client.DisableTrace().SetDebug(false).SetDisableWarn(true)
+	} else {
+		client.SetDebug(true).SetDisableWarn(false)
+	}
+
 	if c.Host != "" {
 		client.SetBaseURL(c.baseURL())
 	}
@@ -166,13 +159,6 @@ func New(c *Config) (*Client, error) {
 		client.SetRedirectPolicy(c.redirectPolicy()...)
 	}
 
-	// Setting the cookiejar
-	cookieJar, err := c.newCookieJar()
-	if err != nil {
-		return nil, err
-	}
-	client.SetCookieJar(cookieJar)
-
 	// Setting the proxy for the resty client.
 	// The proxy environment is also supported.
 	if c.Proxy != "" {

diff --git a/internal/client/cookie.go b/internal/client/cookie.go
diff --git a/internal/fetcher/tianlang.go b/internal/fetcher/tianlang.go
@@ -2,8 +2,6 @@ package fetcher
 
 import (
 	"fmt"
-	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -20,23 +18,9 @@ func newTianlangService(config *Config) (service, error) {
 		return tianlangLinkResolver(config, c, id)
 	}
 
-	if err := cleanStaleCookies(config); err != nil {
-		return nil, err
-	}
-
 	return newWordpressService(config, resolver)
 }
 
-func cleanStaleCookies(config *Config) error {
-	path, err := config.Config.ConfigPath()
-	if err != nil {
-		return err
-	}
-
-	_ = os.Remove(filepath.Join(path, client.CookieFile))
-	return nil
-}
-
 func tianlangLinkResolver(config *Config, c *client.Client, id int64) (map[driver.Source]wordpress.ShareLink, error) {
 	resp, err := c.R().
 		SetPathParam("id", strconv.FormatInt(id, 10)).