feat: fixing some odd stuff + ci

Author: sorae42

.github/workflows/build.yml

@@ -0,0 +1,80 @@
+name: Build CargoDrop
+
+on:
+  push:
+    branches: [ build ]
+  pull_request:
+    branches: [ build ]
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        goos: [linux, windows]
+        goarch: [amd64]
+        include:
+          - goos: linux
+            goarch: amd64
+            ext: ""
+          - goos: windows
+            goarch: amd64
+            ext: ".exe"
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # Needed for git rev-parse to work
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.21'
+
+    - name: Get dependencies
+      run: go mod download
+
+    - name: Get build info
+      id: build_info
+      run: |
+        echo "commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+        echo "build_date=$(date -u +'%Y-%m-%d_%H-%M-%S')" >> $GITHUB_OUTPUT
+
+    - name: Build
+      env:
+        GOOS: ${{ matrix.goos }}
+        GOARCH: ${{ matrix.goarch }}
+      run: |
+        go build \
+          -ldflags "-X github.com/cosmiclabstudio/cargodrop/internal/utils.BuildHash=${{ steps.build_info.outputs.commit_hash }}" \
+          -o cargodrop-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.ext }} \
+          ./cmd/cargodrop
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: cargodrop-${{ matrix.goos }}-${{ matrix.goarch }}
+        path: cargodrop-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.ext }}
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release'
+
+    steps:
+    - name: Download all artifacts
+      uses: actions/download-artifact@v4
+
+    - name: Display structure of downloaded files
+      run: ls -la
+
+    - name: Upload release assets
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          cargodrop-linux-amd64/cargodrop-linux-amd64
+          cargodrop-windows-amd64/cargodrop-windows-amd64.exe
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cmd/cargodrop/main.go

@@ -13,27 +13,27 @@ import (
 )
 
 func main() {
+	baseDir := flag.String("base-dir", ".", "The directory containing the base files")
 	configPath := flag.String("config", "", "Path to config file")
 	resourcesPath := flag.String("resources", "", "Path to resources file")
 	isGenResource := flag.Bool("generate-metadata", false, "Whether to generate metadata for server")
 	isServiceModrinth := flag.Bool("modrinth", false, "Use Modrinth to add download links")
 	flag.Parse()
 
-	utils.LogMessage("Config file: " + *configPath)
-	utils.LogMessage("Resources file: " + *resourcesPath)
-
 	config, err := parsers.LoadConfig(*configPath)
 	if err != nil {
 		utils.LogError(err)
 		return
 	}
+	utils.LogMessage("Config file: " + *configPath)
 
 	resources, err := parsers.LoadResource(*resourcesPath)
 	if err != nil {
 		resources = &parsers.ResourceSet{
 			Name:            config.Name,
 			LocalVersion:    "1.0.0",
 			ResourceSetHash: "",
+			Patches:         []parsers.Patches{},
 			Resources:       []parsers.Resource{},
 		}
 
@@ -45,6 +45,7 @@ func main() {
 		}
 		utils.LogWarning("Missing resource.json! Creating one at " + *resourcesPath)
 	}
+	utils.LogMessage("Resources file: " + *resourcesPath)
 
 	a := app.New()
 	mw := gui.NewMainWindow(a, config, resources)
@@ -58,9 +59,9 @@ func main() {
 	go func() {
 		if *isGenResource {
 			utils.LogMessage("Generating metadata for server...")
-			workers.RunGenSourceSequence(config, resources, ".", *resourcesPath, mw.UpdateProgress, mw.HandleError, *isServiceModrinth)
+			workers.RunGenSourceSequence(config, resources, *baseDir, *resourcesPath, mw.UpdateProgress, mw.HandleError, *isServiceModrinth)
 		} else {
-			workers.RunUpdateSequence(config, resources, ".", mw.UpdateProgress, mw.HandleError)
+			workers.RunUpdateSequence(config, resources, *baseDir, *resourcesPath, mw.UpdateProgress, mw.HandleError)
 		}
 	}()
 

internal/gui/gui.go

@@ -134,7 +134,7 @@ func NewMainWindow(a fyne.App, config *parsers.Config, resources *parsers.Resour
 		utils.LogMessage("You may close this window to continue launching your game.")
 	}
 
-	creditLeft := canvas.NewText("CargoDrop ver.1.0 (build abcd1234)", color.White)
+	creditLeft := canvas.NewText(utils.GetFullVersionString(), color.White)
 	creditLeft.TextSize = 12
 	creditRight := canvas.NewText("Made with ❤️ by Cosmic Lab Studio", color.White)
 	creditRight.TextSize = 12

internal/parsers/resource.go

@@ -12,10 +12,16 @@ type Resource struct {
 	URL  string `json:"url"`
 }
 
+type Patches struct {
+	Version string `json:"version"`
+	URL     string `json:"url"`
+}
+
 type ResourceSet struct {
 	Name            string     `json:"name"`
 	LocalVersion    string     `json:"version"`
 	ResourceSetHash string     `json:"resource_set_hash"`
+	Patches         []Patches  `json:"patches"`
 	Resources       []Resource `json:"resources"`
 }
 

internal/utils/version.go

@@ -0,0 +1,14 @@
+package utils
+
+const (
+	Version = "1.0"
+)
+
+// BuildHash can be set at build time using ldflags
+// Example: go build -ldflags "-X github.com/cosmiclabstudio/cargodrop/internal/utils.BuildHash=$(git rev-parse --short HEAD)"
+var BuildHash = "dev"
+
+// GetFullVersionString returns the version with build hash for GUI display
+func GetFullVersionString() string {
+	return "CargoDrop ver." + Version + " (build " + BuildHash + ")"
+}

internal/workers/gensource.go

@@ -15,7 +15,7 @@ import (
 
 func RunGenSourceSequence(config *parsers.Config, resources *parsers.ResourceSet, baseDir string, resourcesPath string, progressCb func(fileName string, downloadedBytes, totalBytes int64, processed, total int), errorCb func(string, error), isServiceModrinth bool) {
 	// some introduction
-	utils.LogRaw("Cargodrop ver.1.0 by Cosmic Lab Studio")
+	utils.LogRaw(utils.GetFullVersionString())
 	utils.LogRaw("By using this software, you agree to the Terms of Conditions and the License of this program.")
 	utils.LogRaw("Read more at: https://github.com/cosmiclabstudio/cargodrop") // TODO: Replace this link
 

internal/workers/sequencer.go

@@ -11,9 +11,9 @@ import (
 )
 
 // RunUpdateSequence sequence for the app to start updating stuff
-func RunUpdateSequence(config *parsers.Config, resources *parsers.ResourceSet, baseDir string, progressCb func(fileName string, downloadedBytes, totalBytes int64, processed, total int), errorCb func(string, error)) {
+func RunUpdateSequence(config *parsers.Config, resources *parsers.ResourceSet, baseDir string, resourcePath string, progressCb func(fileName string, downloadedBytes, totalBytes int64, processed, total int), errorCb func(string, error)) {
 	// some introduction
-	utils.LogRaw("Cargodrop ver.1.0 by Cosmic Lab Studio")
+	utils.LogRaw(utils.GetFullVersionString())
 	utils.LogRaw("By using this software, you agree to the Terms of Conditions and the License of this program.")
 	utils.LogRaw("Read more at: https://github.com/cosmiclabstudio/cargodrop") // TODO: Replace this link
 
@@ -24,8 +24,7 @@ func RunUpdateSequence(config *parsers.Config, resources *parsers.ResourceSet, b
 	// Download resources.json from server
 	utils.LogMessage("Checking for updates...")
 
-	resourcesPath := filepath.Join(baseDir, "resources.json")
-	err := DownloadFile(config.UpdateServer, resourcesPath, "cargodrop.json", 0, func(fileName string, downloadedBytes, totalBytes int64) {
+	err := DownloadFile(config.UpdateServer, resourcePath, "resources.json", 0, func(fileName string, downloadedBytes, totalBytes int64) {
 		// callback
 	})
 	if err != nil {
@@ -35,7 +34,7 @@ func RunUpdateSequence(config *parsers.Config, resources *parsers.ResourceSet, b
 	}
 
 	// Parse the downloaded resources.json file
-	remoteSet, err := parsers.LoadResource(resourcesPath)
+	remoteSet, err := parsers.LoadResource(resourcePath)
 	if err != nil {
 		utils.LogError(err)
 		errorCb("Failed to parse remote resources file.", err)