diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..62c8935 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file diff --git a/addHosts.sh b/addHosts.sh new file mode 100644 index 0000000..d72df97 --- /dev/null +++ b/addHosts.sh @@ -0,0 +1,9 @@ +#!/bin/bash +cat << EOF | tee -a /server/tmp/etc/hosts +185.199.111.133 raw.githubusercontent.com +151.101.66.132 deb.debian.org +167.82.48.223 files.pythonhosted.org +149.154.167.220 api.telegram.org +140.82.121.4 github.com +EOF +sync diff --git a/adds/changeCameraSettings.py b/adds/changeCameraSettings.py new file mode 100644 index 0000000..9f5c4e2 --- /dev/null +++ b/adds/changeCameraSettings.py @@ -0,0 +1,37 @@ +import base64 +import sys + +file = open("moonraker.db", "r") + +result = [] +printerIp = sys.argv[1] +pattern = '{"name": "timelapse", "service": "mjpegstreamer", "targetFps": 15, "urlStream": "http://{printerIp}:8080/?action=stream", "urlSnapshot": "http://{printerIp}:8080/?action=snapshot", "flipX": false, "flipY": false, "enabled": true, "targetFpsIdle": 5, "aspectRatio": "4:3", "icon": "mdiWebcam", "location": "printer", "rotation": 0, "extra_data": {}}' +webcams = False +webCamAdded = False +while True: + line = file.readline() + if not line: + break + splitted = line.split(":")[1].split("->") + key = base64.b64decode(splitted[0]).decode() + value = base64.b64decode(splitted[1]).decode() + if key.startswith("namespace_webcams"): + webcams = True + newValue = base64.b64encode(b"entries=1").decode() + fullNewStr = f"+24,{len(newValue)}:{splitted[0]}->{newValue}\n" + result.append(fullNewStr) + continue + if webcams: + if webCamAdded: + continue + newValue = pattern.replace("{printerIp}", printerIp) + newValue = base64.b64encode(newValue.encode()).decode() + fullNewStr = f"+48,{len(newValue)}:{splitted[0]}->{newValue}\n" + result.append(fullNewStr) + webCamAdded = True + else: + result.append(line) +file.close() +file = open("moonraker_updated.db", "w") +file.write("".join(result)) +file.close() diff --git a/adds/tgBot.sh b/adds/tgBot.sh index faaa5ae..49d51da 100644 --- a/adds/tgBot.sh +++ b/adds/tgBot.sh @@ -1,4 +1,6 @@ #!/bin/bash +sleep 15 + cd /home/gem/moonraker-telegram-bot /home/gem/moonraker-telegram-bot-env/bin/python /home/gem/moonraker-telegram-bot/bot/main.py -c /home/gem/printer_data/config/telegram-bot.cfg -l /tmp/tgBot.log diff --git a/nano.deb b/bins/nano.deb similarity index 100% rename from nano.deb rename to bins/nano.deb diff --git a/overlay.7z b/bins/overlay.7z similarity index 100% rename from overlay.7z rename to bins/overlay.7z diff --git a/universalInstaller.py b/universalInstaller.py new file mode 100644 index 0000000..d7e4a0b --- /dev/null +++ b/universalInstaller.py @@ -0,0 +1,4 @@ +import base64 +import subprocess + +# WIP \ No newline at end of file