h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

remove newline characters in moonraker.conf

Browse Source
This commit is contained in:
Staubgeborener
2024-04-17 15:27:18 +02:00
committed by GitHub
parent 65132b68e7
commit de506433d9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kiauh/extensions/klipper_backup/klipper_backup_extension.py
View File

@@ -18,6 +18,7 @@ from extensions.klipper_backup import (
KLIPPERBACKUP_REPO_URL, KLIPPERBACKUP_REPO_URL,
KLIPPERBACKUP_DIR, KLIPPERBACKUP_DIR,
KLIPPERBACKUP_CONFIG_DIR, KLIPPERBACKUP_CONFIG_DIR,
MOONRAKER_CONF,
) )
from utils.filesystem_utils import check_file_exist from utils.filesystem_utils import check_file_exist
@@ -79,7 +80,7 @@ class KlipperbackupExtension(BaseExtension):
return return
def remove_moonraker_entry(): def remove_moonraker_entry():
original_file_path = os.path.join(str(MOONRAKER_DIR), 'printer_data', 'config', 'moonraker.conf') original_file_path = MOONRAKER_CONF
comparison_file_path = os.path.join(str(KLIPPERBACKUP_DIR), 'install-files', 'moonraker.conf') comparison_file_path = os.path.join(str(KLIPPERBACKUP_DIR), 'install-files', 'moonraker.conf')
if not os.path.exists(original_file_path) or not os.path.exists(comparison_file_path): if not os.path.exists(original_file_path) or not os.path.exists(comparison_file_path):
return False return False
@@ -87,7 +88,8 @@ class KlipperbackupExtension(BaseExtension):
original_content = original_file.read() original_content = original_file.read()
comparison_content = comparison_file.read().strip() comparison_content = comparison_file.read().strip()
if comparison_content in original_content: if comparison_content in original_content:
modified_content = original_content.replace(comparison_content, '') modified_content = original_content.replace(comparison_content, '').strip()
modified_content = "\n".join(line for line in modified_content.split("\n") if line.strip())
with open(original_file_path, 'w') as original_file: with open(original_file_path, 'w') as original_file:
original_file.write(modified_content) original_file.write(modified_content)
return True return True