Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f8dce0b817 | ||
|
|
0eb781a6d3 | ||
|
|
9150550609 | ||
|
|
84abf6b820 |
@@ -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
|
||||||
|
|
||||||
@@ -115,20 +116,20 @@ jobs:
|
|||||||
|
|
||||||
# 5. Create a Template Autostart File (Instead of Systemd)
|
# 5. Create a Template Autostart File (Instead of Systemd)
|
||||||
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/setup
|
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/setup
|
||||||
cat <<EOF > $BUILD_DIR/usr/share/$PKG_NAME/setup/$PKG_NAME.desktop
|
cat <<'EOF' > $BUILD_DIR/usr/share/$PKG_NAME/setup/$PKG_NAME.desktop
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=Slideshow App
|
Name=Slideshow App
|
||||||
Exec=sh -c ' \
|
Exec=sh -c ' \
|
||||||
i=0; \
|
i=0; \
|
||||||
while [ $i -lt 30 ]; do \
|
while [ $i -lt 30 ]; do \
|
||||||
if [ "$(ls -A "/media/$REAL_USER" 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then \
|
if [ "$(ls -A /media/$USER 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then \
|
||||||
break; \
|
break; \
|
||||||
fi; \
|
fi; \
|
||||||
i=$((i+1)); \
|
i=$((i+1)); \
|
||||||
sleep 1; \
|
sleep 1; \
|
||||||
done; \
|
done; \
|
||||||
cd /usr/share/slideshowapp && /usr/bin/slideshowapp'
|
cd /usr/share/slideshowapp && /usr/bin/slideshowapp'
|
||||||
Terminal=false
|
Terminal=false
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
@@ -159,6 +160,10 @@ jobs:
|
|||||||
|
|
||||||
USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
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 "Post-install: Target user is $REAL_USER"
|
echo "Post-install: Target user is $REAL_USER"
|
||||||
echo "Post-install: Target home is $USER_HOME"
|
echo "Post-install: Target home is $USER_HOME"
|
||||||
|
|
||||||
@@ -168,7 +173,7 @@ jobs:
|
|||||||
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
|
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3. Setup Autostart (THE FIX)
|
# 3. Setup Autostart
|
||||||
# We use -p to ensure parent directories exist and set ownership immediately
|
# We use -p to ensure parent directories exist and set ownership immediately
|
||||||
AUTOSTART_DIR="$USER_HOME/.config/autostart"
|
AUTOSTART_DIR="$USER_HOME/.config/autostart"
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
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})
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user