fix the backup funcionality

Wrapping the excludes in "" was a stupid idea. Since it's already a string it's
totally unnecessary.
This commit is contained in:
Andreas Zweili 2019-02-04 16:24:12 +01:00
parent d8e2129b47
commit 6ad26c4f3e
1 changed files with 19 additions and 12 deletions

View File

@ -53,17 +53,20 @@ def _process_prefix(prefix):
def _process_includes(includes): def _process_includes(includes):
return ' '.join(includes) processed_items = []
for item in includes:
processed_items.append(item)
return processed_items
def _process_excludes(excludes): def _process_excludes(excludes):
processed_items = []
if excludes: if excludes:
processed_items = []
for item in excludes: for item in excludes:
processed_items.append('--exclude=' + '"' + item + '"') processed_items.extend(['-e', item])
return ' '.join(processed_items) return processed_items
else: else:
return "" return processed_items
class BackupThread(QThread): class BackupThread(QThread):
@ -79,19 +82,23 @@ class BackupThread(QThread):
self.includes = _process_includes(includes) self.includes = _process_includes(includes)
self.excludes = _process_excludes(excludes) self.excludes = _process_excludes(excludes)
self.prefix = _process_prefix(prefix) self.prefix = _process_prefix(prefix)
self.create_command()
def stop(self): def stop(self):
self.p.kill() self.p.kill()
self.json_err = None self.json_err = None
def create_command(self):
self.command = ['borg', 'create', '--log-json', '--json',
('::'
+ self.prefix
+ '{now:%Y-%m-%d_%H:%M:%S}')]
self.command.extend(self.includes)
if self.excludes:
self.command.extend(self.excludes)
def run(self): def run(self):
self.p = subprocess.Popen(['borg', 'create', '--log-json', '--json', self.p = subprocess.Popen(self.command,
('::'
+ self.prefix
+ '{now:%Y-%m-%d_%H:%M:%S}'),
self.includes,
self.excludes],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
encoding='utf8') encoding='utf8')