miglioramenti scraper vcrypt

2019-10-09 19:44:02 +02:00
parent 92d83adabf
commit 0c19c15d38
1 changed files with 11 additions and 7 deletions
@@ -496,13 +496,17 @@ class UnshortenIt(object):
            uri = uri.replace('wss/', 'wss1/')
            uri = uri.replace('wsd/', 'wsd1/')
            r = httptools.downloadpage(uri, timeout=self._timeout, headers=headers, follow_redirects=False)
+            if 'Wait 1 hour' in r.data:
+                uri = ''
+                logger.info('IP bannato da vcrypt, aspetta un ora')
+            else:
                uri = r.headers['location']

        if "4snip" in uri:
            if 'out_generator' in uri:
                uri = re.findall('url=(.*)$', uri)[0]
-            else:
-                uri = decrypt(uri)
+            elif '/decode/' in uri:
+                uri = decrypt(uri.split('/')[-1])

        return uri, r.code if r else 200