Compare commits
9 Commits
v0.0.12
...
0eb781a6d3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0eb781a6d3 | ||
|
|
9150550609 | ||
|
|
84abf6b820 | ||
|
|
4904589086 | ||
|
|
6f7e149c9a | ||
|
|
df344b4c13 | ||
|
|
d82f213ca7 | ||
|
|
3241429e98 | ||
|
|
8165b2d843 |
7
.env
7
.env
@@ -1,5 +1,8 @@
|
||||
ENV= #empty|development
|
||||
#empty|development|debug
|
||||
ENV=
|
||||
PHOTO_DIR=images
|
||||
HOST=0.0.0.0
|
||||
PORT=8080
|
||||
INTERVAL_DEFAULT=10
|
||||
INTERVAL_DEFAULT=10
|
||||
#path for logger files default {executable name}.log
|
||||
LOG_PATH=
|
||||
@@ -15,19 +15,19 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
#- os: windows
|
||||
# arch: amd64
|
||||
# ext: .exe
|
||||
#- os: linux
|
||||
# arch: amd64
|
||||
# ext: ""
|
||||
- os: windows
|
||||
arch: amd64
|
||||
ext: .exe
|
||||
- os: linux
|
||||
arch: amd64
|
||||
ext: ""
|
||||
- os: linux
|
||||
arch: arm64
|
||||
ext: ""
|
||||
#- os: linux
|
||||
# arch: arm
|
||||
# arm_version: 7
|
||||
# ext: ""
|
||||
- os: linux
|
||||
arch: arm
|
||||
arm_version: 7
|
||||
ext: ""
|
||||
|
||||
steps:
|
||||
|
||||
@@ -98,9 +98,12 @@ jobs:
|
||||
# 2. Create Directory Structure
|
||||
mkdir -p $BUILD_DIR/usr/bin
|
||||
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/DEBIAN
|
||||
|
||||
chown -R "$REAL_USER:$REAL_USER" /usr/share/slideshowapp/data
|
||||
|
||||
# 3. Copy Files
|
||||
cp ${APP_NAME} $BUILD_DIR/usr/bin/$PKG_NAME
|
||||
cp -r ./web $BUILD_DIR/usr/share/$PKG_NAME/
|
||||
@@ -113,23 +116,23 @@ jobs:
|
||||
echo "PORT=8080" > $BUILD_DIR/usr/share/$PKG_NAME/.env.template
|
||||
fi
|
||||
|
||||
# 5. Create the systemd Service File
|
||||
cat <<EOF > $BUILD_DIR/etc/systemd/system/$PKG_NAME.service
|
||||
[Unit]
|
||||
Description=Slideshow Application Service
|
||||
After=graphical.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Environment=DISPLAY=:0
|
||||
Environment=XAUTHORITY=/home/youruser/.Xauthority
|
||||
ExecStart=/usr/bin/$PKG_NAME
|
||||
WorkingDirectory=/usr/share/$PKG_NAME
|
||||
Restart=always
|
||||
User=root
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
# 5. Create a Template Autostart File (Instead of Systemd)
|
||||
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/setup
|
||||
cat <<'EOF' > $BUILD_DIR/usr/share/$PKG_NAME/setup/$PKG_NAME.desktop
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Slideshow App
|
||||
Exec=sh -c ' \
|
||||
i=0; \
|
||||
while [ $i -lt 30 ]; do \
|
||||
if [ "$(ls -A /media/$USER 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then \
|
||||
break; \
|
||||
fi; \
|
||||
i=$((i+1)); \
|
||||
sleep 1; \
|
||||
done; \
|
||||
cd /usr/share/slideshowapp && /usr/bin/slideshowapp'
|
||||
Terminal=false
|
||||
EOF
|
||||
|
||||
# 6. Create Control File
|
||||
@@ -139,28 +142,60 @@ jobs:
|
||||
Section: utils
|
||||
Priority: optional
|
||||
Architecture: $ARCH
|
||||
Maintainer: Your Name <you@example.com>
|
||||
Maintainer: Adrian Zuercher <zuercher@tecamino.ch>
|
||||
Description: Slideshow Application
|
||||
EOF
|
||||
|
||||
# 7. Optional: Add post-install script to enable service automatically
|
||||
echo "create service"
|
||||
cat <<EOF > $BUILD_DIR/DEBIAN/postinst
|
||||
# 7. Add post-install script for Autostart and Permissions
|
||||
cat <<'EOF' > $BUILD_DIR/DEBIAN/postinst
|
||||
#!/bin/sh
|
||||
# Check if .env exists in the target share folder
|
||||
if [ ! -f "/usr/share/$PKG_NAME/.env" ]; then
|
||||
echo "Creating new .env from template..."
|
||||
cp /usr/share/$PKG_NAME/.env.template /usr/share/$PKG_NAME/.env
|
||||
else
|
||||
echo ".env already exists, skipping template copy to preserve settings."
|
||||
set -e # Exit on error
|
||||
|
||||
# 1. Detect the real user
|
||||
# We use 'who' and 'awk' as a fallback because $SUDO_USER is sometimes empty in Gitea/CI environments
|
||||
REAL_USER=${SUDO_USER:-$(who | awk '{print $1}' | head -n1)}
|
||||
|
||||
# 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
|
||||
|
||||
echo "reload"
|
||||
systemctl daemon-reload
|
||||
echo "enable service"
|
||||
systemctl enable $PKG_NAME.service
|
||||
echo "start service"
|
||||
systemctl start $PKG_NAME.service
|
||||
USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||
|
||||
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 (THE FIX)
|
||||
# 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
|
||||
chmod 555 $BUILD_DIR/DEBIAN/postinst
|
||||
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +1,4 @@
|
||||
images/
|
||||
slideshowApp
|
||||
schedule.json
|
||||
schedule.json
|
||||
*.log
|
||||
1
env/enviroment.go
vendored
1
env/enviroment.go
vendored
@@ -13,6 +13,7 @@ const (
|
||||
Host EnvKey = "HOST"
|
||||
Port EnvKey = "PORT"
|
||||
IntervalDefault EnvKey = "INTERVAL_DEFAULT"
|
||||
LogPath EnvKey = "LOG_PATH"
|
||||
)
|
||||
|
||||
type EnvKey string
|
||||
|
||||
7
go.mod
7
go.mod
@@ -3,7 +3,14 @@ module slideshowApp
|
||||
go 1.25.4
|
||||
|
||||
require (
|
||||
gitea.tecamino.com/paadi/tecamino-logger v1.0.1
|
||||
github.com/gorilla/mux v1.8.1
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
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
18
go.sum
@@ -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/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
|
||||
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/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
|
||||
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=
|
||||
|
||||
@@ -4,20 +4,36 @@ import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"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) {
|
||||
var s Schedule
|
||||
json.NewDecoder(r.Body).Decode(&s)
|
||||
data, _ := json.Marshal(s)
|
||||
os.WriteFile("schedule.json", data, 0644)
|
||||
if err := json.NewDecoder(r.Body).Decode(&s); err != nil {
|
||||
utils.SendJSONError(w, "Invalid input", http.StatusBadRequest)
|
||||
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)
|
||||
}
|
||||
|
||||
func GetSchedule(w http.ResponseWriter, r *http.Request) {
|
||||
data, err := os.ReadFile("schedule.json")
|
||||
data, err := os.ReadFile(scheduleFile)
|
||||
if err != nil {
|
||||
json.NewEncoder(w).Encode(Schedule{})
|
||||
return
|
||||
|
||||
22
main.go
22
main.go
@@ -10,6 +10,7 @@ import (
|
||||
"slideshowApp/utils"
|
||||
"time"
|
||||
|
||||
"gitea.tecamino.com/paadi/tecamino-logger/logging"
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
|
||||
@@ -19,14 +20,25 @@ func main() {
|
||||
|
||||
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()
|
||||
|
||||
uploadFolder := env.PhotoDir.GetValue()
|
||||
logger.Debug("main", "uploadfolder: "+uploadFolder)
|
||||
|
||||
if _, err := os.Stat(uploadFolder); err != nil {
|
||||
fmt.Println("upload folder for images not found: ", uploadFolder)
|
||||
logger.Error("main", "upload folder for images not found: "+uploadFolder)
|
||||
fmt.Println("use fallback folder")
|
||||
uploadFolder = "./images"
|
||||
logger.Info("main", "use fallback uploadfolder: "+uploadFolder)
|
||||
env.PhotoDir.SetValue(uploadFolder)
|
||||
|
||||
}
|
||||
@@ -60,11 +72,15 @@ func main() {
|
||||
port := env.Port.GetValue()
|
||||
url := fmt.Sprintf("%s:%s", host, port)
|
||||
go func() {
|
||||
logger.Debug("main", "start go routine with a 3 second wait")
|
||||
time.Sleep(3 * time.Second)
|
||||
if err := utils.OpenBrowser(fmt.Sprintf("%s:%s/slideshow", handlers.GetLocalIP(), port)); err != nil {
|
||||
fmt.Println(err)
|
||||
if err := utils.OpenBrowser(logger, fmt.Sprintf("%s:%s/slideshow", handlers.GetLocalIP(), port)); err != nil {
|
||||
logger.Error("main", err)
|
||||
}
|
||||
}()
|
||||
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
12
utils/http.go
Normal 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})
|
||||
}
|
||||
@@ -5,13 +5,17 @@ import (
|
||||
"os"
|
||||
"os/exec"
|
||||
"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
|
||||
|
||||
switch runtime.GOOS {
|
||||
case "windows":
|
||||
logger.Debug("OpenBrowser", "os: windows")
|
||||
commands = [][]string{
|
||||
// Chrome (most common)
|
||||
{`C:\Program Files\Google\Chrome\Application\chrome.exe`, "--kiosk", url},
|
||||
@@ -30,6 +34,7 @@ func OpenBrowser(url string) error {
|
||||
}
|
||||
|
||||
case "darwin":
|
||||
logger.Debug("OpenBrowser", "os: windows")
|
||||
commands = [][]string{
|
||||
// Chrome
|
||||
{"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", "--kiosk", url},
|
||||
@@ -48,6 +53,7 @@ func OpenBrowser(url string) error {
|
||||
}
|
||||
|
||||
default: // Linux
|
||||
logger.Debug("OpenBrowser", "os: linux")
|
||||
if os.Getenv("DISPLAY") == "" &&
|
||||
os.Getenv("WAYLAND_DISPLAY") == "" &&
|
||||
os.Getenv("XDG_SESSION_TYPE") != "wayland" {
|
||||
@@ -71,6 +77,7 @@ func OpenBrowser(url string) error {
|
||||
for _, cmd := range commands {
|
||||
execCmd := exec.Command(cmd[0], cmd[1:]...)
|
||||
if err := execCmd.Start(); err == nil {
|
||||
logger.Debug("OpenBrowser", "browser started with command: "+strings.Join(cmd, ", "))
|
||||
return nil
|
||||
} else {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user