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

rollback shelve (leave lowmem framework)

Browse Source
This commit is contained in:
Jay Lee
2022-11-14 19:40:36 +00:00
parent aebb3c44fe
commit 04dcf47746
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gam/controlflow.py
View File

@@ -34,7 +34,7 @@ def missing_argument_exit(argument, command):
"""Indicate that the argument is missing for the command. """Indicate that the argument is missing for the command.
Args: Args:
argument: the missingagrument argument: the missing argument
command: the base GAM command command: the base GAM command
""" """
system_error_exit(2, f'missing argument {argument} for "{command}"') system_error_exit(2, f'missing argument {argument} for "{command}"')

16
src/gam/gapi/__init__.py
View File

@@ -1,7 +1,6 @@
"""Methods related to execution of GAPI requests.""" """Methods related to execution of GAPI requests."""
import os.path import os.path
import shelve
import sys import sys
from tempfile import TemporaryDirectory from tempfile import TemporaryDirectory
@@ -13,7 +12,7 @@ from gam import controlflow
from gam import display from gam import display
from gam.gapi import errors from gam.gapi import errors
from gam import transport from gam import transport
from gam.var import (GC_Values, GC_LOW_MEMORY, GM_Globals, from gam.var import (GC_Values, GM_Globals,
GM_CURRENT_API_SCOPES, GM_CURRENT_API_USER, GM_CURRENT_API_SCOPES, GM_CURRENT_API_USER,
GM_EXTRA_ARGS_DICT, GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID, GM_EXTRA_ARGS_DICT, GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID,
MAX_RESULTS_API_EXCEPTIONS, MESSAGE_API_ACCESS_CONFIG, MAX_RESULTS_API_EXCEPTIONS, MESSAGE_API_ACCESS_CONFIG,
@@ -338,18 +337,7 @@ def get_all_pages(service,
kwargs['body'].update(page_key) kwargs['body'].update(page_key)
else: else:
kwargs.update(page_key) kwargs.update(page_key)
if GC_Values[GC_LOW_MEMORY]: all_items = []
td_args = {'prefix': 'GAM-'}
if sys.version_info.minor >= 10:
td_args['ignore_cleanup_errors'] = True
tempdir = TemporaryDirectory(**td_args)
tempfile = os.path.join(tempdir.name, 'gapi_pages')
all_items = shelve.open(tempfile)
# attach tempdir to all_items so we
# don't cleanup tempdir early
all_items._tempdir = tempdir
else:
all_items = []
page_token = None page_token = None
total_items = 0 total_items = 0
while True: while True: