4 Commits

Author SHA1 Message Date
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
Adrian Zürcher
8165b2d843 fix workflow take 3
All checks were successful
Build Slideshow App / build (amd64, , linux) (push) Successful in 1m24s
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 1m20s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 1m23s
Build Slideshow App / build (arm64, , linux) (push) Successful in 1m26s
2026-01-18 17:06:59 +01:00
Adrian Zürcher
e480141e89 fix workflow take 2 only linux
All checks were successful
Build Slideshow App / build (arm64, , linux) (push) Successful in 1m23s
2026-01-18 17:04:52 +01:00
8 changed files with 67 additions and 11 deletions

5
.env
View File

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

View File

@@ -98,6 +98,7 @@ jobs:
# 2. Create Directory Structure
mkdir -p $BUILD_DIR/usr/bin
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME
mkdir -p $BUILD_DIR/etc/systemd/system
mkdir -p $BUILD_DIR/DEBIAN
# 3. Copy Files
@@ -116,10 +117,12 @@ jobs:
cat <<EOF > $BUILD_DIR/etc/systemd/system/$PKG_NAME.service
[Unit]
Description=Slideshow Application Service
After=network.target
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
@@ -146,10 +149,10 @@ jobs:
#!/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
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."
echo ".env already exists, skipping template copy to preserve settings."
fi
echo "reload"

1
.gitignore vendored
View File

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

1
env/enviroment.go vendored
View File

@@ -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
View File

@@ -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
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/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=

22
main.go
View File

@@ -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)
}
}

View File

@@ -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