Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-11-21 14:38:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

show missing content in commandline if restore of config fails

Browse source
This commit is contained in:
avollkopf 2024-05-31 15:36:19 +02:00
parent cdf70b8eb7
commit 6cc4d3e19b
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cbpi/__init__.py
View file

@ -1,3 +1,3 @@
__version__ = "4.4.1.a13" __version__ = "4.4.1.a14"
__codename__ = "Yeast Starter" __codename__ = "Yeast Starter"

16
cbpi/configFolder.py
View file

@ -46,16 +46,28 @@ class ConfigFolder:
if os.path.exists(os.path.join(backupfile)) is True: if os.path.exists(os.path.join(backupfile)) is True:
print("***************************************************") print("***************************************************")
print("Found backup of config. Starting restore") print("Found backup of config. Starting restore")
required_content=['dashboard/', 'recipes/', 'upload/', 'config.json', 'config.yaml'] required_content=['dashboard/',
'recipes/',
'upload/',
'sensor.json',
'actor.json',
'kettle.json',
'config.json',
'craftbeerpi.template',
'chromium.desktop',
'config.yaml']
zip=zipfile.ZipFile(backupfile) zip=zipfile.ZipFile(backupfile)
zip_content_list = zip.namelist() zip_content_list = zip.namelist()
zip_content = True zip_content = True
missing_content=[]
print("Checking content of zip file") print("Checking content of zip file")
for content in required_content: for content in required_content:
try: try:
check = zip_content_list.index(content) check = zip_content_list.index(content)
except: except:
zip_content = False zip_content = False
missing_content.append(content)
if zip_content == True: if zip_content == True:
print("Found correct content. Starting Restore process") print("Found correct content. Starting Restore process")
@ -78,7 +90,9 @@ class ConfigFolder:
print("contents of restored_config.zip file have been restored.") print("contents of restored_config.zip file have been restored.")
print("in case of a partial backup you will still be prompted to run 'cbpi setup'.") print("in case of a partial backup you will still be prompted to run 'cbpi setup'.")
else: else:
zip.close()
print("Wrong Content in zip file. No restore possible") print("Wrong Content in zip file. No restore possible")
print(f'These files are missing {missing_content}')
print("renaming zip file so it will be ignored on the next start") print("renaming zip file so it will be ignored on the next start")
try: try:
os.rename(backupfile, os.path.join(self.configFolderPath, "UNRESTORABLE_restored_config.zip")) os.rename(backupfile, os.path.join(self.configFolderPath, "UNRESTORABLE_restored_config.zip"))