diff --git a/adds/changeCameraSettings.py b/adds/changeCameraSettings.py index 9f5c4e2..6db60f9 100644 --- a/adds/changeCameraSettings.py +++ b/adds/changeCameraSettings.py @@ -15,6 +15,7 @@ while True: splitted = line.split(":")[1].split("->") key = base64.b64decode(splitted[0]).decode() value = base64.b64decode(splitted[1]).decode() + print(key, value) if key.startswith("namespace_webcams"): webcams = True newValue = base64.b64encode(b"entries=1").decode() diff --git a/adds/setRuLanguage.py b/adds/setRuLanguage.py new file mode 100644 index 0000000..773676b --- /dev/null +++ b/adds/setRuLanguage.py @@ -0,0 +1,22 @@ +import base64 + +file = open("moonraker.db", "r") + +result = [] +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("uiSettings"): + newValue = base64.b64encode(value.replace('"locale": "zh-CN"', '"locale": "ru-RU"').encode()).decode() + fullNewStr = f"+16,{len(newValue)}:{splitted[0]}->{newValue}\n" + result.append(fullNewStr) + else: + result.append(line) +file.close() +file = open("moonraker_updated.db", "w") +file.write("".join(result)) +file.close() diff --git a/adds/start_ffmpeg.sh b/adds/start_ffmpeg.sh new file mode 100644 index 0000000..0a1a5ee --- /dev/null +++ b/adds/start_ffmpeg.sh @@ -0,0 +1,5 @@ +#!/bin/bash +sudo nginx -s reload +sudo mkdir /tmp/timelapse + +sudo /mjpgstreamer/mjpg_streamer -i "/mjpgstreamer/plugins/input_uvc/input_uvc.so -d /dev/video0 -r 1280x720 -f 5" -o "/mjpgstreamer/plugins/output_http/output_http.so -n -p 8080" diff --git a/bins/mjpgstreamer.tar.gz b/bins/mjpgstreamer.tar.gz new file mode 100644 index 0000000..2d1b6bc Binary files /dev/null and b/bins/mjpgstreamer.tar.gz differ diff --git a/bins/tgBot.tar b/bins/tgBot.tar deleted file mode 100644 index 273f389..0000000 Binary files a/bins/tgBot.tar and /dev/null differ diff --git a/bins/tgBot.tar.xz b/bins/tgBot.tar.xz new file mode 100644 index 0000000..707f4dc Binary files /dev/null and b/bins/tgBot.tar.xz differ diff --git a/installMjpgStreamer.sh b/installMjpgStreamer.sh new file mode 100644 index 0000000..95e7289 --- /dev/null +++ b/installMjpgStreamer.sh @@ -0,0 +1,24 @@ +#!/bin/bash +if [ "$#" -ne 1 ]; then + echo "You must provide your printerIp" + exit 1 +fi +cat << EOF | chroot /server/tmp /bin/bash +cd / +wget https://github.com/pjandro/fbS1Scripts/raw/refs/heads/main/bins/mjpgstreamer.tar.gz +tar xfvp mjpgstreamer.tar.gz +rm mjpgstreamer.tar.gz +sync +mv start_ffmpeg.sh start_ffmpeg.sh_back +wget https://raw.githubusercontent.com/pjandro/fbS1Scripts/refs/heads/main/adds/start_ffmpeg.sh +chmod +x ./start_ffmpeg.sh +cd /tmp +/home/gem/moonraker-env/bin/python3 /home/gem/moonraker/scripts/dbtool.py backup /home/gem/printer_data/database moonraker.db +wget https://raw.githubusercontent.com/pjandro/fbS1Scripts/refs/heads/main/adds/changeCameraSettings.py +/home/gem/moonraker-env/bin/python3 changeCameraSettings.py $1 +rm moonraker.db +/home/gem/moonraker-env/bin/python3 /home/gem/moonraker/scripts/dbtool.py restore /home/gem/printer_data/database moonraker_updated.db +rm moonraker_updated.db +rm changeCameraSettings.py +EOF +sync && sleep 2 && reboot diff --git a/installTgBot.sh b/installTgBot.sh index db45c4d..71c028e 100644 --- a/installTgBot.sh +++ b/installTgBot.sh @@ -6,9 +6,9 @@ fi cat << EOF | chroot /server/tmp /bin/bash apt install python3-virtualenv automake libtool libwebp-dev cd /home/gem -wget https://github.com/pjandro/fbS1Scripts/raw/refs/heads/main/bins/tgBot.tar -tar xfvp tgBot.tar -rm tgBot.tar +wget https://github.com/pjandro/fbS1Scripts/raw/refs/heads/main/bins/tgBot.tar.gz +tar xfvp tgBot.tar.gz +rm tgBot.tar.gz sync sleep 2 cp /home/gem/moonraker-telegram-bot/scripts/base_install_template /home/gem/printer_data/config/telegram-bot.cfg