3 Commits

Author SHA1 Message Date
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
3 changed files with 46 additions and 15 deletions

View File

@@ -98,9 +98,12 @@ 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
chown -R "$REAL_USER:$REAL_USER" /usr/share/slideshowapp/data
# 3. Copy Files # 3. Copy Files
cp ${APP_NAME} $BUILD_DIR/usr/bin/$PKG_NAME cp ${APP_NAME} $BUILD_DIR/usr/bin/$PKG_NAME
cp -r ./web $BUILD_DIR/usr/share/$PKG_NAME/ cp -r ./web $BUILD_DIR/usr/share/$PKG_NAME/
@@ -115,14 +118,14 @@ 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)); \

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

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