Chore: subtle engine init change (#122)

metatube-community · Oct 3, 2024 · d042374 · d042374
1 parent 590c788
commit d042374
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://img.shields.io/github/actions/workflow/status/metatube-community/metatube-sdk-go/docker.yml?branch=main&style=flat-square&logo=github-actions)](https:/metatube-community/metatube-sdk-go/actions/workflows/release.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/metatube-community/metatube-sdk-go?style=flat-square)](https:/metatube-community/metatube-sdk-go)
-[![Require Go Version](https://img.shields.io/badge/go-%3E%3D1.21-30dff3?style=flat-square&logo=go)](https:/metatube-community/metatube-sdk-go/blob/main/go.mod)
+[![Require Go Version](https://img.shields.io/badge/go-%3E%3D1.23-30dff3?style=flat-square&logo=go)](https:/metatube-community/metatube-sdk-go/blob/main/go.mod)
 [![GitHub License](https://img.shields.io/github/license/metatube-community/metatube-sdk-go?color=e4682a&logo=apache&style=flat-square)](https:/metatube-community/metatube-sdk-go/blob/main/LICENSE)
 [![Tag](https://img.shields.io/github/v/tag/metatube-community/metatube-sdk-go?color=%23ff8936&logo=fitbit&style=flat-square)](https:/metatube-community/metatube-sdk-go/tags)
 

diff --git a/engine/engine.go b/engine/engine.go
@@ -145,6 +145,4 @@ func (e *Engine) Fetch(url string, provider mt.Provider) (*http.Response, error)
 }
 
 // String returns the name of the Engine instance.
-func (e *Engine) String() string {
- return e.name
-}
+func (e *Engine) String() string { return e.name }
diff --git a/engine/init.go b/engine/init.go
@@ -5,7 +5,6 @@ import (
  "os"
  "strconv"
  "strings"
- "time"
 
  "github.com/metatube-community/metatube-sdk-go/common/fetch"
  mt "github.com/metatube-community/metatube-sdk-go/provider"
@@ -20,8 +19,8 @@ const (
 func (e *Engine) init() *Engine {
  e.initLogger()
  e.initFetcher()
- e.initActorProviders(e.timeout)
- e.initMovieProviders(e.timeout)
+ e.initActorProviders()
+ e.initMovieProviders()
  e.initAllProviderPriorities()
  return e
 }
@@ -63,15 +62,13 @@ func (e *Engine) initAllProviderPriorities() {
 }
 
 // initActorProviders initializes actor providers.
-func (e *Engine) initActorProviders(timeout time.Duration) {
- { // init
- e.actorProviders = make(map[string]mt.ActorProvider)
- e.actorHostProviders = make(map[string][]mt.ActorProvider)
- }
+func (e *Engine) initActorProviders() {
+ e.actorProviders = make(map[string]mt.ActorProvider)
+ e.actorHostProviders = make(map[string][]mt.ActorProvider)
  mt.RangeActorFactory(func(name string, factory mt.ActorFactory) {
  provider := factory()
  if s, ok := provider.(mt.RequestTimeoutSetter); ok {
- s.SetRequestTimeout(timeout)
+ s.SetRequestTimeout(e.timeout)
  }
  // Add actor provider by name.
  e.actorProviders[strings.ToUpper(name)] = provider
@@ -82,15 +79,13 @@ func (e *Engine) initActorProviders(timeout time.Duration) {
 }
 
 // initMovieProviders initializes movie providers.
-func (e *Engine) initMovieProviders(timeout time.Duration) {
- { // init
- e.movieProviders = make(map[string]mt.MovieProvider)
- e.movieHostProviders = make(map[string][]mt.MovieProvider)
- }
+func (e *Engine) initMovieProviders() {
+ e.movieProviders = make(map[string]mt.MovieProvider)
+ e.movieHostProviders = make(map[string][]mt.MovieProvider)
  mt.RangeMovieFactory(func(name string, factory mt.MovieFactory) {
  provider := factory()
  if s, ok := provider.(mt.RequestTimeoutSetter); ok {
- s.SetRequestTimeout(timeout)
+ s.SetRequestTimeout(e.timeout)
  }
  // Add movie provider by name.
  e.movieProviders[strings.ToUpper(name)] = provider

diff --git a/provider/internal/scraper/scraper.go b/provider/internal/scraper/scraper.go
@@ -18,21 +18,21 @@ var (
 // Scraper implements basic Provider interface.
 type Scraper struct {
  name string
- priority *atomic.Int64
  baseURL *url.URL
+ priority *atomic.Int64
  c *colly.Collector
 }
 
-// NewScraper returns Provider implemented *Scraper.
-func NewScraper(name, baseURL string, priority int, opts ...Option) *Scraper {
- u, err := url.Parse(baseURL)
+// NewScraper returns a *Scraper that implements provider.Provider .
+func NewScraper(name, base string, priority int, opts ...Option) *Scraper {
+ baseURL, err := url.Parse(base)
  if err != nil {
  panic(err)
  }
  s := &Scraper{
  name: name,
+ baseURL: baseURL,
  priority: atomic.NewInt64(int64(priority)),
- baseURL: u,
  c: colly.NewCollector(),
  }
  for _, opt := range opts {