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

Always close sockets and files

Browse Source
This commit is contained in:
Alexander Graf 2018-03-24 19:39:55 +01:00
parent d3bc7cb82b
commit 938e029592
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
instaloader.py
View File

@ -734,9 +734,11 @@ class Instaloader:
"""Downloads raw data. """Downloads raw data.
:raises QueryReturnedNotFoundException: When the server responds with a 404. :raises QueryReturnedNotFoundException: When the server responds with a 404.
:raises QueryReturnedForbiddenException: When the server responds with a 403.
:raises ConnectionException: When download repeatedly failed.""" :raises ConnectionException: When download repeatedly failed."""
try: try:
resp = self._get_anonymous_session().get(url, stream=True) with self._get_anonymous_session() as anonymous_session:
resp = anonymous_session.get(url)
if resp.status_code == 200: if resp.status_code == 200:
self._log(filename, end=' ', flush=True) self._log(filename, end=' ', flush=True)
with open(filename, 'wb') as file: with open(filename, 'wb') as file:
@ -896,6 +898,7 @@ class Instaloader:
params={'query_hash': query_hash, params={'query_hash': query_hash,
'variables': json.dumps(variables, separators=(',', ':'))}, 'variables': json.dumps(variables, separators=(',', ':'))},
session=tmpsession) session=tmpsession)
tmpsession.close()
if 'status' not in resp_json: if 'status' not in resp_json:
self.error("GraphQL response did not contain a \"status\" field.") self.error("GraphQL response did not contain a \"status\" field.")
return resp_json return resp_json
@ -990,7 +993,8 @@ class Instaloader:
def save_metadata_json(self, filename: str, post: Post) -> None: def save_metadata_json(self, filename: str, post: Post) -> None:
"""Saves metadata JSON file of a :class:`Post`.""" """Saves metadata JSON file of a :class:`Post`."""
filename += '.json' filename += '.json'
json.dump(post, fp=open(filename, 'w'), indent=4, default=Post.json_encoder) with open(filename, 'w') as fp:
json.dump(post, fp=fp, indent=4, default=Post.json_encoder)
self._log('json', end=' ', flush=True) self._log('json', end=' ', flush=True)
def update_comments(self, filename: str, post: Post, filename_alt: Optional[str] = None) -> None: def update_comments(self, filename: str, post: Post, filename_alt: Optional[str] = None) -> None:
@ -1089,8 +1093,9 @@ class Instaloader:
def _epoch_to_string(epoch: datetime) -> str: def _epoch_to_string(epoch: datetime) -> str:
return epoch.strftime('%Y-%m-%d_%H-%M-%S') return epoch.strftime('%Y-%m-%d_%H-%M-%S')
date_object = datetime.strptime(self._get_anonymous_session().head(profile.profile_pic_url).headers["Last-Modified"], with self._get_anonymous_session() as anonymous_session:
'%a, %d %b %Y %H:%M:%S GMT') date_object = datetime.strptime(anonymous_session.head(profile.profile_pic_url).headers["Last-Modified"],
'%a, %d %b %Y %H:%M:%S GMT')
if ((format_string_contains_key(self.dirname_pattern, 'profile') or if ((format_string_contains_key(self.dirname_pattern, 'profile') or
format_string_contains_key(self.dirname_pattern, 'target'))): format_string_contains_key(self.dirname_pattern, 'target'))):
filename = '{0}/{1}_UTC_profile_pic.{2}'.format(self.dirname_pattern.format(profile=profile.username.lower(), filename = '{0}/{1}_UTC_profile_pic.{2}'.format(self.dirname_pattern.format(profile=profile.username.lower(),