projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
336a765
)
[extractor/common] Print origin country for fake IP
author
Sergey M․
<dstftw@gmail.com>
Tue, 21 Feb 2017 16:14:33 +0000
(23:14 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 21 Feb 2017 16:14:33 +0000
(23:14 +0700)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index a34fbbc9b24024694fa960f6162672feed625446..4252d682563f9831a33225ff3dc906aa27f0eb01 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-415,7
+415,8
@@
class InfoExtractor(object):
self._x_forwarded_for_ip = GeoUtils.random_ipv4(country_code)
if self._downloader.params.get('verbose', False):
self._downloader.to_stdout(
self._x_forwarded_for_ip = GeoUtils.random_ipv4(country_code)
if self._downloader.params.get('verbose', False):
self._downloader.to_stdout(
- '[debug] Using fake %s IP as X-Forwarded-For.' % self._x_forwarded_for_ip)
+ '[debug] Using fake IP %s (%s) as X-Forwarded-For.'
+ % (self._x_forwarded_for_ip, country_code.upper()))
def extract(self, url):
"""Extracts URL information and returns it in list of dicts."""
def extract(self, url):
"""Extracts URL information and returns it in list of dicts."""
@@
-444,10
+445,12
@@
class InfoExtractor(object):
self._downloader.params.get('geo_bypass', True) and
not self._x_forwarded_for_ip and
countries):
self._downloader.params.get('geo_bypass', True) and
not self._x_forwarded_for_ip and
countries):
- self._x_forwarded_for_ip = GeoUtils.random_ipv4(random.choice(countries))
+ country_code = random.choice(countries)
+ self._x_forwarded_for_ip = GeoUtils.random_ipv4(country_code)
if self._x_forwarded_for_ip:
self.report_warning(
if self._x_forwarded_for_ip:
self.report_warning(
- 'Video is geo restricted. Retrying extraction with fake %s IP as X-Forwarded-For.' % self._x_forwarded_for_ip)
+ 'Video is geo restricted. Retrying extraction with fake IP %s (%s) as X-Forwarded-For.'
+ % (self._x_forwarded_for_ip, country_code.upper()))
return True
return False
return True
return False