9 Commits

Author SHA1 Message Date
Adrian Zürcher
f8dce0b817 fix chmod error
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 2m5s
Build Slideshow App / build (amd64, , linux) (push) Successful in 2m16s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 2m9s
Build Slideshow App / build (arm64, , linux) (push) Successful in 2m5s
2026-01-21 07:57:03 +01:00
Adrian Zürcher
0eb781a6d3 fix desktop output and add new data path
Some checks failed
Build Slideshow App / build (amd64, , linux) (push) Failing after 2m3s
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 2m4s
Build Slideshow App / build (arm, 7, , linux) (push) Failing after 1m48s
Build Slideshow App / build (arm64, , linux) (push) Failing after 1m54s
2026-01-21 07:28:39 +01:00
Adrian Zürcher
9150550609 new folder strucure and file path 2026-01-21 07:28:10 +01:00
Adrian Zürcher
84abf6b820 add new helper function 2026-01-21 07:27:50 +01:00
Adrian Zürcher
4904589086 change autostart script
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 3m29s
Build Slideshow App / build (amd64, , linux) (push) Successful in 3m46s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 2m0s
Build Slideshow App / build (arm64, , linux) (push) Successful in 1m59s
2026-01-20 17:17:03 +01:00
Adrian Zürcher
6f7e149c9a second try autostart
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 1m55s
Build Slideshow App / build (amd64, , linux) (push) Successful in 2m12s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 2m1s
Build Slideshow App / build (arm64, , linux) (push) Successful in 2m4s
2026-01-19 07:34:15 +01:00
Adrian Zürcher
df344b4c13 change from systemd to autostart
All checks were successful
Build Slideshow App / build (amd64, , linux) (push) Successful in 1m30s
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 1m19s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 1m23s
Build Slideshow App / build (arm64, , linux) (push) Successful in 1m24s
2026-01-19 07:19:51 +01:00
Adrian Zürcher
d82f213ca7 fix wrong log file name in linux, comments of enviroment vars
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 2m7s
Build Slideshow App / build (amd64, , linux) (push) Successful in 2m18s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 2m3s
Build Slideshow App / build (arm64, , linux) (push) Successful in 2m4s
2026-01-18 21:46:17 +01:00
Adrian Zürcher
3241429e98 add logger
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 2m7s
Build Slideshow App / build (amd64, , linux) (push) Successful in 2m25s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 2m2s
Build Slideshow App / build (arm64, , linux) (push) Successful in 2m1s
2026-01-18 21:00:53 +01:00
10 changed files with 163 additions and 45 deletions

7
.env
View File

@@ -1,5 +1,8 @@
ENV= #empty|development #empty|development|debug
ENV=
PHOTO_DIR=images PHOTO_DIR=images
HOST=0.0.0.0 HOST=0.0.0.0
PORT=8080 PORT=8080
INTERVAL_DEFAULT=10 INTERVAL_DEFAULT=10
#path for logger files default {executable name}.log
LOG_PATH=

View File

@@ -98,6 +98,7 @@ jobs:
# 2. Create Directory Structure # 2. Create Directory Structure
mkdir -p $BUILD_DIR/usr/bin mkdir -p $BUILD_DIR/usr/bin
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME mkdir -p $BUILD_DIR/usr/share/$PKG_NAME
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/data
mkdir -p $BUILD_DIR/etc/systemd/system mkdir -p $BUILD_DIR/etc/systemd/system
mkdir -p $BUILD_DIR/DEBIAN mkdir -p $BUILD_DIR/DEBIAN
@@ -113,23 +114,23 @@ jobs:
echo "PORT=8080" > $BUILD_DIR/usr/share/$PKG_NAME/.env.template echo "PORT=8080" > $BUILD_DIR/usr/share/$PKG_NAME/.env.template
fi fi
# 5. Create the systemd Service File # 5. Create a Template Autostart File (Instead of Systemd)
cat <<EOF > $BUILD_DIR/etc/systemd/system/$PKG_NAME.service mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/setup
[Unit] cat <<'EOF' > $BUILD_DIR/usr/share/$PKG_NAME/setup/$PKG_NAME.desktop
Description=Slideshow Application Service [Desktop Entry]
After=graphical.target Type=Application
Name=Slideshow App
[Service] Exec=sh -c ' \
Type=simple i=0; \
Environment=DISPLAY=:0 while [ $i -lt 30 ]; do \
Environment=XAUTHORITY=/home/youruser/.Xauthority if [ "$(ls -A /media/$USER 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then \
ExecStart=/usr/bin/$PKG_NAME break; \
WorkingDirectory=/usr/share/$PKG_NAME fi; \
Restart=always i=$((i+1)); \
User=root sleep 1; \
done; \
[Install] cd /usr/share/slideshowapp && /usr/bin/slideshowapp'
WantedBy=multi-user.target Terminal=false
EOF EOF
# 6. Create Control File # 6. Create Control File
@@ -139,28 +140,64 @@ jobs:
Section: utils Section: utils
Priority: optional Priority: optional
Architecture: $ARCH Architecture: $ARCH
Maintainer: Your Name <you@example.com> Maintainer: Adrian Zuercher <zuercher@tecamino.ch>
Description: Slideshow Application Description: Slideshow Application
EOF EOF
# 7. Optional: Add post-install script to enable service automatically # 7. Add post-install script for Autostart and Permissions
echo "create service" cat <<'EOF' > $BUILD_DIR/DEBIAN/postinst
cat <<EOF > $BUILD_DIR/DEBIAN/postinst
#!/bin/sh #!/bin/sh
# Check if .env exists in the target share folder set -e # Exit on error
if [ ! -f "/usr/share/$PKG_NAME/.env" ]; then
echo "Creating new .env from template..." # 1. Detect the real user
cp /usr/share/$PKG_NAME/.env.template /usr/share/$PKG_NAME/.env # We use 'who' and 'awk' as a fallback because $SUDO_USER is sometimes empty in Gitea/CI environments
else REAL_USER=${SUDO_USER:-$(who | awk '{print $1}' | head -n1)}
echo ".env already exists, skipping template copy to preserve settings."
# If still empty, default to 'mst' or 'pi' (adjust to your primary user)
if [ -z "$REAL_USER" ] || [ "$REAL_USER" = "root" ]; then
REAL_USER="mst"
fi fi
echo "reload" USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
systemctl daemon-reload
echo "enable service" echo "Setting permissions for /usr/share/slideshowapp..."
systemctl enable $PKG_NAME.service chown -R "$REAL_USER:$REAL_USER" /usr/share/slideshowapp
echo "start service" chmod -R 755 /usr/share/slideshowapp
systemctl start $PKG_NAME.service
echo "Post-install: Target user is $REAL_USER"
echo "Post-install: Target home is $USER_HOME"
# 2. Setup .env from template
if [ ! -f "/usr/share/slideshowapp/.env" ]; then
echo "Creating .env from template..."
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
fi
# 3. Setup Autostart
# We use -p to ensure parent directories exist and set ownership immediately
AUTOSTART_DIR="$USER_HOME/.config/autostart"
if [ -d "$USER_HOME" ]; then
echo "Creating autostart directory at $AUTOSTART_DIR"
mkdir -p "$AUTOSTART_DIR"
cp /usr/share/slideshowapp/setup/slideshowapp.desktop "$AUTOSTART_DIR/"
# Critical: Change ownership of the folder and the file
chown -R "$REAL_USER:$REAL_USER" "$USER_HOME/.config"
chmod 644 "$AUTOSTART_DIR/slideshowapp.desktop"
else
echo "ERROR: Home directory $USER_HOME not found. Autostart not configured."
fi
# 4. Fix Chromium Profile Permissions
if [ -d "$USER_HOME/.config/chromium" ]; then
echo "Cleaning up Chromium locks for $REAL_USER..."
chown -R "$REAL_USER:$REAL_USER" "$USER_HOME/.config/chromium"
rm -f "$USER_HOME/.config/chromium/SingletonLock"
rm -f "$USER_HOME/.config/chromium/SingletonCookie"
fi
echo "Installation complete."
EOF EOF
chmod 555 $BUILD_DIR/DEBIAN/postinst chmod 555 $BUILD_DIR/DEBIAN/postinst

3
.gitignore vendored
View File

@@ -1,3 +1,4 @@
images/ images/
slideshowApp slideshowApp
schedule.json schedule.json
*.log

1
env/enviroment.go vendored
View File

@@ -13,6 +13,7 @@ const (
Host EnvKey = "HOST" Host EnvKey = "HOST"
Port EnvKey = "PORT" Port EnvKey = "PORT"
IntervalDefault EnvKey = "INTERVAL_DEFAULT" IntervalDefault EnvKey = "INTERVAL_DEFAULT"
LogPath EnvKey = "LOG_PATH"
) )
type EnvKey string type EnvKey string

7
go.mod
View File

@@ -3,7 +3,14 @@ module slideshowApp
go 1.25.4 go 1.25.4
require ( require (
gitea.tecamino.com/paadi/tecamino-logger v1.0.1
github.com/gorilla/mux v1.8.1 github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.3 github.com/gorilla/websocket v1.5.3
github.com/joho/godotenv v1.5.1 github.com/joho/godotenv v1.5.1
) )
require (
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.27.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
)

18
go.sum
View File

@@ -1,6 +1,24 @@
gitea.tecamino.com/paadi/tecamino-logger v1.0.1 h1:NCF/foyuf0wVKLkyy2y1FYvHo9pVaUuHc1GSU5bNVbc=
gitea.tecamino.com/paadi/tecamino-logger v1.0.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View File

@@ -4,20 +4,36 @@ import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"os" "os"
"slideshowApp/utils"
) )
type Schedule map[string]interface{} var scheduleFile = "./data/schedule.json"
type Schedule map[string]any
func SaveSchedule(w http.ResponseWriter, r *http.Request) { func SaveSchedule(w http.ResponseWriter, r *http.Request) {
var s Schedule var s Schedule
json.NewDecoder(r.Body).Decode(&s) if err := json.NewDecoder(r.Body).Decode(&s); err != nil {
data, _ := json.Marshal(s) utils.SendJSONError(w, "Invalid input", http.StatusBadRequest)
os.WriteFile("schedule.json", data, 0644) return
}
data, err := json.MarshalIndent(s, "", " ")
if err != nil {
utils.SendJSONError(w, "Encoding failed", http.StatusInternalServerError)
return
}
err = os.WriteFile(scheduleFile, data, 0644)
if err != nil {
utils.SendJSONError(w, "write file failed", http.StatusInternalServerError)
return
}
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
} }
func GetSchedule(w http.ResponseWriter, r *http.Request) { func GetSchedule(w http.ResponseWriter, r *http.Request) {
data, err := os.ReadFile("schedule.json") data, err := os.ReadFile(scheduleFile)
if err != nil { if err != nil {
json.NewEncoder(w).Encode(Schedule{}) json.NewEncoder(w).Encode(Schedule{})
return return

22
main.go
View File

@@ -10,6 +10,7 @@ import (
"slideshowApp/utils" "slideshowApp/utils"
"time" "time"
"gitea.tecamino.com/paadi/tecamino-logger/logging"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )
@@ -19,14 +20,25 @@ func main() {
env.Load(".env") env.Load(".env")
logConfig := logging.DefaultConfig()
logConfig.Debug = env.Env.GetValue() == "debug"
logger, err := logging.NewLogger(env.LogPath.GetValue(), logConfig)
if err != nil {
log.Fatal(err)
}
r := mux.NewRouter() r := mux.NewRouter()
uploadFolder := env.PhotoDir.GetValue() uploadFolder := env.PhotoDir.GetValue()
logger.Debug("main", "uploadfolder: "+uploadFolder)
if _, err := os.Stat(uploadFolder); err != nil { if _, err := os.Stat(uploadFolder); err != nil {
fmt.Println("upload folder for images not found: ", uploadFolder) fmt.Println("upload folder for images not found: ", uploadFolder)
logger.Error("main", "upload folder for images not found: "+uploadFolder)
fmt.Println("use fallback folder") fmt.Println("use fallback folder")
uploadFolder = "./images" uploadFolder = "./images"
logger.Info("main", "use fallback uploadfolder: "+uploadFolder)
env.PhotoDir.SetValue(uploadFolder) env.PhotoDir.SetValue(uploadFolder)
} }
@@ -60,11 +72,15 @@ func main() {
port := env.Port.GetValue() port := env.Port.GetValue()
url := fmt.Sprintf("%s:%s", host, port) url := fmt.Sprintf("%s:%s", host, port)
go func() { go func() {
logger.Debug("main", "start go routine with a 3 second wait")
time.Sleep(3 * time.Second) time.Sleep(3 * time.Second)
if err := utils.OpenBrowser(fmt.Sprintf("%s:%s/slideshow", handlers.GetLocalIP(), port)); err != nil { if err := utils.OpenBrowser(logger, fmt.Sprintf("%s:%s/slideshow", handlers.GetLocalIP(), port)); err != nil {
fmt.Println(err) logger.Error("main", err)
} }
}() }()
fmt.Println("Server running at", url) fmt.Println("Server running at", url)
log.Fatal(http.ListenAndServe(url, r)) logger.Info("main", "Server running at: "+url)
if err := http.ListenAndServe(url, r); err != nil {
logger.Error("main", err)
}
} }

12
utils/http.go Normal file
View File

@@ -0,0 +1,12 @@
package utils
import (
"encoding/json"
"net/http"
)
func SendJSONError(w http.ResponseWriter, message string, code int) {
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(code)
json.NewEncoder(w).Encode(map[string]string{"error": message})
}

View File

@@ -5,13 +5,17 @@ import (
"os" "os"
"os/exec" "os/exec"
"runtime" "runtime"
"strings"
"gitea.tecamino.com/paadi/tecamino-logger/logging"
) )
func OpenBrowser(url string) error { func OpenBrowser(logger *logging.Logger, url string) error {
var commands [][]string var commands [][]string
switch runtime.GOOS { switch runtime.GOOS {
case "windows": case "windows":
logger.Debug("OpenBrowser", "os: windows")
commands = [][]string{ commands = [][]string{
// Chrome (most common) // Chrome (most common)
{`C:\Program Files\Google\Chrome\Application\chrome.exe`, "--kiosk", url}, {`C:\Program Files\Google\Chrome\Application\chrome.exe`, "--kiosk", url},
@@ -30,6 +34,7 @@ func OpenBrowser(url string) error {
} }
case "darwin": case "darwin":
logger.Debug("OpenBrowser", "os: windows")
commands = [][]string{ commands = [][]string{
// Chrome // Chrome
{"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", "--kiosk", url}, {"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", "--kiosk", url},
@@ -48,6 +53,7 @@ func OpenBrowser(url string) error {
} }
default: // Linux default: // Linux
logger.Debug("OpenBrowser", "os: linux")
if os.Getenv("DISPLAY") == "" && if os.Getenv("DISPLAY") == "" &&
os.Getenv("WAYLAND_DISPLAY") == "" && os.Getenv("WAYLAND_DISPLAY") == "" &&
os.Getenv("XDG_SESSION_TYPE") != "wayland" { os.Getenv("XDG_SESSION_TYPE") != "wayland" {
@@ -71,6 +77,7 @@ func OpenBrowser(url string) error {
for _, cmd := range commands { for _, cmd := range commands {
execCmd := exec.Command(cmd[0], cmd[1:]...) execCmd := exec.Command(cmd[0], cmd[1:]...)
if err := execCmd.Start(); err == nil { if err := execCmd.Start(); err == nil {
logger.Debug("OpenBrowser", "browser started with command: "+strings.Join(cmd, ", "))
return nil return nil
} else { } else {
return err return err