Merge branch 'branding' into dev

build/build-exe.py

@@ -16,7 +16,6 @@ for option in config["pyinstallerOptions"]:
 
     # The json is rather inconsistent :/
     if option_dest in json_dests:
-        print("in")
         option_dest = pyi_dests[json_dests.index(option_dest)]
 
     option_dest = option_dest.replace("_", "-")

build/build-linux.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 
+# Get the git commit / branch and write it into build.py.
 build_commit="$(git rev-parse --short HEAD)"
+build_branch="$(git branch --show-current)"
 echo "BUILD: str = \"$build_commit\"" > ../build.py
+echo "BRANCH: str = \"$build_branch\"" >> ../build.py
 
 apt install libportaudio2
 

build/build-macos.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 cd "$(dirname "$0")"
 
+# Get the git commit / branch and write it into build.py.
 build_commit="$(git rev-parse --short HEAD)"
+build_branch="$(git branch --show-current)"
 echo "BUILD: str = \"$build_commit\"" > ../build.py
+echo "BRANCH: str = \"$build_branch\"" >> ../build.py
 
 python3 -m venv ../venv
 source ../venv/bin/activate

build/build-windows.bat

@@ -1,10 +1,14 @@
 cd /D "%~dp0"
 
-: Get the git commit and write it into build.py.
+: Get the git commit / branch and write it into build.py.
 FOR /F "tokens=* USEBACKQ" %%F IN (`git rev-parse --short HEAD`) DO (
 SET build_commit=%%F
 )
+FOR /F "tokens=* USEBACKQ" %%F IN (`git branch --show-current`) DO (
+SET build_branch=%%F
+)
 echo BUILD: str = "%build_commit%"> ..\build.py
+echo BRANCH: str = "%build_branch%">> ..\build.py
 
 if "%1" == "no-venv" goto skip-venv
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bapsicle",
   "nice_name": "BAPSicle",
-  "version": "0.1.0",
+  "version": "3.0.0",
   "description": "BAPS3, the third generation of University Radio York's Broadcast and Presenting Suite. This package includes the Server (BAPSicle) and Presenter (WebStudio)",
   "main": "index.js",
   "directories": {

package.py

@@ -4,7 +4,6 @@ from helpers.os_environment import resolve_local_file_path
 
 with open(resolve_local_file_path("package.json")) as file:
     config = loads(file.read())
-    VERSION: str = config["version"]
     NAME: str = config["name"]
     NICE_NAME: str = config["nice_name"]
     DESCRIPTION: str = config["description"]
@@ -12,9 +11,17 @@ with open(resolve_local_file_path("package.json")) as file:
     LICENSE: str = config["license"]
 
     build_commit = "Dev"
+    build_branch = "Local"
+    build_beta = True
     try:
         import build
         build_commit = build.BUILD
+        build_branch = build.BRANCH
+        build_beta = (build_branch != "release")
     except (ModuleNotFoundError, AttributeError):
         pass
     BUILD: str = build_commit
+    BRANCH: str = build_branch
+    BETA: bool = build_beta
+
+    VERSION: str = config["version"] + "b" if BETA else config["version"]

server.py

@@ -56,6 +56,8 @@ class BAPSicleServer:
     default_state = {
         "server_version": "unknown",
         "server_build": "unknown",
+        "server_branch": "unknown",
+        "server_beta": True,
         "server_name": "URY BAPSicle",
         "host": "localhost",
         "port": 13500,
@@ -182,6 +184,8 @@ class BAPSicleServer:
         # TODO: Check these match, if not, trigger any upgrade noticies / welcome
         self.state.update("server_version", package.VERSION)
         self.state.update("server_build", package.BUILD)
+        self.state.update("server_branch", package.BRANCH)
+        self.state.update("server_beta", package.BETA)
 
         channel_count = self.state.get()["num_channels"]
         self.player = [None] * channel_count

ui-static/css/sb-admin-2.css

@@ -10803,7 +10803,7 @@ a:focus {
 }
 
 .bg-login-image, .bg-index-image {
-  background: url("https://source.unsplash.com/K4mSJ7kc0As/600x800");
+  background: url("/static/img/splash.png");
   background-position: center;
   background-size: cover;
 }

ui-templates/index.html

@@ -17,8 +17,12 @@
             Open BAPS Presenter
           </a>
           <hr>
-          <p>Version: {{data.server_version}} - Build: {{data.server_build}}</p>
+          <p>Version: {{data.server_version}} - Build: {{data.server_build}} - Branch: {{data.server_branch}}</p>
           <p>Server Name: {{data.server_name}}</p>
+          <hr>
+          <small>
+            <a href="https://www.vecteezy.com/free-vector/island">Island Vectors by Vecteezy</a>, <a href="https://www.flaticon.com/free-icon/recording_3172492">Recording Vector from Flaticon</a>
+          </small>
         </div>
       </div>
     </div>

web_server.py

@@ -52,12 +52,15 @@ def page_not_found(request, e: Any):
 
 @app.route("/")
 def ui_index(request):
+    config = server_state.get()
     data = {
         "ui_page": "index",
         "ui_title": "",
-        "server_version": server_state.get()["server_version"],
-        "server_build": server_state.get()["server_build"],
-        "server_name": server_state.get()["server_name"],
+        "server_version": config["server_version"],
+        "server_build": config["server_build"],
+        "server_name": config["server_name"],
+        "server_beta": config["server_beta"],
+        "server_branch": config["server_branch"]
     }
     return render_template("index.html", data=data)