Merge branch 'dev' of https://github.com/LumePart/Explo into dev

Author: LumePart

.github/workflows/release.yml

@@ -39,6 +39,8 @@ jobs:
         goosarch:
           - 'linux/amd64'
           - 'linux/386'
+          - 'linux/arm64'
+          - 'linux/arm'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -110,7 +112,7 @@ jobs:
             ghcr.io/${{ env.REPO_LC }}:${{ github.ref_name }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/386
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
           build-args: |
             TARGETARCH
 
@@ -153,6 +155,6 @@ jobs:
           tags: ghcr.io/${{ env.REPO_LC }}:dev
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/386
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
           build-args: |
             TARGETARCH

src/downloader/downloader.go

@@ -1,14 +1,15 @@
 package downloader
 
 import (
+	"fmt"
+	"io"
+	"log"
 	"os"
 	"path"
-	"log"
-	"strings"
-	"regexp"
-	"fmt"
 	"path/filepath"
-	"io"
+	"regexp"
+	"strings"
+
 	"golang.org/x/sync/errgroup"
 
 	cfg "explo/src/config"
@@ -17,7 +18,7 @@ import (
 )
 
 type DownloadClient struct {
-	Cfg *cfg.DownloadConfig
+	Cfg         *cfg.DownloadConfig
 	Downloaders []Downloader
 }
 
@@ -27,7 +28,6 @@ type Downloader interface {
 	Monitor
 }
 
-
 func NewDownloader(cfg *cfg.DownloadConfig, httpClient *util.HttpClient) *DownloadClient { // get download services from config and append them to DownloadClient
 	var downloader []Downloader
 	for _, service := range cfg.Services {
@@ -44,32 +44,32 @@ func NewDownloader(cfg *cfg.DownloadConfig, httpClient *util.HttpClient) *Downlo
 	}
 
 	return &DownloadClient{
-		Cfg: cfg,
+		Cfg:         cfg,
 		Downloaders: downloader}
 }
 
-	func (c *DownloadClient) StartDownload(tracks *[]*models.Track) {
-		for _, d := range c.Downloaders {
-			var g errgroup.Group
-			g.SetLimit(5)
-			
-			for _, track := range *tracks {
-				if track.Present {
-					continue
+func (c *DownloadClient) StartDownload(tracks *[]*models.Track) {
+	for _, d := range c.Downloaders {
+		var g errgroup.Group
+		g.SetLimit(5)
+
+		for _, track := range *tracks {
+			if track.Present {
+				continue
+			}
+
+			g.Go(func() error {
+
+				if err := d.QueryTrack(track); err != nil {
+					log.Println(err.Error())
+					return nil
 				}
-					
-				g.Go(func() error {
-		
-					if err := d.QueryTrack(track); err != nil {
-						log.Println(err.Error())
-						return nil
-					}
-					if err := d.GetTrack(track); err != nil {
-						log.Println(err.Error())
-						return nil
-					}
+				if err := d.GetTrack(track); err != nil {
+					log.Println(err.Error())
 					return nil
-				})
+				}
+				return nil
+			})
 		}
 		if err := g.Wait(); err != nil {
 			return
@@ -93,7 +93,7 @@ func (c *DownloadClient) DeleteSongs() {
 	for _, entry := range entries {
 		if !(entry.IsDir()) {
 			err = os.Remove(path.Join(c.Cfg.DownloadDir, entry.Name()))
-			
+
 			if err != nil {
 				log.Printf("failed to remove file: %s", err.Error())
 			}
@@ -115,9 +115,9 @@ func filterTracks(tracks *[]*models.Track) { // only keep tracks that were downl
 func containsLower(str string, substr string) bool {
 
 	return strings.Contains(
-        strings.ToLower(str),
-        strings.ToLower(substr),
-    )
+		strings.ToLower(str),
+		strings.ToLower(substr),
+	)
 }
 
 func sanitizeName(s string) string { // return string with only letters and digits
@@ -132,7 +132,7 @@ func getFilename(title, artist string) string {
 	t := re.ReplaceAllString(title, "_")
 	a := re.ReplaceAllString(artist, "_")
 
-	return fmt.Sprintf("%s-%s",t,a)
+	return fmt.Sprintf("%s-%s", t, a)
 }
 
 func moveDownload(srcDir, destDir, trackPath, file string) error { // Move download from the source dir to the dest dir (download dir)
@@ -189,4 +189,4 @@ func moveDownload(srcDir, destDir, trackPath, file string) error { // Move downl
 	}
 
 	return nil
-}
+}

src/downloader/slskd.go

@@ -2,11 +2,11 @@ package downloader
 
 import (
 	"bytes" // Could be moved to util for all clients
+	"encoding/json"
 	"explo/src/config"
 	"explo/src/debug"
 	"explo/src/models"
 	"explo/src/util"
-	"encoding/json"
 	"fmt"
 	"log"
 	"path/filepath"
@@ -40,15 +40,15 @@ type SearchResults []struct {
 	Username          string `json:"username"`
 }
 type File struct {
-	BitRate   int             `json:"bitRate"`
-	BitDepth  int             `json:"bitDepth"`
-	Code      int             `json:"code"`
-	Extension string          `json:"extension"`
-	Name      string		  `json:"filename"`
-	Length    int             `json:"length"`
-	Size      int             `json:"size"`
-	IsLocked  bool            `json:"isLocked"`
-	Username  string          // Save user from SearchResults to here during collection
+	BitRate   int    `json:"bitRate"`
+	BitDepth  int    `json:"bitDepth"`
+	Code      int    `json:"code"`
+	Extension string `json:"extension"`
+	Name      string `json:"filename"`
+	Length    int    `json:"length"`
+	Size      int    `json:"size"`
+	IsLocked  bool   `json:"isLocked"`
+	Username  string // Save user from SearchResults to here during collection
 }
 
 type DownloadPayload struct {
@@ -94,16 +94,16 @@ type DownloadMonitor struct {
 }
 
 type Slskd struct {
-	Headers    map[string]string
-	HttpClient *util.HttpClient
+	Headers     map[string]string
+	HttpClient  *util.HttpClient
 	DownloadDir string
-	Cfg        config.Slskd
+	Cfg         config.Slskd
 }
 
 func NewSlskd(cfg config.Slskd, downloadDir string) *Slskd {
 	return &Slskd{Cfg: cfg,
-		HttpClient: util.NewHttp(util.HttpClientConfig{Timeout: cfg.Timeout}),
-		DownloadDir: downloadDir,}
+		HttpClient:  util.NewHttp(util.HttpClientConfig{Timeout: cfg.Timeout}),
+		DownloadDir: downloadDir}
 }
 
 func (c *Slskd) AddHeader() {
@@ -315,7 +315,7 @@ func (c Slskd) queueDownload(files []File, track *models.Track) error {
 		payload := []DownloadPayload{
 			{
 				Filename: file.Name,
-				Size: file.Size,
+				Size:     file.Size,
 			},
 		}
 
@@ -332,7 +332,7 @@ func (c Slskd) queueDownload(files []File, track *models.Track) error {
 			return nil
 		}
 
-		log.Printf("[%d/%d] failed to queue download for '%s - %s': %s", i + 1, len(files), track.CleanTitle, track.Artist, err.Error())
+		log.Printf("[%d/%d] failed to queue download for '%s - %s': %s", i+1, len(files), track.CleanTitle, track.Artist, err.Error())
 		continue
 	}
 	if err := c.deleteSearch(track.ID); err != nil {
@@ -412,4 +412,4 @@ func parsePath(p string) (string, string) { // parse filepath to downloaded form
 	p = strings.ReplaceAll(p, `\`, `/`)
 	return filepath.Base(p), filepath.Base(filepath.Dir(p))
 
-}
+}