db relative paths

dropbox_handler.py

@@ -40,12 +40,16 @@ def normalizeFilename(filename):
 def getDropboxFilename(localFilename):
     """ localFilename is $DROP_DIR2/<subpath>/<filename>"""
     """ dropboxFilename is $APP_PATH/<subpath>/<filename"""
+    if not localFilename.startsWith(os.environ['DROP_DIR2']):
+        localFilename=os.environ['DROP_DIR2']+localFilename
     localFilename=normalizeFilename(localFilename)
     return normalizeFilename(localFilename.replace(os.environ['DROP_DIR2'],"/",1).replace("/",os.environ['APP_PATH'],1))
 
 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
     dropboxFilename=normalizeFilename(dropboxFilename)
     return normalizeFilename(dropboxFilename.replace(os.environ['APP_PATH'],"/",1).replace("/",os.environ['DROP_DIR2'],1))
 
@@ -114,8 +118,12 @@ def backupFolder(localFolder):
 
 def restoreFolder(dropboxFolder):
     """ list all files in dropbox folder and subfolders and restore them"""
+    global TOKEN
     try:
         res=dbx.files_list_folder(dropboxFolder)
+        if (TOKEN != dbx._oauth2_access_token):
+            fbh.fb_update("d2_accesstoken",dbx._oauth2_access_token)
+            TOKEN=dbx._oauth2_access_token
     except dropbox.exceptions.ApiError as err:
         print('Folder listing failed for', dropboxFolder, '-- assumed empty:', err)
         return

main.py

@@ -126,7 +126,7 @@ def version():
 def persist():
     print("Received persist request")
     retVal=bkend.persist()
-    dbh.backupFolder("/home/user/app/index/chroma")
+    dbh.backupFolder("/index/chroma")
     return retVal
 
 @app.post(api_base+"/raw_sql")