Merge pull request #228 from toniebox-reverse-engineering/develop

Next Version

.vscode/launch.json

@@ -58,9 +58,8 @@
             "program": "${workspaceFolder}/bin/teddycloud",
             "args": [
                 "--encode",
-                "https://download.samplelib.com/mp3/sample-15s.mp3",
-                "--destination",
                 "data/library/test-encode.taf",
+                "https://download.samplelib.com/mp3/sample-15s.mp3",
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}/",
@@ -153,7 +152,9 @@
             "request": "launch",
             "module": "cProfile",
             "args": [
-                "-o", "${workspaceFolder}/fake-server/server.py.prof", "${workspaceFolder}/fake-server/server.py"
+                "-o",
+                "${workspaceFolder}/fake-server/server.py.prof",
+                "${workspaceFolder}/fake-server/server.py"
             ],
             "justMyCode": true
         }

DockerfileAlpine

@@ -49,6 +49,7 @@ VOLUME \
     "/teddycloud/data/library" \
     "/teddycloud/data/firmware" \
     "/teddycloud/data/cache" \
+    "/teddycloud/data/www/custom_img" \
     "/teddycloud/certs" \
     "/teddycloud/config"
 

DockerfileDebian

@@ -47,6 +47,7 @@ VOLUME \
     "/teddycloud/data/library" \
     "/teddycloud/data/firmware" \
     "/teddycloud/data/cache" \
+    "/teddycloud/data/www/custom_img" \
     "/teddycloud/certs" \
     "/teddycloud/config"
 

DockerfileUbuntu

@@ -10,7 +10,7 @@ RUN curl -f https://raw.githubusercontent.com/toniebox-reverse-engineering/tonie
 RUN curl -f https://raw.githubusercontent.com/toniebox-reverse-engineering/tonies-json/release/tonieboxes.json -o /buildenv/contrib/config/tonieboxes.json || true
 RUN make zip
 
-FROM ubuntu:24.04
+FROM ubuntu:latest
 EXPOSE 80 443 8443
 
 RUN apt-get update \
@@ -47,6 +47,7 @@ VOLUME \
     "/teddycloud/data/library" \
     "/teddycloud/data/firmware" \
     "/teddycloud/data/cache" \
+    "/teddycloud/data/www/custom_img" \
     "/teddycloud/certs" \
     "/teddycloud/config"
 

Makefile

@@ -24,7 +24,7 @@ ifeq ($(OS),Windows_NT)
 	build_os_id:="windows"
 else
 	SHELL_ENV ?= bash
-	build_arch:="$(shell arch)"
+	build_arch:="$(shell uname -m)"
 	build_os_id:="$(shell grep "^ID=" /etc/os-release | cut -d'=' -f2- | tr -d '"')"
 endif
 
@@ -47,11 +47,16 @@ else
 build_rawDateTime:="${shell date "+%Y-%m-%d %H:%M:%S %z"}"
 endif
 
-build_gitDirty:=${shell git diff --quiet && echo '0' || echo '1'}
-build_gitDateTime:="${shell git log -1 --format=%ai}"
-build_gitShortSha:=${shell git rev-parse --short HEAD}
-build_gitSha:=${shell git rev-parse HEAD}
-build_gitTag:=${shell git name-rev --tags --name-only $(build_gitSha)}
+GIT_DIRTY ?= 1
+GIT_BUILD_TIME ?= unknown
+GIT_SHORT_SHA ?= unknown
+GIT_SHA ?= unknown
+GIT_TAG ?= unknown
+build_gitDirty:=$(shell git diff --quiet 2>/dev/null && echo '0' || echo $(GIT_DIRTY))
+build_gitDateTime:="$(shell git log -1 --format=%ai 2>/dev/null || echo $(GIT_BUILD_TIME))"
+build_gitShortSha:=${shell git rev-parse --short HEAD 2>/dev/null || echo $(GIT_SHORT_SHA)}
+build_gitSha:=${shell git rev-parse HEAD 2>/dev/null || echo $(GIT_SHA)}
+build_gitTag:=${shell git name-rev --tags --name-only $(build_gitSha) 2>/dev/null || echo $(GIT_TAG)}
 build_platform:=$(PLATFORM)
 build_os:="$(OS)"
 
@@ -64,17 +69,28 @@ CFLAGS_VERSION+=-DBUILD_PRIuTIME_LLU=1
 endif
 endif
 
+#ifeq ($(build_os_id),"ubuntu")
+#ifeq ($(build_arch_bits),32)
+#CFLAGS_VERSION+=-DBUILD_PRIuTIME_LLU=1
+#endif
+#endif
+
 build_gitTagPrefix:=$(firstword $(subst _, ,$(build_gitTag)))
 ifeq ($(build_gitTagPrefix),tc)
 	build_version:=$(subst ${build_gitTagPrefix}_,,${build_gitTag})
 	CFLAGS_VERSION+=-DBUILD_VERSION=\"${build_version}\" 
 endif
 
-web_gitDirty:=${shell cd $(WEB_SRC_DIR) && git diff --quiet && echo '0' || echo '1'}
-web_gitDateTime:="${shell cd $(WEB_SRC_DIR) && git log -1 --format=%ai}"
-web_gitShortSha:=${shell cd $(WEB_SRC_DIR) && git rev-parse --short HEAD}
-web_gitSha:=${shell cd $(WEB_SRC_DIR) && git rev-parse HEAD}
-web_gitTag:=${shell cd $(WEB_SRC_DIR) && git name-rev --tags --name-only $(web_gitSha)}
+WEB_GIT_DIRTY ?= 1
+WEB_GIT_BUILD_TIME ?= unknown
+WEB_GIT_SHORT_SHA ?= unknown
+WEB_GIT_SHA ?= unknown
+WEB_GIT_TAG ?= unknown
+web_gitDirty:=${shell cd $(WEB_SRC_DIR) && git diff --quiet 2>/dev/null && echo '0' || echo $(WEB_GIT_DIRTY)}
+web_gitDateTime:="${shell cd $(WEB_SRC_DIR) && git log -1 --format=%ai 2>/dev/null || echo $(WEB_GIT_BUILD_TIME)}"
+web_gitShortSha:=${shell cd $(WEB_SRC_DIR) && git rev-parse --short HEAD 2>/dev/null || echo $(WEB_GIT_SHORT_SHA)}
+web_gitSha:=${shell cd $(WEB_SRC_DIR) && git rev-parse HEAD 2>/dev/null || echo $(WEB_GIT_SHA)}
+web_gitTag:=${shell cd $(WEB_SRC_DIR) && git name-rev --tags --name-only $(web_gitSha) 2>/dev/null || echo $(WEB_GIT_TAG)}
 web_gitTagPrefix:=$(firstword $(subst _, ,$(web_gitTag)))
 web_version:=vX.X.X
 CFLAGS_VERSION+=-DWEB_GIT_IS_DIRTY=${web_gitDirty} -DWEB_GIT_DATETIME=\"${web_gitDateTime}\" -DWEB_RAW_DATETIME=\"${web_rawDateTime}\" -DWEB_GIT_SHORT_SHA=\"${web_gitShortSha}\" -DWEB_GIT_SHA=\"${web_gitSha}\" -DWEB_GIT_TAG=\"${web_gitTag}\"
@@ -153,6 +169,7 @@ ifneq ($(NO_WARN_FAIL),1)
 endif
 CFLAGS_linux += -ggdb
 CFLAGS_linux += -DFFMPEG_DECODING
+LFLAGS_linux += -pthread -lm
 
 # for now enable extensive error checking
 # Add flags for extensive error checking if NO_SANITIZERS is not set to 1

contrib/config/tonieboxes.json

@@ -68,6 +68,16 @@
             30,
             1.33
         ]
+    },    
+    {
+        "id": "11001754",
+        "name": "Navy Blue",
+        "img_src": "https://images.cdn.europe-west1.gcp.commercetools.com/cffb5678-47af-495c-9f19-1c2ccfc5910c/BOX11001754_5_a-kXLCXBb4.png",
+        "crop": [
+            6,
+            37,
+            1.27
+        ]
     },
     {
         "id": "99-0001",
@@ -99,4 +109,4 @@
             1.5
         ]
     }
-]
+]