startswith correction
Browse files- dropbox_handler.py +4 -4
dropbox_handler.py
CHANGED
|
@@ -40,7 +40,7 @@ def normalizeFilename(filename):
|
|
| 40 |
def getDropboxFilename(localFilename):
|
| 41 |
""" localFilename is $DROP_DIR2/<subpath>/<filename>"""
|
| 42 |
""" dropboxFilename is $APP_PATH/<subpath>/<filename"""
|
| 43 |
-
if not localFilename.
|
| 44 |
localFilename=os.environ['DROP_DIR2']+localFilename
|
| 45 |
localFilename=normalizeFilename(localFilename)
|
| 46 |
return normalizeFilename(localFilename.replace(os.environ['DROP_DIR2'],"/",1).replace("/",os.environ['APP_PATH'],1))
|
|
@@ -48,7 +48,7 @@ def getDropboxFilename(localFilename):
|
|
| 48 |
def getLocalFilename(dropboxFilename):
|
| 49 |
""" localFilename is $DROP_DIR2/<subpath>/<filename>"""
|
| 50 |
""" dropboxFilename is $APP_PATH/<subpath>/<filename"""
|
| 51 |
-
if not dropboxFilename.
|
| 52 |
dropboxFilename=os.environ['APP_PATH']+dropboxFilename
|
| 53 |
dropboxFilename=normalizeFilename(dropboxFilename)
|
| 54 |
return normalizeFilename(dropboxFilename.replace(os.environ['APP_PATH'],"/",1).replace("/",os.environ['DROP_DIR2'],1))
|
|
@@ -107,7 +107,7 @@ def restoreFile(dropboxFilename):
|
|
| 107 |
def backupFolder(localFolder):
|
| 108 |
""" list all files in folder and subfolder and upload them"""
|
| 109 |
print("backup folder called for ",localFolder)
|
| 110 |
-
if not localFolder.
|
| 111 |
localFolder=os.environ['DROP_DIR2']+localFolder
|
| 112 |
filenames=[]
|
| 113 |
for (root,dirs,files) in os.walk(localFolder, topdown=True):
|
|
@@ -121,7 +121,7 @@ def backupFolder(localFolder):
|
|
| 121 |
def restoreFolder(dropboxFolder):
|
| 122 |
""" list all files in dropbox folder and subfolders and restore them"""
|
| 123 |
global TOKEN
|
| 124 |
-
if not dropboxFolder.
|
| 125 |
dropboxFolder=os.environ['APP_PATH']+dropboxFolder
|
| 126 |
try:
|
| 127 |
res=dbx.files_list_folder(dropboxFolder)
|
|
|
|
| 40 |
def getDropboxFilename(localFilename):
|
| 41 |
""" localFilename is $DROP_DIR2/<subpath>/<filename>"""
|
| 42 |
""" dropboxFilename is $APP_PATH/<subpath>/<filename"""
|
| 43 |
+
if not localFilename.startswith(os.environ['DROP_DIR2']):
|
| 44 |
localFilename=os.environ['DROP_DIR2']+localFilename
|
| 45 |
localFilename=normalizeFilename(localFilename)
|
| 46 |
return normalizeFilename(localFilename.replace(os.environ['DROP_DIR2'],"/",1).replace("/",os.environ['APP_PATH'],1))
|
|
|
|
| 48 |
def getLocalFilename(dropboxFilename):
|
| 49 |
""" localFilename is $DROP_DIR2/<subpath>/<filename>"""
|
| 50 |
""" dropboxFilename is $APP_PATH/<subpath>/<filename"""
|
| 51 |
+
if not dropboxFilename.startswith(os.environ['APP_PATH']):
|
| 52 |
dropboxFilename=os.environ['APP_PATH']+dropboxFilename
|
| 53 |
dropboxFilename=normalizeFilename(dropboxFilename)
|
| 54 |
return normalizeFilename(dropboxFilename.replace(os.environ['APP_PATH'],"/",1).replace("/",os.environ['DROP_DIR2'],1))
|
|
|
|
| 107 |
def backupFolder(localFolder):
|
| 108 |
""" list all files in folder and subfolder and upload them"""
|
| 109 |
print("backup folder called for ",localFolder)
|
| 110 |
+
if not localFolder.startswith(os.environ['DROP_DIR2']):
|
| 111 |
localFolder=os.environ['DROP_DIR2']+localFolder
|
| 112 |
filenames=[]
|
| 113 |
for (root,dirs,files) in os.walk(localFolder, topdown=True):
|
|
|
|
| 121 |
def restoreFolder(dropboxFolder):
|
| 122 |
""" list all files in dropbox folder and subfolders and restore them"""
|
| 123 |
global TOKEN
|
| 124 |
+
if not dropboxFolder.startswith(os.environ['APP_PATH']):
|
| 125 |
dropboxFolder=os.environ['APP_PATH']+dropboxFolder
|
| 126 |
try:
|
| 127 |
res=dbx.files_list_folder(dropboxFolder)
|