More dropbox logs

.gitignore

@@ -3,4 +3,5 @@ retrival_local.py
 dropbox_trial.py
 commandline-oauth-scope.py
 *.ipynb
-capacity.html
+capacity.html
+__pycache__/**

dropbox_handler.py

@@ -23,11 +23,13 @@ with dropbox.Dropbox(oauth2_access_token=TOKEN,app_key=APP_KEY,app_secret=APP_SE
             fbh.fb_update("d2_accesstoken",dbx._oauth2_access_token)
             TOKEN=dbx._oauth2_access_token
         print("dropbox connection ok,",dbx._oauth2_access_token)
+        print(dbx._oauth2_refresh_token)
     except AuthError:
         try:
             dbx.check_and_refresh_access_token()
             fbh.fb_update("d2_accesstoken",dbx._oauth2_access_token)
             print("dropbox connection refreshed and updated",dbx._oauth2_access_token)
+            print(dbx._oauth2_refresh_token)
         except Exception:
             sys.exit("ERROR: Invalid access token; try re-generating an "
                 "access token from the app console on the web.")
@@ -40,16 +42,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
+    #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 dropboxFilename.startswith(os.environ['APP_PATH']):
-        dropboxFilename=os.environ['APP_PATH']+dropboxFilename
+    #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))
 
@@ -61,6 +63,7 @@ def backupFile(localFilename):
     global TOKEN
     localFilename=normalizeFilename(localFilename) 
     dropboxFilename=getDropboxFilename(localFilename)
+    print("backing file ",localFilename," to ",dropboxFilename)
     mode = dropbox.files.WriteMode.overwrite
     mtime = os.path.getmtime(localFilename)
     with open(localFilename, 'rb') as f:
@@ -73,6 +76,7 @@ def backupFile(localFilename):
         if (TOKEN != dbx._oauth2_access_token):
             fbh.fb_update("d2_accesstoken",dbx._oauth2_access_token)
             TOKEN=dbx._oauth2_access_token
+            print(dbx._oauth2_refresh_token)
     except dropbox.exceptions.ApiError as err:
         print('*** API error', err)
         return None
@@ -87,11 +91,13 @@ def restoreFile(dropboxFilename):
     global TOKEN
     dropboxFilename=normalizeFilename(dropboxFilename)
     localFilename=getLocalFilename(dropboxFilename)
+    print("restoring file ",localFilename," from ",dropboxFilename)
     try:
         md, res = dbx.files_download(dropboxFilename)
         if (TOKEN != dbx._oauth2_access_token):
             fbh.fb_update("d2_accesstoken",dbx._oauth2_access_token)
             TOKEN=dbx._oauth2_access_token
+            print(dbx._oauth2_refresh_token)
     except dropbox.exceptions.HttpError as err:
         print('*** HTTP error', err)
         return None
@@ -128,6 +134,7 @@ def restoreFolder(dropboxFolder):
         if (TOKEN != dbx._oauth2_access_token):
             fbh.fb_update("d2_accesstoken",dbx._oauth2_access_token)
             TOKEN=dbx._oauth2_access_token
+            print(dbx._oauth2_refresh_token)
     except dropbox.exceptions.ApiError as err:
         print('Folder listing failed for', dropboxFolder, '-- assumed empty:', err)
         return