Merge Dropbox V2 (#123)

* pulled all dropbox v1 code, added v2. fixed authorization flow
This commit is contained in:
Rob
2017-12-03 17:32:21 -06:00
committed by GitHub
parent 87b1a832c5
commit af1ae52e69
33 changed files with 110673 additions and 5250 deletions

View File

@@ -3,9 +3,7 @@ import xbmcgui
import xbmcvfs
import resources.lib.tinyurl as tinyurl
import resources.lib.utils as utils
from resources.lib.dropbox import client, rest, session
from resources.lib.pydrive.auth import GoogleAuth
from resources.lib.pydrive.drive import GoogleDrive
import dropbox
class DropboxAuthorizer:
APP_KEY = ""
@@ -27,9 +25,9 @@ class DropboxAuthorizer:
return result
def isAuthorized(self):
user_token_key,user_token_secret = self._getToken()
user_token = self._getToken()
return user_token_key != '' and user_token_secret != ''
return user_token != ''
def authorize(self):
result = True
@@ -41,56 +39,64 @@ class DropboxAuthorizer:
#delete the token to start over
self._deleteToken()
sess = session.DropboxSession(self.APP_KEY,self.APP_SECRET,"app_folder")
#copied flow from http://dropbox-sdk-python.readthedocs.io/en/latest/moduledoc.html#dropbox.oauth.DropboxOAuth2FlowNoRedirect
flow = dropbox.oauth.DropboxOAuth2FlowNoRedirect(self.APP_KEY,self.APP_SECRET)
token = sess.obtain_request_token()
url = sess.build_authorize_url(token)
url = flow.start()
#print url in log
utils.log("Authorize URL: " + url)
xbmcgui.Dialog().ok(utils.getString(30010),utils.getString(30056),utils.getString(30057),tinyurl.shorten(url))
#if user authorized this will work
user_token = sess.obtain_access_token(token)
self._setToken(user_token.key,user_token.secret)
#get the auth code
code = xbmcgui.Dialog().input(utils.getString(30027) + ' ' + utils.getString(30103))
#if user authorized this will work
try:
user_token = flow.finish(code)
self._setToken(user_token.access_token)
except Exception,e:
utils.log("Error: %s" % (e,))
result = False
return result;
#return the DropboxClient, or None if can't be created
def getClient(self):
result = None
sess = session.DropboxSession(self.APP_KEY,self.APP_SECRET,"app_folder")
user_token_key,user_token_secret = self._getToken()
if(user_token_key != '' and user_token_secret != ''):
user_token = self._getToken()
if(user_token != ''):
#create the client
sess.set_token(user_token_key,user_token_secret)
result = client.DropboxClient(sess)
result = dropbox.Dropbox(user_token)
try:
utils.log(str(result.account_info()))
result.users_get_current_account()
except:
#this didn't work, delete the token file
self._deleteToken()
result = None
return result
def _setToken(self,key,secret):
def _setToken(self,token):
#write the token files
token_file = open(xbmc.translatePath(utils.data_dir() + "tokens.txt"),'w')
token_file.write("%s|%s" % (key,secret))
token_file.write(token)
token_file.close()
def _getToken(self):
#get tokens, if they exist
#get token, if it exists
if(xbmcvfs.exists(xbmc.translatePath(utils.data_dir() + "tokens.txt"))):
token_file = open(xbmc.translatePath(utils.data_dir() + "tokens.txt"))
key,secret = token_file.read().split('|')
token = token_file.read()
token_file.close()
return [key,secret]
return token
else:
return ["",""]
return ""
def _deleteToken(self):
if(xbmcvfs.exists(xbmc.translatePath(utils.data_dir() + "tokens.txt"))):
@@ -134,7 +140,7 @@ class GoogleDriveAuthorizer:
utils.log("Google Drive Authorize URL: " + drive_url)
xbmcgui.Dialog().ok(utils.getString(30010),utils.getString(30056),utils.getString(30102),tinyurl.shorten(drive_url))
code = xbmcgui.Dialog().input(utils.getString(30103))
code = xbmcgui.Dialog().input(utils.getString(30098) + ' ' + utils.getString(30103))
gauth.Auth(code)
gauth.SaveCredentialsFile(xbmc.validatePath(xbmc.translatePath(utils.data_dir() + 'google_drive.dat')))