From 7da285b0e4910fd29385019fe56e00cfecb4a1d0 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Mon, 29 Jun 2020 03:10:07 +0000 Subject: [PATCH 1/2] Broader filter for restore files Signed-off-by: Ian Leonard --- resources/lib/modules/system.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/lib/modules/system.py b/resources/lib/modules/system.py index 2d224e35e..534247c30 100644 --- a/resources/lib/modules/system.py +++ b/resources/lib/modules/system.py @@ -462,10 +462,12 @@ def do_restore(self, listItem=None): restore_file_path = xbmcDialog.browse( 1, oe._(32373), 'files', - '??????????????.tar', + '.tar|.tar.gz|.tar.bz2|.tar.xz', False, False, - self.BACKUP_DESTINATION ) + self.BACKUP_DESTINATION, + False ) + # Do nothing if the dialog is cancelled - path will be the backup destination if not os.path.isfile(restore_file_path): return From 4cca0d49a4bb9bf79a3e6eb732b89342539d744d Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Mon, 29 Jun 2020 03:22:44 +0000 Subject: [PATCH 2/2] Compress backup tarballs with gzip Signed-off-by: Ian Leonard --- resources/lib/modules/system.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/lib/modules/system.py b/resources/lib/modules/system.py index 534247c30..89df27420 100644 --- a/resources/lib/modules/system.py +++ b/resources/lib/modules/system.py @@ -429,7 +429,8 @@ def do_backup(self, listItem=None): '', False, False, - self.BACKUP_DESTINATION ) + self.BACKUP_DESTINATION, + False ) if bckDir and os.path.exists(bckDir): # free space check @@ -446,8 +447,8 @@ def do_backup(self, listItem=None): self.backup_dlg.create('LibreELEC', oe._(32375)) if not os.path.exists(self.BACKUP_DESTINATION): os.makedirs(self.BACKUP_DESTINATION) - self.backup_file = oe.timestamp() + '.tar' - tar = tarfile.open(bckDir + self.backup_file, 'w') + self.backup_file = f'{oe.timestamp()}.tar.gz' + tar = tarfile.open(bckDir + self.backup_file, 'w:gz', compresslevel=1) for directory in self.BACKUP_DIRS: self.tar_add_folder(tar, directory) tar.close()