- Add shinning UI

- Revamp deployment process
- Fix Alldebrid file node bug

pkg/debrid/alldebrid.go

@@ -3,8 +3,8 @@ package debrid
 import (
 	"encoding/json"
 	"fmt"
-	"goBlack/common"
-	"goBlack/pkg/debrid/structs"
+	"github.com/sirrobot01/debrid-blackhole/common"
+	"github.com/sirrobot01/debrid-blackhole/pkg/debrid/structs"
 	"log"
 	"net/http"
 	gourl "net/url"
@@ -82,6 +82,42 @@ func getAlldebridStatus(statusCode int) string {
 	}
 }
 
+func flattenFiles(files []structs.AllDebridMagnetFile, parentPath string, index *int) []TorrentFile {
+	result := make([]TorrentFile, 0)
+
+	for _, f := range files {
+		currentPath := f.Name
+		if parentPath != "" {
+			currentPath = filepath.Join(parentPath, f.Name)
+		}
+
+		if f.Elements != nil {
+			// This is a folder, recurse into it
+			result = append(result, flattenFiles(f.Elements, currentPath, index)...)
+		} else {
+			// This is a file
+			fileName := filepath.Base(f.Name)
+			if common.RegexMatch(common.SAMPLEMATCH, fileName) {
+				continue
+			}
+			if !common.RegexMatch(common.VIDEOMATCH, fileName) && !common.RegexMatch(common.MUSICMATCH, fileName) {
+				continue
+			}
+
+			*index++
+			file := TorrentFile{
+				Id:   strconv.Itoa(*index),
+				Name: fileName,
+				Size: f.Size,
+				Path: currentPath,
+			}
+			result = append(result, file)
+		}
+	}
+
+	return result
+}
+
 func (r *AllDebrid) GetTorrent(id string) (*Torrent, error) {
 	torrent := &Torrent{}
 	url := fmt.Sprintf("%s/magnet/status?id=%s", r.Host, id)
@@ -108,24 +144,8 @@ func (r *AllDebrid) GetTorrent(id string) (*Torrent, error) {
 	torrent.Seeders = data.Seeders
 	torrent.Filename = name
 	torrent.OriginalFilename = name
-	files := make([]TorrentFile, 0)
-	for index, f := range data.Files {
-		fileName := filepath.Base(f.Name)
-		if common.RegexMatch(common.SAMPLEMATCH, fileName) {
-			// Skip sample files
-			continue
-		}
-		if !common.RegexMatch(common.VIDEOMATCH, fileName) && !common.RegexMatch(common.MUSICMATCH, fileName) {
-			continue
-		}
-		file := TorrentFile{
-			Id:   strconv.Itoa(index),
-			Name: fileName,
-			Size: f.Size,
-			Path: fileName,
-		}
-		files = append(files, file)
-	}
+	index := -1
+	files := flattenFiles(data.Files, "", &index)
 	parentFolder := data.Filename
 
 	if data.NbLinks == 1 {

pkg/debrid/debrid.go

@@ -3,8 +3,8 @@ package debrid
 import (
 	"fmt"
 	"github.com/anacrolix/torrent/metainfo"
-	"goBlack/common"
-	"goBlack/pkg/arr"
+	"github.com/sirrobot01/debrid-blackhole/common"
+	"github.com/sirrobot01/debrid-blackhole/pkg/arr"
 	"log"
 	"path/filepath"
 )

pkg/debrid/debrid_link.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"goBlack/common"
-	"goBlack/pkg/debrid/structs"
+	"github.com/sirrobot01/debrid-blackhole/common"
+	"github.com/sirrobot01/debrid-blackhole/pkg/debrid/structs"
 	"log"
 	"net/http"
 	"os"

pkg/debrid/realdebrid.go

@@ -3,8 +3,8 @@ package debrid
 import (
 	"encoding/json"
 	"fmt"
-	"goBlack/common"
-	"goBlack/pkg/debrid/structs"
+	"github.com/sirrobot01/debrid-blackhole/common"
+	"github.com/sirrobot01/debrid-blackhole/pkg/debrid/structs"
 	"log"
 	"net/http"
 	gourl "net/url"

pkg/debrid/structs/alldebrid.go

@@ -5,29 +5,31 @@ type errorResponse struct {
 	Message string `json:"message"`
 }
 
+type AllDebridMagnetFile struct {
+	Name     string                `json:"n"`
+	Size     int64                 `json:"s"`
+	Link     string                `json:"l"`
+	Elements []AllDebridMagnetFile `json:"e"`
+}
 type magnetInfo struct {
-	Id             int    `json:"id"`
-	Filename       string `json:"filename"`
-	Size           int64  `json:"size"`
-	Hash           string `json:"hash"`
-	Status         string `json:"status"`
-	StatusCode     int    `json:"statusCode"`
-	UploadDate     int    `json:"uploadDate"`
-	Downloaded     int64  `json:"downloaded"`
-	Uploaded       int64  `json:"uploaded"`
-	DownloadSpeed  int    `json:"downloadSpeed"`
-	UploadSpeed    int    `json:"uploadSpeed"`
-	Seeders        int    `json:"seeders"`
-	CompletionDate int    `json:"completionDate"`
-	Type           string `json:"type"`
-	Notified       bool   `json:"notified"`
-	Version        int    `json:"version"`
-	NbLinks        int    `json:"nbLinks"`
-	Files          []struct {
-		Name string `json:"n"`
-		Size int64  `json:"s"`
-		Link string `json:"l"`
-	} `json:"files"`
+	Id             int                   `json:"id"`
+	Filename       string                `json:"filename"`
+	Size           int64                 `json:"size"`
+	Hash           string                `json:"hash"`
+	Status         string                `json:"status"`
+	StatusCode     int                   `json:"statusCode"`
+	UploadDate     int                   `json:"uploadDate"`
+	Downloaded     int64                 `json:"downloaded"`
+	Uploaded       int64                 `json:"uploaded"`
+	DownloadSpeed  int                   `json:"downloadSpeed"`
+	UploadSpeed    int                   `json:"uploadSpeed"`
+	Seeders        int                   `json:"seeders"`
+	CompletionDate int                   `json:"completionDate"`
+	Type           string                `json:"type"`
+	Notified       bool                  `json:"notified"`
+	Version        int                   `json:"version"`
+	NbLinks        int                   `json:"nbLinks"`
+	Files          []AllDebridMagnetFile `json:"files"`
 }
 
 type AllDebridTorrentInfoResponse struct {

pkg/debrid/torbox.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"goBlack/common"
-	"goBlack/pkg/debrid/structs"
+	"github.com/sirrobot01/debrid-blackhole/common"
+	"github.com/sirrobot01/debrid-blackhole/pkg/debrid/structs"
 	"log"
 	"mime/multipart"
 	"net/http"

pkg/debrid/torrent.go

@@ -2,8 +2,8 @@ package debrid
 
 import (
 	"fmt"
-	"goBlack/common"
-	"goBlack/pkg/arr"
+	"github.com/sirrobot01/debrid-blackhole/common"
+	"github.com/sirrobot01/debrid-blackhole/pkg/arr"
 	"os"
 	"path/filepath"
 )