add support for PBSync gslib

Author: mastercoms

README.md

@@ -9,16 +9,18 @@ archive are supported.
 
 ```
 Usage of ue4versionator:
+  -assume-valid
+        assumes current archive is valid, if present
+  -bundle string
+        request UE4 build bundle (default "editor")
   -config string
         ue4versionator config file (default ".ue4versionator")
   -user-config string
         ue4versionator user config file (default ".ue4v-user")
   -virgin
         ask configuration options like the first time
-  -bundle
-        request UE4 build bundle
   -with-symbols
-        download and unpack UE4 engine debug symbols
+        include UE4 engine debug symbols
 ```
 
 ## Configuring ue4versionator

archive.go

@@ -30,6 +30,7 @@ var ErrEngineAssociationNeedsPrefix = errors.New("engine association needs 'ue4v
 type DownloadOptions struct {
 	EngineBundle string
 	FetchSymbols bool
+	AssumeValid bool
 }
 
 // GetEngineAssociation returns a .uproject engine association.
@@ -110,7 +111,7 @@ func FetchEngine(rootDir string, baseURL, version string, options DownloadOption
 				return
 			}
 
-			assetInfo[i].err = download(baseURL, dest, assetInfo[i].name, name)
+			assetInfo[i].err = download(baseURL, rootDir, name, assetInfo[i].name, name, options.AssumeValid)
 		}(idx, version)
 	}
 	wg.Wait()
@@ -125,33 +126,38 @@ func FetchEngine(rootDir string, baseURL, version string, options DownloadOption
 	return dest, err
 }
 
-func download(baseURL, dest, asset, version string) error {
+func download(baseURL, rootDir, name, asset, version string, assumeValid bool) error {
 	urlStr := fmt.Sprintf("%s/%s-%s.7z", baseURL, asset, version)
 	uri, err := url.Parse(urlStr)
 	if err != nil {
 		return err
 	}
 
 	req, _ := http.NewRequest("GET", uri.String(), nil)
+	dest := filepath.Join(rootDir, name)
 
 	// if archive exists, see if we can do a range request
-	archivePath := dest + "-" + asset + ".7z"
+	archivePath := filepath.Join(rootDir, asset) + "-" + name + ".7z"
 	if fi, err := os.Stat(archivePath); err == nil {
-		resp, err := http.Head(uri.String())
-		if err != nil {
-			return err
-		}
-		if resp.StatusCode >= 400 {
-			return errors.New(fmt.Sprintf("%s: %s", resp.Status, urlStr))
-		}
-		if resp.Header.Get("Content-Length") != "" {
-			size, err := strconv.Atoi(resp.Header.Get("Content-Length"))
-			if err == nil && int64(size) == fi.Size() {
-				return extract(asset, archivePath, dest)
+		if assumeValid {
+			return extract(asset, archivePath, dest)
+		} else {
+			resp, err := http.Head(uri.String())
+			if err != nil {
+				return err
+			}
+			if resp.StatusCode >= 400 {
+				return errors.New(fmt.Sprintf("%s: %s", resp.Status, urlStr))
+			}
+			if resp.Header.Get("Content-Length") != "" {
+				size, err := strconv.Atoi(resp.Header.Get("Content-Length"))
+				if err == nil && int64(size) == fi.Size() {
+					return extract(asset, archivePath, dest)
+				}
+			}
+			if resp.Header.Get("Accept-Ranges") == "bytes" {
+				req.Header.Set("Range", fmt.Sprintf("bytes=%d-", fi.Size()))
 			}
-		}
-		if resp.Header.Get("Accept-Ranges") == "bytes" {
-			req.Header.Set("Range", fmt.Sprintf("bytes=%d-", fi.Size()))
 		}
 	}
 

main.go

@@ -20,8 +20,9 @@ var (
 	iniConfig     = flag.String("config", ".ue4versionator", "ue4versionator config file")
 	userIniConfig = flag.String("user-config", ".ue4v-user", "ue4versionator user config file")
 	bundle        = flag.String("bundle", "editor", "request UE4 build bundle")
-	fetchSymbols  = flag.Bool("with-symbols", false, "download and unpack UE4 engine debug symbols")
+	fetchSymbols  = flag.Bool("with-symbols", false, "include UE4 engine debug symbols")
 	virgin        = flag.Bool("virgin", false, "ask configuration options like the first time")
+	assumeValid   = flag.Bool("assume-valid", false, "assumes current archive is valid, if present")
 )
 
 func main() {
@@ -77,6 +78,7 @@ func main() {
 	dest, err := FetchEngine(downloadDir, baseURL.String(), version, DownloadOptions{
 		EngineBundle: *bundle,
 		FetchSymbols: shouldFetchSymbols,
+		AssumeValid: *assumeValid,
 	})
 	if err != nil {
 		handleError(err)