deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

read extra-args.txt for additonal URL params

Browse Source
This commit is contained in:
Jay Lee
2015-04-15 11:48:16 -04:00
parent db0dd231b1
commit 0fd9ab303d
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gam.py
View File

@@ -40,7 +40,8 @@ import oauth2client.file
import oauth2client.tools import oauth2client.tools
import uritemplate import uritemplate
global true_values, false_values, prettyPrint, customerId, domain, usergroup_types global true_values, false_values, extra_args, customerId, domain, usergroup_types
extra_args = {u'prettyPrint': False}
true_values = [u'on', u'yes', u'enabled', u'true', u'1'] true_values = [u'on', u'yes', u'enabled', u'true', u'1']
false_values = [u'off', u'no', u'disabled', u'false', u'0'] false_values = [u'off', u'no', u'disabled', u'false', u'0']
usergroup_types = [u'user', u'users', u'group', u'ou', u'org', usergroup_types = [u'user', u'users', u'group', u'ou', u'org',
@@ -369,9 +370,10 @@ def callGData(service, function, soft_errors=False, throw_errors=[], **kwargs):
def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_reasons=[], retry_reasons=[], **kwargs): def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_reasons=[], retry_reasons=[], **kwargs):
method = getattr(service, function) method = getattr(service, function)
retries = 10 retries = 10
parameters = dict(kwargs.items() + extra_args.items())
for n in range(1, retries+1): for n in range(1, retries+1):
try: try:
return method(prettyPrint=prettyPrint, **kwargs).execute() return method(**parameters).execute()
except googleapiclient.errors.HttpError, e: except googleapiclient.errors.HttpError, e:
try: try:
error = json.loads(e.content) error = json.loads(e.content)
@@ -504,7 +506,7 @@ def getAPIScope(api):
u'https://www.googleapis.com/auth/drive'] u'https://www.googleapis.com/auth/drive']
def buildGAPIObject(api): def buildGAPIObject(api):
global domain, customerId, prettyPrint global domain, customerId, extra_args
oauth2file = getGamPath()+u'oauth2.txt' oauth2file = getGamPath()+u'oauth2.txt'
try: try:
oauth2file = getGamPath()+os.environ[u'OAUTHFILE'] oauth2file = getGamPath()+os.environ[u'OAUTHFILE']
@@ -527,9 +529,13 @@ def buildGAPIObject(api):
http = httplib2.Http(ca_certs=getGamPath()+u'cacert.pem', disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=cache) http = httplib2.Http(ca_certs=getGamPath()+u'cacert.pem', disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=cache)
if os.path.isfile(getGamPath()+u'debug.gam'): if os.path.isfile(getGamPath()+u'debug.gam'):
httplib2.debuglevel = 4 httplib2.debuglevel = 4
prettyPrint = True extra_args[u'prettyPrint'] = True
else: if os.path.isfile(getGamPath()+u'extra-args.txt'):
prettyPrint = False import ConfigParser
config = ConfigParser.ConfigParser()
config.optionxform = str
config.read(getGamPath()+u'extra-args.txt')
extra_args.update(dict(config.items(u'extra-args')))
http = credentials.authorize(http) http = credentials.authorize(http)
version = getAPIVer(api) version = getAPIVer(api)
if api in [u'directory', u'reports']: if api in [u'directory', u'reports']:
@@ -562,7 +568,7 @@ def buildGAPIObject(api):
return service return service
def buildGAPIServiceObject(api, act_as=None, soft_errors=False): def buildGAPIServiceObject(api, act_as=None, soft_errors=False):
global prettyPrint global extra_args
oauth2servicefile = getGamPath()+u'oauth2service' oauth2servicefile = getGamPath()+u'oauth2service'
try: try:
oauth2servicefile = getGamPath()+os.environ[u'OAUTHSERVICEFILE'] oauth2servicefile = getGamPath()+os.environ[u'OAUTHSERVICEFILE']
@@ -606,9 +612,13 @@ def buildGAPIServiceObject(api, act_as=None, soft_errors=False):
http = httplib2.Http(ca_certs=getGamPath()+u'cacert.pem', disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=cache) http = httplib2.Http(ca_certs=getGamPath()+u'cacert.pem', disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=cache)
if os.path.isfile(getGamPath()+u'debug.gam'): if os.path.isfile(getGamPath()+u'debug.gam'):
httplib2.debuglevel = 4 httplib2.debuglevel = 4
prettyPrint = True extra_args[u'prettyPrint'] = True
else: if os.path.isfile(getGamPath()+u'extra-args.txt'):
prettyPrint = False import ConfigParser
config = ConfigParser.ConfigParser()
config.optionxform = str
config.read(getGamPath()+u'extra-args.txt')
extra_args.update(dict(config.items(u'extra-args')))
http = credentials.authorize(http) http = credentials.authorize(http)
version = getAPIVer(api) version = getAPIVer(api)
try: try:
@@ -7270,9 +7280,7 @@ access or an 'a' to grant action-only access.
http = httplib2.Http(ca_certs=certFile, disable_ssl_certificate_validation=disable_ssl_certificate_validation) http = httplib2.Http(ca_certs=certFile, disable_ssl_certificate_validation=disable_ssl_certificate_validation)
if os.path.isfile(getGamPath()+u'debug.gam'): if os.path.isfile(getGamPath()+u'debug.gam'):
httplib2.debuglevel = 4 httplib2.debuglevel = 4
prettyPrint = True extra_args[u'prettyPrint'] = True
else:
prettyPrint = False
try: try:
credentials = oauth2client.tools.run_flow(flow=FLOW, storage=storage, flags=flags, http=http) credentials = oauth2client.tools.run_flow(flow=FLOW, storage=storage, flags=flags, http=http)
except httplib2.CertificateValidationUnsupported: except httplib2.CertificateValidationUnsupported: