refactor: imports

cache/cache.go

@@ -3,11 +3,12 @@ package cache
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/dgraph-io/badger/v3"
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/lefelys/state"
 	"github.com/rs/zerolog"
-	"time"
 )
 
 type Client struct {

cache/delete.go

@@ -2,6 +2,7 @@ package cache
 
 import (
 	"fmt"
+
 	"github.com/dgraph-io/badger/v3"
 )
 

cache/delete_test.go

@@ -1,8 +1,9 @@
 package cache
 
 import (
-	"github.com/rs/zerolog"
 	"testing"
+
+	"github.com/rs/zerolog"
 )
 
 func TestClient_Delete(t *testing.T) {

cache/get.go

@@ -2,6 +2,7 @@ package cache
 
 import (
 	"fmt"
+
 	"github.com/dgraph-io/badger/v3"
 )
 

cache/get_test.go

@@ -1,10 +1,11 @@
 package cache
 
 import (
-	"github.com/rs/zerolog"
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/rs/zerolog"
 )
 
 func TestClient_Get(t *testing.T) {

cache/put.go

@@ -2,8 +2,9 @@ package cache
 
 import (
 	"fmt"
-	"github.com/dgraph-io/badger/v3"
 	"time"
+
+	"github.com/dgraph-io/badger/v3"
 )
 
 func (c *Client) Put(bucket string, key string, val []byte, ttl time.Duration) error {

cache/put_test.go

@@ -1,10 +1,11 @@
 package cache
 
 import (
-	"github.com/rs/zerolog"
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/rs/zerolog"
 )
 
 func TestClient_Put(t *testing.T) {

cache/test.go

@@ -1,8 +1,9 @@
 package cache
 
 import (
-	"github.com/dgraph-io/badger/v3"
 	"testing"
+
+	"github.com/dgraph-io/badger/v3"
 )
 
 func newDb(t *testing.T) *badger.DB {

cmd/nabarr/config.go

@@ -3,10 +3,11 @@
 package main
 
 import (
-	"github.com/kirsle/configdir"
-	"golang.org/x/sys/unix"
 	"os"
 	"path/filepath"
+
+	"github.com/kirsle/configdir"
+	"golang.org/x/sys/unix"
 )
 
 func defaultConfigPath() string {

cmd/nabarr/config_windows.go

@@ -3,9 +3,10 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/kirsle/configdir"
 	"os"
 	"path/filepath"
+
+	"github.com/kirsle/configdir"
 )
 
 func defaultConfigPath() string {

cmd/nabarr/main.go

@@ -3,6 +3,12 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
 	"github.com/alecthomas/kong"
 	"github.com/goccy/go-yaml"
 	"github.com/l3uddz/nabarr"
@@ -15,11 +21,6 @@ import (
 	"github.com/natefinch/lumberjack"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 type config struct {

cmd/nabarr/pvr/pvr.go

@@ -2,13 +2,14 @@ package pvr
 
 import (
 	"errors"
+	"strings"
+
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/cache"
 	"github.com/l3uddz/nabarr/media"
 	"github.com/l3uddz/nabarr/radarr"
 	"github.com/l3uddz/nabarr/sonarr"
 	"github.com/lefelys/state"
-	"strings"
 )
 
 type PVR interface {

cmd/nabarr/shutdown.go

@@ -1,10 +1,11 @@
 package main
 
 import (
-	"github.com/rs/zerolog/log"
 	"os"
 	"os/signal"
 	"syscall"
+
+	"github.com/rs/zerolog/log"
 )
 
 func waitShutdown() {

cmd/nabarr/update.go

@@ -3,11 +3,12 @@ package main
 import (
 	"bufio"
 	"fmt"
+	"os"
+
 	"github.com/alecthomas/kong"
 	"github.com/blang/semver"
 	"github.com/l3uddz/nabarr/build"
 	"github.com/rhysd/go-github-selfupdate/selfupdate"
-	"os"
 )
 
 type updateFlag string

cmd/nabarr/version.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/alecthomas/kong"
 )
 

go.sum

@@ -356,7 +356,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220401154927-543a649e0bdd h1:zYlwaUHTmxuf6H7hwO2dgwqozQmH7zf4x+/qql4oVWc=
 golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=

media/client.go

@@ -2,6 +2,7 @@ package media
 
 import (
 	"fmt"
+
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/l3uddz/nabarr/media/omdb"
 	"github.com/l3uddz/nabarr/media/trakt"

media/movie.go

@@ -3,9 +3,10 @@ package media
 import (
 	"errors"
 	"fmt"
-	"github.com/l3uddz/nabarr/media/trakt"
 	"strconv"
 	"time"
+
+	"github.com/l3uddz/nabarr/media/trakt"
 )
 
 func (c *Client) GetMovieInfo(item *FeedItem) (*Item, error) {

media/omdb/media.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/l3uddz/nabarr/util"
-	"github.com/lucperkins/rek"
 	"net/url"
 	"strings"
+
+	"github.com/l3uddz/nabarr/util"
+	"github.com/lucperkins/rek"
 )
 
 var (

media/omdb/omdb.go

@@ -1,12 +1,13 @@
 package omdb
 
 import (
+	"net/http"
+	"time"
+
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/rs/zerolog"
 	"go.uber.org/ratelimit"
-	"net/http"
-	"time"
 )
 
 type Client struct {

media/show.go

@@ -3,8 +3,9 @@ package media
 import (
 	"errors"
 	"fmt"
-	"github.com/l3uddz/nabarr/media/trakt"
 	"strconv"
+
+	"github.com/l3uddz/nabarr/media/trakt"
 )
 
 func (c *Client) GetShowInfo(item *FeedItem) (*Item, error) {

media/struct.go

@@ -2,12 +2,13 @@ package media
 
 import (
 	"encoding/xml"
+	"strings"
+	"time"
+
 	"github.com/l3uddz/nabarr/media/omdb"
 	"github.com/l3uddz/nabarr/media/tvdb"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/pkg/errors"
-	"strings"
-	"time"
 )
 
 /* Media Item(s) */

media/trakt/media.go

@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/url"
+
 	"github.com/l3uddz/nabarr/util"
 	"github.com/lucperkins/rek"
-	"net/url"
 )
 
 var (

media/trakt/trakt.go

@@ -1,12 +1,13 @@
 package trakt
 
 import (
+	"net/http"
+	"time"
+
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/rs/zerolog"
 	"go.uber.org/ratelimit"
-	"net/http"
-	"time"
 )
 
 type Client struct {

media/tvdb/media.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	"github.com/l3uddz/nabarr/util"
 	"github.com/lucperkins/rek"
 )

media/tvdb/tvdb.go

@@ -2,12 +2,13 @@ package tvdb
 
 import (
 	"fmt"
+	"net/http"
+	"time"
+
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/rs/zerolog"
 	"go.uber.org/ratelimit"
-	"net/http"
-	"time"
 )
 
 type Client struct {

nabarr.go

@@ -1,9 +1,10 @@
 package nabarr
 
 import (
+	"time"
+
 	"github.com/antonmedv/expr/vm"
 	"github.com/l3uddz/nabarr/media"
-	"time"
 )
 
 type ExprProgram struct {

radarr/api.go

@@ -4,13 +4,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/url"
+	"strconv"
+	"strings"
+
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/media"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/lucperkins/rek"
-	"net/url"
-	"strconv"
-	"strings"
 )
 
 var (

radarr/expression.go

@@ -2,6 +2,7 @@ package radarr
 
 import (
 	"fmt"
+
 	"github.com/antonmedv/expr"
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/media"

radarr/queue.go

@@ -3,6 +3,7 @@ package radarr
 import (
 	"errors"
 	"fmt"
+
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/media"
 	"github.com/lefelys/state"

radarr/radarr.go

@@ -2,15 +2,16 @@ package radarr
 
 import (
 	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/cache"
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/l3uddz/nabarr/media"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/rs/zerolog"
-	"net/http"
-	"strings"
-	"time"
 )
 
 type Client struct {

rss/job.go

@@ -2,10 +2,11 @@ package rss
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/l3uddz/nabarr/cmd/nabarr/pvr"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/robfig/cron/v3"
-	"time"
 )
 
 func (c *Client) AddJob(feed feedItem) error {

rss/process.go

@@ -3,11 +3,12 @@ package rss
 import (
 	"encoding/xml"
 	"fmt"
+	"sort"
+	"strings"
+
 	"github.com/l3uddz/nabarr/media"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/lucperkins/rek"
-	"sort"
-	"strings"
 )
 
 func (j *rssJob) process() error {

rss/rss.go

@@ -1,13 +1,14 @@
 package rss
 
 import (
+	"time"
+
 	"github.com/l3uddz/nabarr/cache"
 	"github.com/l3uddz/nabarr/cmd/nabarr/pvr"
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/lefelys/state"
 	"github.com/robfig/cron/v3"
 	"github.com/rs/zerolog"
-	"time"
 )
 
 type Client struct {

rss/struct.go

@@ -1,12 +1,13 @@
 package rss
 
 import (
+	"net/http"
+	"time"
+
 	"github.com/l3uddz/nabarr/cache"
 	"github.com/l3uddz/nabarr/cmd/nabarr/pvr"
 	"github.com/robfig/cron/v3"
 	"github.com/rs/zerolog"
-	"net/http"
-	"time"
 )
 
 type feedItem struct {

sonarr/api.go

@@ -4,13 +4,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/url"
+	"strconv"
+	"strings"
+
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/media"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/lucperkins/rek"
-	"net/url"
-	"strconv"
-	"strings"
 )
 
 var (

sonarr/expression.go

@@ -2,6 +2,7 @@ package sonarr
 
 import (
 	"fmt"
+
 	"github.com/antonmedv/expr"
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/media"

sonarr/queue.go

@@ -3,11 +3,12 @@ package sonarr
 import (
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/media"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/lefelys/state"
-	"strings"
 )
 
 func (c *Client) QueueFeedItem(item *media.FeedItem) {

sonarr/sonarr.go

@@ -2,15 +2,16 @@ package sonarr
 
 import (
 	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
 	"github.com/l3uddz/nabarr"
 	"github.com/l3uddz/nabarr/cache"
 	"github.com/l3uddz/nabarr/logger"
 	"github.com/l3uddz/nabarr/media"
 	"github.com/l3uddz/nabarr/util"
 	"github.com/rs/zerolog"
-	"net/http"
-	"strings"
-	"time"
 )
 
 type Client struct {

util/http.go

@@ -1,12 +1,13 @@
 package util
 
 import (
+	"net/http"
+	"time"
+
 	"github.com/hashicorp/go-retryablehttp"
 	"github.com/l3uddz/nabarr/build"
 	"github.com/rs/zerolog"
 	"go.uber.org/ratelimit"
-	"net/http"
-	"time"
 )
 
 func NewRetryableHttpClient(timeout time.Duration, rl ratelimit.Limiter, log *zerolog.Logger) *http.Client {