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

Eliminate offset/maxresults arguments for gam print printjobs/gam printjob fetch

Browse Source
This commit is contained in:
Ross Scroggs
2016-04-27 10:27:33 -07:00
parent 289fda94df
commit ee00a41ff9
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gam.py
View File

@ -2125,9 +2125,7 @@ def doPrintPrintJobs():
query = None query = None
age = None age = None
older_or_newer = None older_or_newer = None
offset = 0
jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT
maxResults = PRINTJOBS_DEFAULT_MAX_RESULTS
i = 3 i = 3
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower().replace(u'_', u'') myarg = sys.argv[i].lower().replace(u'_', u'')
@ -2179,26 +2177,20 @@ def doPrintPrintJobs():
elif myarg in [u'owner', u'user']: elif myarg in [u'owner', u'user']:
owner = sys.argv[i+1] owner = sys.argv[i+1]
i += 2 i += 2
elif myarg == u'offset':
offset = max(0, int(sys.argv[i+1]))
i += 2
elif myarg == u'limit': elif myarg == u'limit':
jobLimit = max(0, int(sys.argv[i+1])) jobLimit = max(0, int(sys.argv[i+1]))
i += 2 i += 2
elif myarg == u'maxresults':
maxResults = min(1000, max(1, int(sys.argv[i+1])))
i += 2
else: else:
print u'ERROR: %s is not a valid argument for "gam print printjobs"' % sys.argv[i] print u'ERROR: %s is not a valid argument for "gam print printjobs"' % sys.argv[i]
sys.exit(2) sys.exit(2)
if sortorder and descending: if sortorder and descending:
sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder] sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder]
jobCount = 0 jobCount = offset = 0
while True: while True:
if jobLimit == 0: if jobLimit == 0:
limit = maxResults limit = PRINTJOBS_DEFAULT_MAX_RESULTS
else: else:
limit = min(maxResults, jobLimit-jobCount) limit = min(PRINTJOBS_DEFAULT_MAX_RESULTS, jobLimit-jobCount)
if limit == 0: if limit == 0:
break break
result = callGAPI(cp.jobs(), u'list', result = callGAPI(cp.jobs(), u'list',
@ -2582,9 +2574,7 @@ def doPrintJobFetch():
query = None query = None
age = None age = None
older_or_newer = None older_or_newer = None
offset = 0
jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT
maxResults = PRINTJOBS_DEFAULT_MAX_RESULTS
i = 4 i = 4
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower().replace(u'_', u'') myarg = sys.argv[i].lower().replace(u'_', u'')
@ -2630,15 +2620,9 @@ def doPrintJobFetch():
elif myarg in [u'owner', u'user']: elif myarg in [u'owner', u'user']:
owner = sys.argv[i+1] owner = sys.argv[i+1]
i += 2 i += 2
elif myarg == u'offset':
offset = max(0, int(sys.argv[i+1]))
i += 2
elif myarg == u'limit': elif myarg == u'limit':
jobLimit = max(0, int(sys.argv[i+1])) jobLimit = max(0, int(sys.argv[i+1]))
i += 2 i += 2
elif myarg == u'maxresults':
maxResults = min(1000, max(1, int(sys.argv[i+1])))
i += 2
else: else:
print u'ERROR: %s is not a valid argument for "gam printjobs fetch"' % sys.argv[i] print u'ERROR: %s is not a valid argument for "gam printjobs fetch"' % sys.argv[i]
sys.exit(2) sys.exit(2)
@ -2646,12 +2630,12 @@ def doPrintJobFetch():
sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder] sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder]
valid_chars = u'-_.() abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' valid_chars = u'-_.() abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
ssd = u'{"state": {"type": "DONE"}}' ssd = u'{"state": {"type": "DONE"}}'
jobCount = 0 jobCount = offset = 0
while True: while True:
if jobLimit == 0: if jobLimit == 0:
limit = maxResults limit = PRINTJOBS_DEFAULT_MAX_RESULTS
else: else:
limit = min(maxResults, jobLimit-jobCount) limit = min(PRINTJOBS_DEFAULT_MAX_RESULTS, jobLimit-jobCount)
if limit == 0: if limit == 0:
break break
result = callGAPI(cp.jobs(), u'list', result = callGAPI(cp.jobs(), u'list',