diff --git a/build/build-exe.py b/build/build-exe.py index cbded7e..c3fde21 100644 --- a/build/build-exe.py +++ b/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("_", "-") diff --git a/build/build-linux.sh b/build/build-linux.sh index 0b8e9ea..8eb2254 100755 --- a/build/build-linux.sh +++ b/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 diff --git a/build/build-macos.sh b/build/build-macos.sh index bce24b8..6efb5dd 100755 --- a/build/build-macos.sh +++ b/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 diff --git a/build/build-windows.bat b/build/build-windows.bat index 314e459..36fc696 100644 --- a/build/build-windows.bat +++ b/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 diff --git a/package.json b/package.json index 7e4abca..6cfd2ff 100644 --- a/package.json +++ b/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": { diff --git a/package.py b/package.py index ceef218..18a9dfc 100644 --- a/package.py +++ b/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"] diff --git a/resources/logo/baps3-small.icns b/resources/logo/baps3-small.icns new file mode 100644 index 0000000..1778902 Binary files /dev/null and b/resources/logo/baps3-small.icns differ diff --git a/resources/logo/baps3-small.ico b/resources/logo/baps3-small.ico new file mode 100644 index 0000000..8a564c6 Binary files /dev/null and b/resources/logo/baps3-small.ico differ diff --git a/resources/logo/baps3-small.png b/resources/logo/baps3-small.png new file mode 100644 index 0000000..dd311be Binary files /dev/null and b/resources/logo/baps3-small.png differ diff --git a/resources/logo/baps3-small.psd b/resources/logo/baps3-small.psd new file mode 100644 index 0000000..f458918 Binary files /dev/null and b/resources/logo/baps3-small.psd differ diff --git a/resources/logo/baps3.png b/resources/logo/baps3.png new file mode 100644 index 0000000..4a97811 Binary files /dev/null and b/resources/logo/baps3.png differ diff --git a/resources/logo/baps3.psd b/resources/logo/baps3.psd new file mode 100644 index 0000000..8067a76 Binary files /dev/null and b/resources/logo/baps3.psd differ diff --git a/resources/logo/bapsicle-logo.png b/resources/logo/bapsicle-logo.png new file mode 100644 index 0000000..f8d1e66 Binary files /dev/null and b/resources/logo/bapsicle-logo.png differ diff --git a/resources/logo/urywebstudio.psd b/resources/logo/urywebstudio.psd new file mode 100644 index 0000000..32823c8 Binary files /dev/null and b/resources/logo/urywebstudio.psd differ diff --git a/resources/splash.psd b/resources/splash.psd new file mode 100644 index 0000000..42decfe Binary files /dev/null and b/resources/splash.psd differ diff --git a/server.py b/server.py index cd0c6fe..896279a 100644 --- a/server.py +++ b/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 diff --git a/ui-static/css/sb-admin-2.css b/ui-static/css/sb-admin-2.css index fd7d0b0..ac7f554 100644 --- a/ui-static/css/sb-admin-2.css +++ b/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; } diff --git a/ui-static/img/splash.png b/ui-static/img/splash.png new file mode 100644 index 0000000..5c205af Binary files /dev/null and b/ui-static/img/splash.png differ diff --git a/ui-templates/index.html b/ui-templates/index.html index 8d7c65e..53c5aa4 100644 --- a/ui-templates/index.html +++ b/ui-templates/index.html @@ -17,8 +17,12 @@ Open BAPS Presenter
-

Version: {{data.server_version}} - Build: {{data.server_build}}

+

Version: {{data.server_version}} - Build: {{data.server_build}} - Branch: {{data.server_branch}}

Server Name: {{data.server_name}}

+
+ + Island Vectors by Vecteezy, Recording Vector from Flaticon + diff --git a/web_server.py b/web_server.py index d9bed7a..933a818 100644 --- a/web_server.py +++ b/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)