chore(updater): move updater packages to pkg/updaters/<name>

internal/models/servers.go

@@ -9,11 +9,12 @@ import (
 	"sort"
 
 	"github.com/qdm12/gluetun/internal/constants/providers"
+	"github.com/qdm12/gluetun/pkg/updaters/models"
 )
 
 type AllServers struct {
 	Version           uint16 // used for migration of the top level scheme
-	ProviderToServers map[string]Servers
+	ProviderToServers map[string]models.Servers
 }
 
 var _ json.Marshaler = (*AllServers)(nil)
@@ -110,7 +111,7 @@ func (a *AllServers) UnmarshalJSON(data []byte) (err error) {
 		return nil
 	}
 
-	a.ProviderToServers = make(map[string]Servers, len(keyValues))
+	a.ProviderToServers = make(map[string]models.Servers, len(keyValues))
 
 	allProviders := providers.All()
 	allProvidersSet := make(map[string]struct{}, len(allProviders))
@@ -131,7 +132,7 @@ func (a *AllServers) UnmarshalJSON(data []byte) (err error) {
 				key, err)
 		}
 
-		var servers Servers
+		var servers models.Servers
 		err = json.Unmarshal(jsonValue, &servers)
 		if err != nil {
 			return fmt.Errorf("decoding %s servers: %w",
@@ -151,24 +152,18 @@ func (a *AllServers) Count() (count int) {
 	return count
 }
 
-type Servers struct {
-	Version   uint16   `json:"version"`
-	Timestamp int64    `json:"timestamp"`
-	Servers   []Server `json:"servers,omitempty"`
-}
-
-func (s *Servers) Format(vpnProvider, format string) (formatted string, err error) {
+func FormatServers(s models.Servers, vpnProvider, format string) (formatted string, err error) {
 	switch format {
 	case "markdown":
-		return s.toMarkdown(vpnProvider)
+		return serversToMarkdown(s, vpnProvider)
 	case "json":
-		return s.toJSON()
+		return serversToJSON(s)
 	default:
 		return "", fmt.Errorf("servers format not supported: %s", format)
 	}
 }
 
-func (s *Servers) toJSON() (formatted string, err error) {
+func serversToJSON(s models.Servers) (formatted string, err error) {
 	buffer := bytes.NewBuffer(nil)
 	encoder := json.NewEncoder(buffer)
 	encoder.SetIndent("", "  ")