refactor: extract common fetcher creating logic.

bookstairs · Nov 15, 2022 · 6d7677b · 6d7677b
1 parent 1c885da
commit 6d7677b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 61 deletions.
diff --git a/cmd/sanqiu.go b/cmd/sanqiu.go
@@ -4,7 +4,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/bookstairs/bookhunter/internal/argument"
-	"github.com/bookstairs/bookhunter/internal/client"
 	"github.com/bookstairs/bookhunter/internal/fetcher"
 	"github.com/bookstairs/bookhunter/internal/log"
 )
@@ -40,25 +39,12 @@ var sanqiuCmd = &cobra.Command{
 			Row("Aliyun RefreshToken", "******").
 			Print()
 
-		// Create the fetcher config.
-		cc, err := client.NewConfig(sanqiuWebsite, argument.UserAgent, argument.Proxy, argument.ConfigRoot)
-		log.Fatal(err)
-		fs, err := fetcher.ParseFormats(argument.Formats)
-		log.Fatal(err)
+		// Set the fetcher config.
+		argument.Website = sanqiuWebsite
 
 		// Create the fetcher.
-		f, err := fetcher.New(&fetcher.Config{
-			Config:        cc,
-			Category:      fetcher.SanQiu,
-			Formats:       fs,
-			Extract:       argument.Extract,
-			DownloadPath:  argument.DownloadPath,
-			InitialBookID: argument.InitialBookID,
-			Rename:        argument.Rename,
-			Thread:        argument.Thread,
-			Properties: map[string]string{
-				"refreshToken": argument.RefreshToken,
-			},
+		f, err := argument.NewFetcher(fetcher.SanQiu, map[string]string{
+			"refreshToken": argument.RefreshToken,
 		})
 		log.Fatal(err)
 

diff --git a/cmd/talebook/download.go b/cmd/talebook/download.go
@@ -4,7 +4,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/bookstairs/bookhunter/internal/argument"
-	"github.com/bookstairs/bookhunter/internal/client"
 	"github.com/bookstairs/bookhunter/internal/fetcher"
 	"github.com/bookstairs/bookhunter/internal/log"
 )
@@ -31,25 +30,10 @@ var DownloadCmd = &cobra.Command{
 			Row("Thread", argument.Thread).
 			Print()
 
-		// Create the fetcher config.
-		cc, err := client.NewConfig(argument.Website, argument.UserAgent, argument.Proxy, argument.ConfigRoot)
-		log.Fatal(err)
-		fs, err := fetcher.ParseFormats(argument.Formats)
-		log.Fatal(err)
-
 		// Create the fetcher.
-		f, err := fetcher.New(&fetcher.Config{
-			Config:        cc,
-			Category:      fetcher.Talebook,
-			Formats:       fs,
-			DownloadPath:  argument.DownloadPath,
-			InitialBookID: argument.InitialBookID,
-			Rename:        argument.Rename,
-			Thread:        argument.Thread,
-			Properties: map[string]string{
-				"username": argument.Username,
-				"password": argument.Password,
-			},
+		f, err := argument.NewFetcher(fetcher.Talebook, map[string]string{
+			"username": argument.Username,
+			"password": argument.Password,
 		})
 		log.Fatal(err)
 

diff --git a/cmd/telegram.go b/cmd/telegram.go
@@ -8,7 +8,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/bookstairs/bookhunter/internal/argument"
-	"github.com/bookstairs/bookhunter/internal/client"
 	"github.com/bookstairs/bookhunter/internal/fetcher"
 	"github.com/bookstairs/bookhunter/internal/log"
 )
@@ -55,29 +54,13 @@ var telegramCmd = &cobra.Command{
 			Row("Thread", argument.Thread).
 			Print()
 
-		// Create the fetcher config.
-		cc, err := client.NewConfig(argument.Website, argument.UserAgent, argument.Proxy, argument.ConfigRoot)
-		log.Fatal(err)
-		fs, err := fetcher.ParseFormats(argument.Formats)
-		log.Fatal(err)
-
 		// Create the fetcher.
-		f, err := fetcher.New(&fetcher.Config{
-			Config:        cc,
-			Category:      fetcher.Telegram,
-			Formats:       fs,
-			Extract:       argument.Extract,
-			DownloadPath:  argument.DownloadPath,
-			InitialBookID: argument.InitialBookID,
-			Rename:        argument.Rename,
-			Thread:        argument.Thread,
-			Properties: map[string]string{
-				"channelID": argument.ChannelID,
-				"mobile":    argument.Mobile,
-				"reLogin":   strconv.FormatBool(argument.ReLogin),
-				"appID":     strconv.FormatInt(argument.AppID, 10),
-				"appHash":   argument.AppHash,
-			},
+		f, err := argument.NewFetcher(fetcher.Telegram, map[string]string{
+			"channelID": argument.ChannelID,
+			"mobile":    argument.Mobile,
+			"reLogin":   strconv.FormatBool(argument.ReLogin),
+			"appID":     strconv.FormatInt(argument.AppID, 10),
+			"appHash":   argument.AppHash,
 		})
 		log.Fatal(err)
 

diff --git a/internal/argument/arguments.go b/internal/argument/arguments.go
@@ -1,6 +1,9 @@
 package argument
 
-import "github.com/bookstairs/bookhunter/internal/fetcher"
+import (
+	"github.com/bookstairs/bookhunter/internal/client"
+	"github.com/bookstairs/bookhunter/internal/fetcher"
+)
 
 var (
 	// Flags for talebook registering.
@@ -37,3 +40,28 @@ var (
 	AppID     = int64(0)
 	AppHash   = ""
 )
+
+// NewFetcher will create the fetcher by the command line arguments.
+func NewFetcher(category fetcher.Category, properties map[string]string) (fetcher.Fetcher, error) {
+	cc, err := client.NewConfig(Website, UserAgent, Proxy, ConfigRoot)
+	if err != nil {
+		return nil, err
+	}
+
+	fs, err := fetcher.ParseFormats(Formats)
+	if err != nil {
+		return nil, err
+	}
+
+	return fetcher.New(&fetcher.Config{
+		Config:        cc,
+		Category:      category,
+		Formats:       fs,
+		Extract:       Extract,
+		DownloadPath:  DownloadPath,
+		InitialBookID: InitialBookID,
+		Rename:        Rename,
+		Thread:        Thread,
+		Properties:    properties,
+	})
+}