erjemin/instaloader
erjemin/instaloader
1
0
Fork 0
Code Issues Wiki Activity

rate handling: Show %H:%M when request is retried

Browse Source
This commit is contained in:
Alexander Graf 2018-08-05 07:58:25 +02:00
parent bfa5d8ed41
commit a34d750152
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
instaloader/instaloadercontext.py
View File

@ -9,6 +9,7 @@ import textwrap
import time import time
import urllib.parse import urllib.parse
from contextlib import contextmanager from contextlib import contextmanager
from datetime import datetime, timedelta
from typing import Any, Callable, Dict, Iterator, Optional from typing import Any, Callable, Dict, Iterator, Optional
import requests import requests
@ -246,7 +247,8 @@ class InstaloaderContext:
if is_graphql_query and not query_not_limited: if is_graphql_query and not query_not_limited:
waittime = graphql_query_waittime() waittime = graphql_query_waittime()
if waittime > 0: if waittime > 0:
self.log('\nToo many queries in the last time. Need to wait {} seconds.'.format(waittime)) self.log('\nToo many queries in the last time. Need to wait {} seconds, until {:%H:%M}.'
.format(waittime, datetime.now() + timedelta(seconds=waittime)))
time.sleep(waittime) time.sleep(waittime)
if self.query_timestamps is not None: if self.query_timestamps is not None:
self.query_timestamps.append(time.monotonic()) self.query_timestamps.append(time.monotonic())
@ -301,7 +303,8 @@ class InstaloaderContext:
if is_graphql_query: if is_graphql_query:
waittime = graphql_query_waittime(untracked_queries=True) waittime = graphql_query_waittime(untracked_queries=True)
if waittime > 0: if waittime > 0:
self.log('The request will be retried in {} seconds.'.format(waittime)) self.log('The request will be retried in {} seconds, at {:%H:%M}.'
.format(waittime, datetime.now() + timedelta(seconds=waittime)))
time.sleep(waittime) time.sleep(waittime)
self._sleep() self._sleep()
return self.get_json(path=path, params=params, host=host, session=sess, _attempt=_attempt + 1) return self.get_json(path=path, params=params, host=host, session=sess, _attempt=_attempt + 1)