feat: refactoring progress

Author: leonidboykov

.editorconfig

@@ -1,23 +1,23 @@
-# http://editorconfig.org
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[{*.go,go.mod}]
-indent_style = tab
-indent_size = 4
-
-[*.md]
-trim_trailing_whitespace = false
-indent_size = 4
-
-[Makefile]
-indent_style = tab
-indent_size = 8
+# EditorConfig is awesome: https://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.go,go.mod}]
+indent_style = tab
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+indent_size = 8

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 Leonid Boykov
+Copyright (c) 2017-2021 Leonid Boykov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -63,3 +63,11 @@ Custom boorus are not available yet.
 ## License
 
 `getmoe` is a free software licensed under the [MIT](LICENSE) license.
+
+
+# TODO
+
+  * Re-implement old sankaku (for idol.sankakucomplex.com)
+  * Gelbooru
+  * Danbooru
+  * Shimmie 2

board.go

@@ -1,78 +1,33 @@
 package getmoe
 
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"time"
-)
-
 // Board holds data for API access.
 type Board struct {
-	Provider   Provider
-	httpClient *http.Client
+	name     string
+	provider Provider
 }
 
-// NewBoard creates a new board with provided configuration.
-func NewBoard(providerName string, config BoardConfiguration) (*Board, error) {
-	providersMu.RLock()
-	provider, ok := providers[providerName]
-	providersMu.RUnlock()
-	if !ok {
-		return nil, fmt.Errorf("getmoe: unknown provider %s", providerName)
+// NewBoard creates a new Board.
+func NewBoard(name string, config BoardConfiguration) (Board, error) {
+	if err := applySettings(config.Settings, &config.Provider); err != nil {
+		return Board{}, err
 	}
 
-	provider.New(config.Provider)
-	return &Board{
-		Provider: provider,
-		httpClient: &http.Client{
-			Timeout: 10 * time.Second,
-		},
-	}, nil
-}
-
-// NewBoardWithProvider creates a new board with provided configuration.
-func NewBoardWithProvider(provider Provider) *Board {
-	return &Board{
-		Provider: provider,
-		httpClient: &http.Client{
-			Timeout: 10 * time.Second,
-		},
-	}
-}
-
-// Request gets images by tags.
-func (b *Board) Request() ([]Post, error) {
-	req, err := b.Provider.PageRequest()
+	provider, err := NewProvider(config.Provider.Name, config.Provider)
 	if err != nil {
-		return nil, err
+		return Board{}, err
 	}
 
-	resp, err := b.httpClient.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	page, err := b.Provider.Parse(body)
-	if err != nil {
-		return nil, err
-	}
-
-	return page, nil
+	return Board{
+		name:     name,
+		provider: provider,
+	}, nil
 }
 
-// RequestAll checks all pages.
 func (b *Board) RequestAll() ([]Post, error) {
 	var pages []Post
+	currentPage := 1
 	for {
-		b.Provider.NextPage()
-		page, err := b.Request()
+		page, err := b.provider.RequestPage([]string{"test"}, currentPage)
 		if err != nil {
 			return pages, err
 		}

boardmanager.go

@@ -0,0 +1,21 @@
+package getmoe
+
+import "fmt"
+
+type BoardManager struct {
+	Boards []Board
+}
+
+func LoadBoards(config map[string]BoardConfiguration) (BoardManager, error) {
+	m := BoardManager{}
+
+	for name, board := range config {
+		b, err := NewBoard(name, board)
+		if err != nil {
+			return BoardManager{}, fmt.Errorf("getmoe: unable to create board '%s': %s", name, err)
+		}
+		m.Boards = append(m.Boards, b)
+	}
+
+	return m, nil
+}

boards.yaml

@@ -0,0 +1,15 @@
+yande.re:
+  provider: moebooru
+  url: https://yande.re
+  password_salt: choujin-steiner--%s--
+konachan.com:
+  provider: moebooru
+  url: https://konachan.com
+  password_salt: So-I-Heard-You-Like-Mupkids-?--%s--
+
+chan.sankakucomplex.com:
+  provider: sankaku2
+  url: https://capi-v2.sankakucomplex.com
+idol.sankakucomplex.com:
+  provider: sankaku
+  url: https://iapi.sankakucomplex.com

cmd/getmoe/get.go

@@ -1,86 +1,8 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/urfave/cli"
-
-	"github.com/leonidboykov/getmoe"
-	"github.com/leonidboykov/getmoe/internal/helper"
-	"github.com/leonidboykov/getmoe/provider"
-)
-
-var getCommand = cli.Command{
-	Name:   "get",
-	Usage:  "get data from booru",
-	Action: getAction,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "from",
-			Usage: "source booru (config file is not implemented yet)",
-		},
-		cli.StringFlag{
-			Name:  "to",
-			Usage: "destination folder",
-		},
-		cli.StringSliceFlag{
-			Name:  "tags",
-			Usage: "Tags",
-		},
-		cli.StringFlag{
-			Name:  "login, l",
-			Usage: "login for booru",
-		},
-		cli.StringFlag{
-			Name:  "password, p",
-			Usage: "password for booru",
-		},
-	},
-}
-
-func getAction(ctx *cli.Context) error {
-	srcFlag := ctx.String("from")
-	dstFlag := ctx.String("to")
-	tagFlag := ctx.StringSlice("tags")
-	loginFlag := ctx.String("login")
-	passwordFlag := ctx.String("password")
-	quietFlag := ctx.GlobalBool("quiet")
-
-	board, ok := provider.AvailableBoards[srcFlag]
-	if !ok {
-		fmt.Printf("There is no %s source specified\n", srcFlag)
-		os.Exit(1)
-	}
-
-	board.Provider.Auth(getmoe.AuthConfiguration{
-		Login:    loginFlag,
-		Password: passwordFlag,
-	})
-
-	board.Provider.BuildRequest(getmoe.RequestConfiguration{
-		Tags: tagFlag,
-	})
-
-	posts, err := board.RequestAll()
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	return saveImage(posts, dstFlag, quietFlag)
-}
-
-func saveImage(posts []getmoe.Post, saveDir string, quiet bool) error {
-	for _, p := range posts {
-		os.MkdirAll(saveDir, os.ModePerm)
-		if err := p.Save(saveDir); err != nil {
-			return err
-		}
-
-		if !quiet {
-			fName, _ := helper.FileURLUnescape(p.FileURL)
-			fmt.Println("Getting", fName[:32], "...")
-		}
-	}
-	return nil
-}
+package main
+
+import "github.com/urfave/cli/v2"
+
+var getCommand = cli.Command{
+	Name:  "get",
+	Usage: "get data from booru",
+}

cmd/getmoe/main.go

@@ -4,36 +4,23 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/urfave/cli"
-)
-
-var (
-	version = "master"
-	commit  = "none"
-	date    = "unknown"
+	"github.com/urfave/cli/v2"
 )
 
 func main() {
-	app := cli.NewApp()
-	app.Name = "getmoe"
-	app.Usage = "cli tool for boorus"
-	app.Version = version
-	app.Authors = []cli.Author{{
-		Name:  "Leonid Boykov",
-		Email: "[email protected]",
-	}}
-	app.Flags = []cli.Flag{
-		cli.BoolFlag{
-			Name:  "quiet, q",
-			Usage: "disable progress bar",
+	app := &cli.App{
+		Name:    "getmoe",
+		Usage:   `cli tool for boorus`,
+		Version: version,
+		Commands: []*cli.Command{
+			&getCommand,
 		},
-	}
-	app.Commands = []cli.Command{
-		getCommand,
+		Flags:  rootFlags,
+		Action: rootAction,
 	}
 
 	if err := app.Run(os.Args); err != nil {
-		fmt.Println(err)
+		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
 }

cmd/getmoe/root.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/leonidboykov/getmoe"
+	_ "github.com/leonidboykov/getmoe/provider/danbooru"
+	_ "github.com/leonidboykov/getmoe/provider/gelbooru"
+	_ "github.com/leonidboykov/getmoe/provider/moebooru"
+	_ "github.com/leonidboykov/getmoe/provider/sankaku"
+)
+
+var rootFlags = []cli.Flag{
+	&cli.StringFlag{
+		Name:    "config",
+		Aliases: []string{"c"},
+		Usage:   "override config file name",
+		Value:   "getmoe.yaml",
+	},
+}
+
+func rootAction(ctx *cli.Context) error {
+	configFlag := ctx.String("config")
+	config, err := getmoe.ReadConfiguraton(configFlag)
+	if err != nil {
+		return err
+	}
+
+	for boardName, board := range config.Boards {
+		fmt.Println(boardName, board.Provider.Name)
+	}
+
+	boards, err := getmoe.LoadBoards(config.Boards)
+	_ = boards
+
+	return nil
+}

cmd/getmoe/version.go

@@ -0,0 +1,9 @@
+package main
+
+var (
+	version = "master"
+	commit  = "none"
+	data    = "unknown"
+)
+
+// TODO: Add `version` command.