Compare commits
5 Commits
7aef03a7cd
...
v0.0.25
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46a56e130f | ||
|
|
aa900d5e3b | ||
|
|
91cb3a48f8 | ||
|
|
e05c3a06ae | ||
|
|
5e551b4eaf |
2
.env
2
.env
@@ -1,5 +1,5 @@
|
||||
#empty|development|debug
|
||||
ENV=
|
||||
ENV=
|
||||
PHOTO_DIR=images
|
||||
HOST=0.0.0.0
|
||||
PORT=8080
|
||||
|
||||
@@ -92,7 +92,7 @@ jobs:
|
||||
ARCH=${{ matrix.arch }}
|
||||
if [ "$ARCH" == "arm" ]; then ARCH="armhf"; fi
|
||||
|
||||
PKG_NAME="slideshowapp"
|
||||
PKG_NAME="${APP_NAME}"
|
||||
BUILD_DIR="${PKG_NAME}_${VERSION}_${ARCH}"
|
||||
|
||||
# 2. Create Directory Structure
|
||||
@@ -120,7 +120,7 @@ jobs:
|
||||
[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'
|
||||
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/$PKG_NAME && /usr/bin/$PKG_NAME'
|
||||
Terminal=false
|
||||
EOF
|
||||
|
||||
@@ -151,17 +151,17 @@ jobs:
|
||||
|
||||
USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||
|
||||
echo "Setting permissions for /usr/share/slideshowapp..."
|
||||
chown -R "$REAL_USER:$REAL_USER" /usr/share/slideshowapp
|
||||
chmod -R 755 /usr/share/slideshowapp
|
||||
echo "Setting permissions for /usr/share/$PKG_NAME..."
|
||||
chown -R "$REAL_USER:$REAL_USER" /usr/share/$PKG_NAME
|
||||
chmod -R 755 /usr/share/$PKG_NAME
|
||||
|
||||
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
|
||||
if [ ! -f "/usr/share/$PKG_NAME/.env" ]; then
|
||||
echo "Creating .env from template..."
|
||||
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
|
||||
cp /usr/share/$PKG_NAME/env.template /usr/share/$PKG_NAME/.env || true
|
||||
fi
|
||||
|
||||
# 3. Setup Autostart
|
||||
@@ -171,11 +171,11 @@ jobs:
|
||||
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/"
|
||||
cp /usr/share/$PKG_NAME/setup/$PKG_NAME.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"
|
||||
chmod 644 "$AUTOSTART_DIR/$PKG_NAME.desktop"
|
||||
else
|
||||
echo "ERROR: Home directory $USER_HOME not found. Autostart not configured."
|
||||
fi
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,4 +1,5 @@
|
||||
images/
|
||||
slideshowApp
|
||||
schedule.json
|
||||
*.log
|
||||
*.log
|
||||
*.exe
|
||||
8
env/enviroment.go
vendored
8
env/enviroment.go
vendored
@@ -26,7 +26,13 @@ func Load(path string) error {
|
||||
}
|
||||
|
||||
func (key EnvKey) GetValue() string {
|
||||
return os.Getenv(string(key))
|
||||
keyStr := string(key)
|
||||
value := os.Getenv(keyStr)
|
||||
if key == Port && value == "" {
|
||||
value = "8080"
|
||||
}
|
||||
|
||||
return value
|
||||
}
|
||||
|
||||
func (key EnvKey) SetValue(value string) {
|
||||
|
||||
@@ -20,34 +20,39 @@ func GetLocalIP() string {
|
||||
}
|
||||
|
||||
func getActiveIP() string {
|
||||
conn, err := net.Dial("udp", "8.8.8.8:80")
|
||||
addrs, err := net.InterfaceAddrs()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
addr := conn.LocalAddr()
|
||||
if udpAddr, ok := addr.(*net.UDPAddr); ok {
|
||||
return udpAddr.IP.String()
|
||||
for _, address := range addrs {
|
||||
if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
|
||||
|
||||
if ipnet.IP.To4() != nil {
|
||||
ipStr := ipnet.IP.String()
|
||||
|
||||
if ipnet.IP.IsLinkLocalUnicast() {
|
||||
continue
|
||||
}
|
||||
|
||||
return ipStr
|
||||
}
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func InfoHandler(w http.ResponseWriter, r *http.Request) {
|
||||
port := env.Port.GetValue()
|
||||
if port == "" {
|
||||
port = "8080"
|
||||
}
|
||||
|
||||
speed := env.IntervalDefault.GetValue()
|
||||
if speed == "" {
|
||||
speed = "10"
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
data := map[string]string{
|
||||
"ip": GetLocalIP(),
|
||||
"port": port,
|
||||
"port": env.Port.GetValue(),
|
||||
"speed": GetInterval(),
|
||||
}
|
||||
json.NewEncoder(w).Encode(data)
|
||||
err := json.NewEncoder(w).Encode(data)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user