Clean up, switch to pilpil

Dockerfile

@@ -1,2 +0,0 @@
-FROM bitnami/python:latest
-#RUN apt-get update && apt-get install -y openssh rsync 

app.py

@@ -15,7 +15,7 @@ config_locations = ["./", "~/.", "~/.config/"]
 for location in config_locations:
     # Optional config files, ~ is expanded to $HOME on *nix, %USERPROFILE% on windows
     # ~ app.config.from_file("videopi.toml", load=toml.load, silent=True)
-    if app.config.from_file(os.path.expanduser( location + "videopi.toml"), load=toml.load, silent=True):
+    if app.config.from_file(os.path.expanduser( location + "pilpil.toml"), load=toml.load, silent=True):
         print("Found configuration file in " + os.path.expanduser( location ))
     # ~ app.config.from_file(os.path.expanduser("~/.config/videopi.toml"), load=toml.load, silent=True)
 
@@ -120,6 +120,7 @@ def checkHosts(host_l):
 # File utilities
 
 def listMediaFiles(folder):
+    if os.path.exists(folder):
         files = os.listdir(folder);
         medias = []
         for fd in files:
@@ -127,6 +128,8 @@ def listMediaFiles(folder):
                 if fd.split('.')[1] in media_exts:
                     medias.append(fd)
         return medias
+    else:
+        return []
 
 def httpUpload(filename, hostl, trailing_slash=1):
     import requests

changelog_todo.md

@@ -38,7 +38,7 @@ sha256 : 0fe3fe76d0e56e445124fa20646fa8b3d8c59568786b3ebc8a96d83d92f203e3
  * get_client_rssi.sh on server
 
 # TODO :
-  
+ * FR localisation
  * GUI : Btn hover/press ?
  * ~ Test static IP
  * Test with several rpis

docker-compose.yml

@@ -1,34 +0,0 @@
-version: '3.8' # or '2.4'      # add
-services:                      # add
-    videopi:
-      build: 
-          context: .
-          dockerfile: Dockerfile
-      ports:
-        - "8080:8080"
-        - "8887:8887"
-        - "8888:8888"
-      #~ command: "sh -c 'sleep 3600'"
-      command: "sh -c 'pip install -r requirements.txt && sleep 3600'"
-      volumes:
-        - .:/app
-        - ../medias:/medias
-      networks:
-        - dockervlan
-
-networks:
-  dockervlan:
-    name: dockervlan
-    driver: macvlan
-    driver_opts:
-      parent: wlo1
-    ipam:
-      config:
-        - subnet: "10.42.0.1/24"
-          ip_range: "10.42.0.1/26"
-          gateway: "10.42.0.1"
-#~ docker network create -d macvlan \
-    #~ --subnet=10.42.0.1/24 \
-    #~ --gateway=10.42.0.1  \
-    #~ -o parent=wlo1 \
-     #~ vpi-macvlan-net

linux_server_deploy.sh

@@ -3,6 +3,28 @@
 # Options
 # Device block to write on 
 # TODO : Add flags check
+# Colored output
+#~ set +x
+bold=$(tput bold)
+function red(){
+    echo -e "${bold}\x1B[31m$1 \x1B[0m"
+    if [ ! -z "${2}" ]; then
+    echo -e "\x1B[31m $($2) \x1B[0m"
+    fi
+}
+function green(){
+    echo -e "${bold}\x1B[32m$1 \x1B[0m"
+    if [ ! -z "${2}" ]; then
+    echo -e "\x1B[32m $($2) \x1B[0m"
+    fi
+}
+function yellow(){
+    echo -e "${bold}\x1B[33m$1 \x1B[0m"
+    if [ ! -z "${2}" ]; then
+    echo -e "\x1B[33m $($2) \x1B[0m"
+    fi
+}
+
 SDCARD=$1
 if [ "$SDCARD" == "" ]
 then 
@@ -29,27 +51,6 @@ BAND="bg"
 # Set channel manually
 #~ CHAN="802-11-wireless.channel 1"
 #
-# Colored output
-#~ set +x
-bold=$(tput bold)
-function red(){
-    echo -e "${bold}\x1B[31m$1 \x1B[0m"
-    if [ ! -z "${2}" ]; then
-    echo -e "\x1B[31m $($2) \x1B[0m"
-    fi
-}
-function green(){
-    echo -e "${bold}\x1B[32m$1 \x1B[0m"
-    if [ ! -z "${2}" ]; then
-    echo -e "\x1B[32m $($2) \x1B[0m"
-    fi
-}
-function yellow(){
-    echo -e "${bold}\x1B[33m$1 \x1B[0m"
-    if [ ! -z "${2}" ]; then
-    echo -e "\x1B[33m $($2) \x1B[0m"
-    fi
-}
 #
 #  0. Create AP connection
 #

selfCA.crt

@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFSDCCAzCgAwIBAgIUEKUzrybb9J5ifuzwIHIWRqY+Cf8wDQYJKoZIhvcNAQEL
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+uJq+fMPPexD/NnL9PdpFta6xDGB+2qkc3NOAXLRYd1WoBvt0OVFVnou8bghBOT1I
-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
+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
-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
+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
-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
+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
-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
+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
-fg2QHuOGfDqjSD7NU30YbUkO8J8bnOhhxhSaWGTMSWbbAgMBAAGjcDBuMB0GA1Ud
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+PlLcjE24t1M8AYOHNSSU5FyFVrT+zJ/OvJ/62UgeO5UXlwKqexfNUT3bll5WP9iV
-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
+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
-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
+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
-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
+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
-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
+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
-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
+AR1LTJzOLE4Jjghi1xxhRe96ydZ1d8IVvykkkvACW3cJqTh3vorwNCEDvhj1D7G+
-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
+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
-CjXf2+U9g1RYwZSx
+DC8=
 -----END CERTIFICATE-----

vlctest

@@ -1,60 +0,0 @@
-#!/bin/bash
-# E.G : ./vlctest "enqueue tst.mp4" pause "seek 0" play
-
-# Parse options 
-
-h_set=0
-#~ s_set=0
-#~ d_set=0
-while getopts "h:" OPT; do
-  case "$OPT" in
-    h)
-      echo "Sending to ${OPTARG}"
-      h_set=1
-      ADDRESSES=("${OPTARG}")
-      shift $((OPTIND-1))
-      CMDS="$*"
-      ;;
-    #~ c)
-      #~ c_set=1
-      #~ CMDS=("${OPTARG}")
-    #~ s) s_set=1;;
-    #~ d) d_set=1;;
-    *) # getopts produces error
-       exit 1;;
-  esac
-done
-
-# If no host provided, use all by default
-#~ if ((!h_set && OPTIND>$#)) ; then
-if ((!h_set)) ; then
-  echo "Sending to all hosts"
-  # RPIs wlan adresses
-  ADDRESSES=("10.42.0.1" "10.42.0.135" "10.42.0.142")
-  CMDS="$*"
-  echo ${ADDRESSES[@]}
-fi
-# Split str into args 
-readarray -d "+" -t CMDAR <<< "$CMDS"
-echo ${CMDAR[@]}
-
-# Telnet password
-PASSWD="secret"
-
-# Send commands
-for ADDR in ${ADDRESSES[@]}
-do
-    echo "Sending command $1 and $2 to $ADDR..."
-    echo -e "$PASSWD\n${CMDAR[0]}\n${CMDAR[1]}" | nc "$ADDR" 9999 -w 5 &
-    #~ echo -e "$PASSWD\n$1\n$2" | nc "$ADDR" 9999 -w 5 &
-#    echo -e "$PASSWD\n$1\n$2" | nc "$ADDR" 9999 -w 5 | sed '/Welcome/d;/VLC/d;/Password/d;' &
-#    echo -e "$PASSWD\n$1\n$2" | nc "$ADDR" 9999 > /dev/null &
-done
-sleep 1
-for ADDR in ${ADDRESSES[@]}
-do
-    echo "Sending command ${CMDAR[2]} and ${CMDAR[3]} to $ADDR..."
-    echo -e "$PASSWD\n${CMDAR[2]}\n${CMDAR[3]}" | nc "$ADDR" 9999 > /dev/null &
-    #~ echo "Sending command $3 and $4} to $ADDR..."
-    #~ echo -e "$PASSWD\n$2\n$4" | nc "$ADDR" 9999 > /dev/null &
-done