Merge pull request #48 from XanderStrike/retry-fl-tokens

retry on fl token failure

Author: XanderStrike

lib/torrent.py

@@ -30,13 +30,21 @@ def download_all():
     discord.send('Downloaded ' + t[1] + ' - ' + t[2] + ' / ' + t[3] + ' / ' + t[4])
 
 def download_torrent(torrent_id):
-  download_link = wat.download_link(torrent_id)
   download_path = settings.get('torrent')[1]
   save_to = download_path + torrent_id + ".torrent"
 
   opener = urllib.request.build_opener()
   opener.addheaders = [('User-agent', 'Mozilla/5.0')]
-  torrent = opener.open(download_link).read()
+
+  # First attempt with token (if enabled in settings)
+  download_url = wat.download_link(torrent_id)
+  torrent = opener.open(download_url).read()
+
+  # Check if we ran out of tokens, retry without token
+  if b'You do not have any freeleech tokens left' in torrent:
+    print("No freeleech tokens left, retrying without token")
+    download_url = wat.download_link(torrent_id, use_token=False)
+    torrent = opener.open(download_url).read()
 
   output = open(save_to,'wb')
   output.write(torrent)

lib/wat.py

@@ -79,14 +79,17 @@ def get_group(group_id):
   except:
     return "no data"
 
-def download_link(torrent_id):
+def download_link(torrent_id, use_token=None):
   domain = settings.get('domain')[1]
-  use_tokens_setting = settings.get('use_tokens')
-  token_count = use_tokens_setting[2] if use_tokens_setting[2] else '0'
-  use_tokens = use_tokens_setting[1] == 'true' and int(token_count) > 0
+
+  # If use_token is explicitly specified, use that; otherwise check settings
+  if use_token is None:
+    use_tokens_setting = settings.get('use_tokens')
+    token_count = use_tokens_setting[2] if use_tokens_setting[2] else '0'
+    use_token = use_tokens_setting[1] == 'true' and int(token_count) > 0
 
   url = domain + '/torrents.php?action=download&id=' + torrent_id + '&authkey=' + handle().authkey + '&torrent_pass=' + handle().passkey
-  if use_tokens:
+  if use_token:
     url += '&usetoken=1'
 
   print(url)