[utils] OnDemandPagedList: Do not download pages after error
This commit is contained in:
parent
c2ae48dbd5
commit
f1d130902b
1 changed files with 9 additions and 4 deletions
|
@ -2799,13 +2799,14 @@ class PagedList:
|
|||
def __init__(self, pagefunc, pagesize, use_cache=True):
|
||||
self._pagefunc = pagefunc
|
||||
self._pagesize = pagesize
|
||||
self._pagecount = float('inf')
|
||||
self._use_cache = use_cache
|
||||
self._cache = {}
|
||||
|
||||
def getpage(self, pagenum):
|
||||
page_results = self._cache.get(pagenum)
|
||||
if page_results is None:
|
||||
page_results = list(self._pagefunc(pagenum))
|
||||
page_results = [] if pagenum > self._pagecount else list(self._pagefunc(pagenum))
|
||||
if self._use_cache:
|
||||
self._cache[pagenum] = page_results
|
||||
return page_results
|
||||
|
@ -2817,7 +2818,7 @@ class PagedList:
|
|||
raise NotImplementedError('This method must be implemented by subclasses')
|
||||
|
||||
def __getitem__(self, idx):
|
||||
# NOTE: cache must be enabled if this is used
|
||||
assert self._use_cache, 'Indexing PagedList requires cache'
|
||||
if not isinstance(idx, int) or idx < 0:
|
||||
raise TypeError('indices must be non-negative integers')
|
||||
entries = self.getslice(idx, idx + 1)
|
||||
|
@ -2843,7 +2844,11 @@ class OnDemandPagedList(PagedList):
|
|||
if (end is not None and firstid <= end <= nextfirstid)
|
||||
else None)
|
||||
|
||||
page_results = self.getpage(pagenum)
|
||||
try:
|
||||
page_results = self.getpage(pagenum)
|
||||
except Exception:
|
||||
self._pagecount = pagenum - 1
|
||||
raise
|
||||
if startv != 0 or endv is not None:
|
||||
page_results = page_results[startv:endv]
|
||||
yield from page_results
|
||||
|
@ -2863,8 +2868,8 @@ class OnDemandPagedList(PagedList):
|
|||
|
||||
class InAdvancePagedList(PagedList):
|
||||
def __init__(self, pagefunc, pagecount, pagesize):
|
||||
self._pagecount = pagecount
|
||||
PagedList.__init__(self, pagefunc, pagesize, True)
|
||||
self._pagecount = pagecount
|
||||
|
||||
def _getslice(self, start, end):
|
||||
start_page = start // self._pagesize
|
||||
|
|
Loading…
Reference in a new issue