added a clean path function and applied it to rotate backups

This commit is contained in:
Rob Weber 2019-12-30 10:09:01 -06:00
parent 51f2ef3973
commit e63560f0c4
2 changed files with 13 additions and 10 deletions

View File

@ -465,9 +465,9 @@ class XbmcBackup:
if(dirs[remove_num][0].split('.')[-1] == 'zip'):
# this is a file, remove it that way
self.remote_vfs.rmfile(self.remote_vfs.root_path + dirs[remove_num][0])
self.remote_vfs.rmfile(self.remote_vfs.clean_path(self.remote_base_path) + dirs[remove_num][0])
else:
self.remote_vfs.rmdir(self.remote_vfs.root_path + dirs[remove_num][0] + "/")
self.remote_vfs.rmdir(self.remote_vfs.clean_path(self.remote_base_path) + dirs[remove_num][0] + "/")
remove_num = remove_num + 1

View File

@ -17,16 +17,19 @@ class Vfs:
def __init__(self, rootString):
self.set_root(rootString)
def clean_path(self, path):
# fix slashes
path = path.replace("\\", "/")
# check if trailing slash is included
if(path[-1:] != '/'):
path = path + '/'
return path
def set_root(self, rootString):
old_root = self.root_path
self.root_path = rootString
# fix slashes
self.root_path = self.root_path.replace("\\", "/")
# check if trailing slash is included
if(self.root_path[-1:] != "/"):
self.root_path = self.root_path + "/"
self.root_path = self.clean_path(rootString)
# return the old root
return old_root