corrections

dropbox_handler.py

@@ -48,8 +48,8 @@ def getDropboxFilename(localFilename):
 def getLocalFilename(dropboxFilename):
     """ localFilename is $DROP_DIR2/<subpath>/<filename>"""
     """ dropboxFilename is $APP_PATH/<subpath>/<filename"""
-    if not localFilename.startsWith(os.environ['APP_PATH']):
-        localFilename=os.environ['APP_PATH']+localFilename
+    if not dropboxFilename.startsWith(os.environ['APP_PATH']):
+        dropboxFilename=os.environ['APP_PATH']+dropboxFilename
     dropboxFilename=normalizeFilename(dropboxFilename)
     return normalizeFilename(dropboxFilename.replace(os.environ['APP_PATH'],"/",1).replace("/",os.environ['DROP_DIR2'],1))
 
@@ -107,6 +107,8 @@ def restoreFile(dropboxFilename):
 def backupFolder(localFolder):
     """ list all files in folder and subfolder and upload them"""
     print("backup folder called for ",localFolder)
+    if not localFolder.startsWith(os.environ['DROP_DIR2']):
+        localFolder=os.environ['DROP_DIR2']+localFolder
     filenames=[]
     for (root,dirs,files) in os.walk(localFolder, topdown=True):
         print(root)
@@ -119,6 +121,8 @@ def backupFolder(localFolder):
 def restoreFolder(dropboxFolder):
     """ list all files in dropbox folder and subfolders and restore them"""
     global TOKEN
+    if not dropboxFolder.startsWith(os.environ['APP_PATH']):
+        dropboxFolder=os.environ['APP_PATH']+dropboxFolder
     try:
         res=dbx.files_list_folder(dropboxFolder)
         if (TOKEN != dbx._oauth2_access_token):