Update workflows (#63)

* Update workflows, update icons, fix Dockerfile

Signed-off-by: Marcel Goerentz <m.goerentz@t-online.de>

.github/workflows/beta.yml

@@ -4,12 +4,12 @@ on:
     branches:
       - beta
 
-permissions:
-  contents: write
 jobs:
   buildBinaries:
     name: Build and release binaries
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     outputs:
       new_version: ${{ steps.set-build-number.outputs.new_version }}
     steps:
@@ -27,6 +27,17 @@ jobs:
         run: |
           bash ${GITHUB_WORKSPACE}/Utility/update_build_number_variable.sh ${{ secrets.API_TOKEN }} ${{ github.repository }} ${{ env.NEW_BUILD }}
 
+      - name: Build webUI
+        run: |
+          tsc -p  ${GITHUB_WORKSPACE}/web/tsconfig.json
+          python  ${GITHUB_WORKSPACE}/Utility/create_new_webUI.py
+
+      - name: Upload webUI as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: webUI-artifact
+          path: ./src/webUI.go
+
       - name: Set up and Build
         uses: actions/setup-go@v5
         with:
@@ -58,6 +69,12 @@ jobs:
       - name: Set NEW_VERSION
         run: echo "NEW_VERSION=${{ needs.buildBinaries.outputs.new_version }}" >> $GITHUB_ENV
         shell: bash
+
+      - name: Download webUI artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: webUI-artifact
+          path: ./src
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -73,7 +90,7 @@ jobs:
         with:
           context: .
           build-args: |
-            BRANCH=beta
+            BUILD_FLAG=beta
             VERSION=${{ env.NEW_VERSION }}
           push: true
           no-cache: true

.github/workflows/manual.yml

@@ -23,13 +23,14 @@ jobs:
   buildBinaries:
     name: Build and release binaries
     runs-on: ubuntu-latest
-    outputs:
+    permissions:
+      contents: write
       new_version: ${{ steps.set-build-number.outputs.new_version }}
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
         with:
-          ref: beta
+          ref: intermediat
 
       - name: Set build number
         id: set-build-number
@@ -42,8 +43,8 @@ jobs:
 
       - name: Build webUI
         run: |
-          tsc -p ./web/tsconfig.json
-          python ./Utility/create_webUI.py
+          tsc -p  ${GITHUB_WORKSPACE}/web/tsconfig.json
+          python  ${GITHUB_WORKSPACE}/Utility/create_new_webUI.py
 
       - name: Upload webUI as artifact
         uses: actions/upload-artifact@v4
@@ -67,8 +68,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           prerelease: true
-          name: v${{ env.NEW_VERSION }} (Beta)
-          tag_name: v${{ env.NEW_VERSION }}-beta
+          name: v${{ env.NEW_VERSION }} (Workflow Test)
+          tag_name: v${{ env.NEW_VERSION }}-test
           files: dist/*
 
   buildDockerImages:
@@ -82,6 +83,12 @@ jobs:
       - name: Set NEW_VERSION
         run: echo "NEW_VERSION=${{ needs.buildBinaries.outputs.new_version }}" >> $GITHUB_ENV
         shell: bash
+
+      - name: Download webUI artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: webUI-artifact
+          path: ./src
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -97,10 +104,8 @@ jobs:
         with:
           context: .
           build-args: |
-            BRANCH=beta
-          push: true
+            BUILD_FLAG=beta
+            VERSION=${{ env.NEW_VERSION }}
+          push: false
           no-cache: true
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
-          tags: |
-            mgoerentz/threadfin:latest-beta
-            mgoerentz/threadfin:v${{ env.NEW_VERSION }}-beta

.github/workflows/release.yml

@@ -4,19 +4,19 @@ on:
     branches: 
       - master
 
-permissions:
-  contents: write
 jobs:
   buildBinaries:
     name: Build and release binaries
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     outputs:
       new_version: ${{ steps.set-build-number.outputs.new_version }}
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
         with:
-          ref: main
+          ref: maser
 
       - name: Set build number
         id: set-build-number
@@ -27,17 +27,28 @@ jobs:
         run: |
           bash ${GITHUB_WORKSPACE}/Utility/update_build_number_variable.sh ${{ secrets.API_TOKEN }} ${{ github.repository }} ${{ env.NEW_BUILD }}
 
+      - name: Build webUI
+        run: |
+          tsc -p  ${GITHUB_WORKSPACE}/web/tsconfig.json
+          python  ${GITHUB_WORKSPACE}/Utility/create_new_webUI.py
+
+      - name: Upload webUI as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: webUI-artifact
+          path: ./src/webUI.go
+
       - name: Set up and Build
         uses: actions/setup-go@v5
         with:
           go-version: 1.23
         id: go
-      
-      - name: Build Binaries
+
+      - name: Build binaries
         run: |
           go mod tidy && go mod vendor
           bash ${GITHUB_WORKSPACE}/Utility/create_binaries.sh
-      
+
       - name: Create a Release
         uses: softprops/action-gh-release@v2
         with:
@@ -48,7 +59,7 @@ jobs:
           make_latest: true
 
   buildDockerImages:
-    name: Build and push Docker Images
+    name: Build and push Docker images
     runs-on: ubuntu-latest
     needs: buildBinaries
     steps:
@@ -59,6 +70,12 @@ jobs:
         run: echo "NEW_VERSION=${{ needs.buildBinaries.outputs.new_version }}" >> $GITHUB_ENV
         shell: bash
 
+      - name: Download webUI artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: webUI-artifact
+          path: ./src
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -69,13 +86,11 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker Build and Push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           no-cache: true
-          build-args: |
-            VERSION=${{ env.NEW_VERSION }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
           tags: |
             mgoerentz/threadfin:latest

Dockerfile

@@ -1,17 +1,14 @@
 # First stage. Building a binary
 # -----------------------------------------------------------------------------
-ARG BRANCH=master
+ARG BUILD_FLAG=master
 FROM golang:1.23-alpine AS base
 
-# Download the source code
-RUN apk --no-cache add git
-RUN git clone https://github.com/marcelGoerentz/Threadfin.git /src
-
+# Copy source code
+COPY . /src
 WORKDIR /src
 
 ARG VERSION
-RUN git checkout ${BRANCH} && git pull \
-    && sed -i "s/const Version = \".*\"/const Version = \"${VERSION}\"/" threadfin.go \
+RUN sed -i "s/const Version = \".*\"/const Version = \"${VERSION}\"/" threadfin.go \
     && go mod tidy \
     && go mod vendor
 
@@ -21,7 +18,7 @@ RUN go build .
 FROM base AS beta
 RUN go build -tags beta .
 
-FROM ${BRANCH} AS builder
+FROM ${BUILD_FLAG} AS builder
 ARG BRANCH
 RUN echo "Build ${BRANCH} version"
 

Utility/create_new_webUI.py

@@ -0,0 +1,48 @@
+import os
+import base64
+
+# Variablen
+html_folder = "./web/public"
+go_file = "./src/webUI.go"
+package_name = "src"
+map_name = "webUI"
+
+# Funktion zum Überprüfen der HTML-Dateien
+def check_html_folder():
+    if not os.path.isdir(html_folder):
+        print("HTML folder does not exist.")
+        return False
+    return True
+
+# Funktion zum Erstellen der Go-Datei
+def build_go_file():
+    if not check_html_folder():
+        return
+
+    content = f"package {package_name}\n\n"
+    content += f"var {map_name} = make(map[string]interface{{}})\n\n"
+    content += "func loadHTMLMap() {\n\n"
+
+    # Hier wird die Map aus den Dateien im HTML-Ordner erstellt
+    content += create_map_from_files(html_folder) + "\n"
+
+    content += "}\n\n"
+
+    with open(go_file, "w") as f:
+        f.write(content)
+
+# Funktion zum Erstellen der Map aus den Dateien im HTML-Ordner
+def create_map_from_files(folder):
+    map_content = ""
+    for root, _, files in os.walk(folder):
+        for file in files:
+            file_path = os.path.join(root, file)
+            with open(file_path, "rb") as f:
+                base64_str = base64.b64encode(f.read()).decode('utf-8')
+            key = os.path.relpath(file_path, folder).replace("\\", "/")
+            map_content += f'\t{map_name}["web/public/{key}"] = "{base64_str}"\n'
+    return map_content
+
+# Aufruf der Funktion buildGoFile
+build_go_file()
+print("Created new webUI.go")

src/config.go

@@ -192,6 +192,7 @@ func Init() (err error) {
 
 	System.URLBase = fmt.Sprintf("%s://%s:%s", System.ServerProtocol, System.IPAddress, Settings.Port)
 
+	/*
 	// HTML Dateien erstellen, mit dev == true werden die lokalen HTML Dateien verwendet
 	if System.Dev {
 
@@ -201,7 +202,7 @@ func Init() (err error) {
 			return
 		}
 
-	}
+	}*/
 
 	// DLNA Server starten
 	if Settings.SSDP {

src/data.go

@@ -17,8 +17,16 @@ import (
 // Einstellungen ändern (WebUI)
 func updateServerSettings(request RequestStruct) (settings SettingsStruct, err error) {
 
-	var oldSettings = jsonToMap(mapToJSON(Settings))
-	var newSettings = jsonToMap(mapToJSON(request.Settings))
+	oldSettings, err := jsonToMap(mapToJSON(Settings))
+	if err !=  nil {
+		ShowError(err, 0 ) //TODO: Define error code
+		return
+	}
+	newSettings, err := jsonToMap(mapToJSON(request.Settings))
+	if err !=  nil {
+		ShowError(err, 0 ) //TODO: Define error code
+		return
+	}
 	var reloadData = false
 	var cacheImages = false
 	var createXEPGFiles = false
@@ -470,7 +478,11 @@ func saveFilter(request RequestStruct) (settings SettingsStruct, err error) {
 			// Neuer Filter
 			newFilter = true
 			dataID = createNewID()
-			filterMap[dataID] = jsonToMap(mapToJSON(defaultFilter))
+			filterMap[dataID], err = jsonToMap(mapToJSON(defaultFilter))
+			if err !=  nil {
+				ShowError(err, 0 ) //TODO: Define error code
+				return
+			}
 
 		}
 
@@ -658,7 +670,11 @@ func saveNewUser(request RequestStruct) (err error) {
 // Wizard (WebUI)
 func saveWizard(request RequestStruct) (nextStep int, err error) {
 
-	var wizard = jsonToMap(mapToJSON(request.Wizard))
+	wizard, err := jsonToMap(mapToJSON(request.Wizard))
+	if err !=  nil {
+		ShowError(err, 0 ) //TODO: Define error code
+		return
+	}
 
 	for key, value := range wizard {