test multi

cmd/main.go

@@ -0,0 +1,94 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"gitea.tbdevent.eu/ilbinek/reforger_utils"
+)
+
+const DEBUG = false
+
+func main() {
+	addonID := "61EB463A41FE5274"
+	version := "0.1.166"
+
+	assetsReply, err := reforger_utils.DoAssetsRequest(addonID, version)
+	if err != nil {
+		panic(err)
+	}
+
+	downloadDir := filepath.Join("downloads", addonID)
+	if DEBUG {
+		if err := os.MkdirAll(downloadDir, os.ModePerm); err != nil {
+			panic(err)
+		}
+	}
+
+	bytesReply, err := json.MarshalIndent(assetsReply, "", "  ")
+	if err != nil {
+		panic(err)
+	}
+
+	if DEBUG {
+		if err := os.WriteFile(filepath.Join(downloadDir, "assets.json"), bytesReply, os.ModePerm); err != nil {
+			panic(err)
+		}
+	}
+
+	for _, asset := range assetsReply {
+		for _, file := range asset.Files {
+			manifest, err := reforger_utils.GetManifest(file.ManifestPath)
+			if err != nil {
+				panic(err)
+			}
+
+			if DEBUG {
+				// save manifest
+				var manifestBuf bytes.Buffer
+				manifestEncoder := json.NewEncoder(&manifestBuf)
+				manifestEncoder.SetIndent("", "  ")
+				if err := manifestEncoder.Encode(manifest); err != nil {
+					panic(err)
+				}
+
+				if err := os.WriteFile(filepath.Join(downloadDir, file.Name+".manifest.json"), manifestBuf.Bytes(), os.ModePerm); err != nil {
+					panic(err)
+				}
+			}
+			
+			downedFile, err := reforger_utils.Download(manifest, downloadDir, file.Name)
+			if err != nil {
+				panic(err)
+			}
+			
+			fmt.Println("Downloaded", file.Name, len(downedFile), "bytes")
+
+			if file.Name[len(file.Name)-4:] != ".pak" {
+				continue
+			}
+
+			pakInfo, err := reforger_utils.GetPakFileInfo(&downedFile)
+			if err != nil {
+				panic(err)
+			}
+
+			for _, entry := range pakInfo {
+				fmt.Printf(" - %s (offset: %d, size: %d)\n", entry.Name, entry.Offset, entry.Size)
+				if DEBUG {
+					entryData := downedFile[entry.Offset : entry.Offset+entry.Size]
+					path := filepath.Join("downloads", addonID, "extracted", entry.Name)
+					if err := os.MkdirAll(filepath.Dir(path), os.ModePerm); err != nil {
+						panic(err)
+					}
+					if err := os.WriteFile(path, entryData, os.ModePerm); err != nil {
+						panic(err)
+					}
+				}
+			}
+		}
+	}
+}

structs.go

@@ -61,11 +61,13 @@ type Manifest struct {
 		Size    int    `json:"size"`
 		Offsets []int  `json:"offsets"`
 	} `json:"remainder"`
-	Fragments []struct {
+	Fragments []Fragment `json:"fragments"`
+}
+
+type Fragment struct {
 	Sha512  string `json:"sha512"`
 	Size    int    `json:"size"`
 	Offsets []int  `json:"offsets"`
-	} `json:"fragments"`
 }
 
 type RDBHeader struct {

util.go

@@ -9,9 +9,11 @@ import (
 	"path/filepath"
 	"slices"
 	"strings"
+	"sync"
 )
 
 var Debug = false
+var DownThreads = 8
 
 func DoAssetsRequest(addonID, version string) (AssetsReply, error) {
 	url := "https://api-ar-workshop.bistudio.com/workshop-api/api/v3.0/s2s/assets/download-list"
@@ -21,6 +23,12 @@ func DoAssetsRequest(addonID, version string) (AssetsReply, error) {
 		return AssetsReply{}, err
 	}
 
+	req.Header.Add("x-client-id", "$edb1b7862bba5cade1f6e06bfdeac2c")
+	req.Header.Add("x-client-secret", "$8b415ea2aa11bd51f2f5b5a9dcb8476")
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("user-agent", "Arma Reforger/1.4.0.53 (Headless; Windows)")
+	req.Header.Add("content-length", fmt.Sprintf("%d", len(body)))
+
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return AssetsReply{}, err
@@ -103,32 +111,76 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro
 	trackFrag := make([]Frag, 0)
 
 	// start downloading chunks
-	//currentOffset := 0
 	ret := make([]byte, manifest.Size)
 	totalMB := float32(manifest.Size) / 1024.0 / 1024.0
-	for _, fragment := range manifest.Fragments {
+
+	var wg sync.WaitGroup
+	var mu sync.Mutex
+
+	fragmentsChan := make(chan Fragment, len(manifest.Fragments))
+	errChan := make(chan error, DownThreads)
+
+	// Start worker goroutines
+	for i := 0; i < DownThreads; i++ {
+		wg.Go(func() {
+			for fragment := range fragmentsChan {
 				url := transformShaToURL(fragment.Sha512, fragment.Size)
 				content, err := getContent(url)
 				if err != nil {
-			return nil, err
+					// Handle error, maybe by sending it to an error channel
+					// For now, we'll just skip and print.
+					fmt.Printf("Error downloading fragment %s: %v\n", fragment.Sha512, err)
+					errChan <- err
 				}
-		downloaded += len(content) * len(fragment.Offsets)
+
+				mu.Lock()
+				// Safely write to the shared slice and update progress
 				for _, offset := range fragment.Offsets {
-			trackFrag = append(trackFrag, Frag{Offset: offset, Size: len(content)})
 					copy(ret[offset:offset+len(content)], content)
 				}
+				downloaded += len(content) * len(fragment.Offsets)
 
-		if Debug {
+				// Track downloaded fragments
-			// save fragment to file in the fragments/ directory
+				for _, offset := range fragment.Offsets {
-			if err := os.WriteFile(filepath.Join(downloadDir, "fragments", filen, fmt.Sprintf("%d.%s.%d.bytes", fragment.Offsets[0], fragment.Sha512, fragment.Size)), content, os.ModePerm); err != nil {
+					trackFrag = append(trackFrag, Frag{
-				return nil, err
+						Offset: offset,
-			}
+						Size:   len(content),
+					})
 				}
 
-		percent := float32(downloaded) / float32(manifest.Size) * 100.0
+				// Print progress
 				downedMB := float32(downloaded) / 1024.0 / 1024.0
-		fmt.Printf("\r\033[32mDownloaded\033[0m %fMB/%fMB (\033[36m%.2f%%\033[0m) of \033[33m%s\033[0m", downedMB, totalMB, percent, filen)
+				percent := float32(downloaded) / float32(manifest.Size) * 100.0
+				fmt.Printf("\r\033[32mDownloaded\033[0m %.2fMB/%.2fMB (\033[36m%.2f%%\033[0m) of \033[33m%s\033[0m", downedMB, totalMB, percent, filen)
+
+				mu.Unlock()
+
+				// The Debug section can be safely moved here as well
+				if os.Getenv("DEBUG") == "true" { // Using env var for a cleaner check
+					mu.Lock() // Re-lock for file write
+					if err := os.WriteFile(filepath.Join(downloadDir, "fragments", filen, fmt.Sprintf("%d.%s.%d.bytes", fragment.Offsets[0], fragment.Sha512, fragment.Size)), content, os.ModePerm); err != nil {
+						fmt.Printf("Error saving file: %v\n", err)
 					}
+					mu.Unlock()
+				}
+			}
+		})
+	}
+
+	// Send fragments to the channel
+	for _, fragment := range manifest.Fragments {
+		fragmentsChan <- fragment
+	}
+	close(fragmentsChan) // Close the channel to signal workers no more tasks are coming
+
+	// Wait for all workers to finish
+	wg.Wait()
+
+	// Check for errors
+	if len(errChan) > 0 {
+		return nil, <-errChan // Return the first error encountered
+	}
+	close(errChan)
 
 	// sort trackFrag by Offset
 	slices.SortFunc(trackFrag, func(a, b Frag) int {
@@ -137,6 +189,7 @@ func Download(manifest Manifest, downloadDir string, filen string) ([]byte, erro
 
 	// check for gaps in trackFrag and fill with remainder content
 	curPos := 0
+
 	for _, frag := range trackFrag {
 		if frag.Offset > curPos {
 			// gap detected