YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Backup to uncompressed tar by default

Browse source
This commit is contained in:
Alexandre Aubin 2020-06-15 22:23:26 +02:00
parent 84d325495b
commit 1a537039c7
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/yunohost/backup.py
View file

@ -1862,7 +1862,10 @@ class TarBackupMethod(BackupMethod):
@property @property
def _archive_file(self): def _archive_file(self):
"""Return the compress archive path""" """Return the compress archive path"""
return os.path.join(self.repo, self.name + '.tar.gz') f = os.path.join(self.repo, self.name + '.tar')
if os.path.exists(f + ".gz"):
f += ".gz"
return f
def backup(self): def backup(self):
""" """
@ -1885,7 +1888,7 @@ class TarBackupMethod(BackupMethod):
# Open archive file for writing # Open archive file for writing
try: try:
tar = tarfile.open(self._archive_file, "w:gz") tar = tarfile.open(self._archive_file, "w:gz" if self._archive_file.endswith(".gz") else "w")
except: except:
logger.debug("unable to open '%s' for writing", logger.debug("unable to open '%s' for writing",
self._archive_file, exc_info=1) self._archive_file, exc_info=1)
@ -1909,7 +1912,7 @@ class TarBackupMethod(BackupMethod):
# If backuped to a non-default location, keep a symlink of the archive # If backuped to a non-default location, keep a symlink of the archive
# to that location # to that location
link = os.path.join(ARCHIVES_PATH, self.name + '.tar.gz') link = os.path.join(ARCHIVES_PATH, self.name + '.tar')
if not os.path.isfile(link): if not os.path.isfile(link):
os.symlink(self._archive_file, link) os.symlink(self._archive_file, link)
@ -1928,7 +1931,7 @@ class TarBackupMethod(BackupMethod):
# Mount the tarball # Mount the tarball
logger.debug(m18n.n("restore_extracting")) logger.debug(m18n.n("restore_extracting"))
try: try:
tar = tarfile.open(self._archive_file, "r:gz") tar = tarfile.open(self._archive_file, "r:gz" if self._archive_file.endswith(".gz") else "r")
except: except:
logger.debug("cannot open backup archive '%s'", logger.debug("cannot open backup archive '%s'",
self._archive_file, exc_info=1) self._archive_file, exc_info=1)
@ -1997,7 +2000,7 @@ class TarBackupMethod(BackupMethod):
tar.close() tar.close()
def copy(self, file, target): def copy(self, file, target):
tar = tarfile.open(self._archive_file, "r:gz") tar = tarfile.open(self._archive_file, "r:gz" if self._archive_file.endswith(".gz") else "r")
file_to_extract = tar.getmember(file) file_to_extract = tar.getmember(file)
# Remove the path # Remove the path
file_to_extract.name = os.path.basename(file_to_extract.name) file_to_extract.name = os.path.basename(file_to_extract.name)
@ -2284,9 +2287,14 @@ def backup_list(with_info=False, human_readable=False):
""" """
# Get local archives sorted according to last modification time # Get local archives sorted according to last modification time
archives = sorted(glob("%s/*.tar.gz" % ARCHIVES_PATH), key=lambda x: os.path.getctime(x)) archives = sorted(glob("%s/*.tar.gz" % ARCHIVES_PATH) + glob("%s/*.tar" % ARCHIVES_PATH), key=lambda x: os.path.getctime(x))
# Extract only filename without the extension # Extract only filename without the extension
archives = [os.path.basename(f)[:-len(".tar.gz")] for f in archives] def remove_extension(f):
if f.endswith(".tar.gz"):
return os.path.basename(f)[:-len(".tar.gz")]
else:
return os.path.basename(f)[:-len(".tar")]
archives = [remove_extension(f) for f in archives]
if with_info: if with_info:
d = OrderedDict() d = OrderedDict()
@ -2314,11 +2322,13 @@ def backup_info(name, with_details=False, human_readable=False):
human_readable -- Print sizes in human readable format human_readable -- Print sizes in human readable format
""" """
archive_file = '%s/%s.tar.gz' % (ARCHIVES_PATH, name) archive_file = '%s/%s.tar' % (ARCHIVES_PATH, name)
# Check file exist (even if it's a broken symlink) # Check file exist (even if it's a broken symlink)
if not os.path.lexists(archive_file): if not os.path.lexists(archive_file):
raise YunohostError('backup_archive_name_unknown', name=name) archive_file += ".gz"
if not os.path.lexists(archive_file):
raise YunohostError('backup_archive_name_unknown', name=name)
# If symlink, retrieve the real path # If symlink, retrieve the real path
if os.path.islink(archive_file): if os.path.islink(archive_file):
@ -2332,7 +2342,7 @@ def backup_info(name, with_details=False, human_readable=False):
info_file = "%s/%s.info.json" % (ARCHIVES_PATH, name) info_file = "%s/%s.info.json" % (ARCHIVES_PATH, name)
if not os.path.exists(info_file): if not os.path.exists(info_file):
tar = tarfile.open(archive_file, "r:gz") tar = tarfile.open(archive_file, "r:gz" if archive_file.endswith(".gz") else "r")
info_dir = info_file + '.d' info_dir = info_file + '.d'
try: try:
@ -2368,7 +2378,7 @@ def backup_info(name, with_details=False, human_readable=False):
# Retrieve backup size # Retrieve backup size
size = info.get('size', 0) size = info.get('size', 0)
if not size: if not size:
tar = tarfile.open(archive_file, "r:gz") tar = tarfile.open(archive_file, "r:gz" if archive_file.endswith(".gz") else "r")
size = reduce(lambda x, y: getattr(x, 'size', x) + getattr(y, 'size', y), size = reduce(lambda x, y: getattr(x, 'size', x) + getattr(y, 'size', y),
tar.getmembers()) tar.getmembers())
tar.close() tar.close()
@ -2428,7 +2438,9 @@ def backup_delete(name):
hook_callback('pre_backup_delete', args=[name]) hook_callback('pre_backup_delete', args=[name])
archive_file = '%s/%s.tar.gz' % (ARCHIVES_PATH, name) archive_file = '%s/%s.tar' % (ARCHIVES_PATH, name)
if os.path.exists(archive_file + ".gz"):
archive_file += '.gz'
info_file = "%s/%s.info.json" % (ARCHIVES_PATH, name) info_file = "%s/%s.info.json" % (ARCHIVES_PATH, name)
files_to_delete = [archive_file, info_file] files_to_delete = [archive_file, info_file]