Merge pull request #28 from XBMCil/1.0.9_cr_comment

removed retries altogether and now getting time waited dynamically
XBMCil · May 24, 2016 · 77595a8 · 77595a8
2 parents d2df255 + b1f5f0f
commit 77595a8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/resources/lib/SubtitleHelper.py b/resources/lib/SubtitleHelper.py
@@ -10,7 +10,6 @@
 __version__ = __addon__.getAddonInfo('version')  # Module version
 __scriptname__ = __addon__.getAddonInfo('name')
 
-
 def log(module, msg):
     xbmc.log((u"### [%s] - %s" % (module, msg,)).encode('utf-8'),
     level=xbmc.LOGDEBUG)

diff --git a/resources/lib/TorecSubtitlesDownloader.py b/resources/lib/TorecSubtitlesDownloader.py
@@ -132,9 +132,11 @@ def _build_default_cookie(self, sub_id):
             "current_datetime": current_time
         }
 
-    def _get_user_auth(self):
-        user_auth_text = self.opener.open(self.USER_AUTH_JS_URL).read()
-        return re.search(r"userAuth='(.*)';", user_auth_text).group(1)
+    def _get_user_auth(self, subw_text):
+        return re.search(r"userAuth='(.*)';", subw_text).group(1)
+
+    def _get_time_waited(self, subw_text):
+        return re.search(r"seconds\s+=\s+(\d+);", subw_text).group(1)
 
     def _request_subtitle(self, sub_id):
          params = {
@@ -177,30 +179,19 @@ def search_by_movie_name(self, movie_name):
         subtitle_data = subtitle_data.read()
         return SubtitlePage(id_, movie_name, sub_url, subtitle_data)
 
-    def get_download_link(self, sub_id, option_id, persist=True):        
-        response = None
-        data = None
-
-        params = {
+    def get_download_link(self, sub_id, option_id):        
+        subw_text = self.opener.open(self.USER_AUTH_JS_URL).read()
+        params    = {
             "sub_id":     sub_id,
             "code":       option_id,
             "sh":         "yes",
             "guest":      self._request_subtitle(sub_id),
-            "timewaited": "11",
-            "userAuth":   self._get_user_auth()
+            "timewaited": self._get_time_waited(subw_text),
+            "userAuth":   self._get_user_auth(subw_text)
         }
 
-        for i in xrange(16):
-            response = self.opener.open(
-                "%s/ajax/sub/downloadun.asp" % self.BASE_URL, urllib.urlencode(params),
-            )
-            data = response.read()
-            if len(data) != 0 or not persist:
-                break
-            time.sleep(1)
-        if data:
-            return data
-        return response
+        response = self.opener.open("%s/ajax/sub/downloadun.asp" % self.BASE_URL, urllib.urlencode(params))
+        return response.read()
 
     def download(self, download_link):
         response = self.opener.open(

diff --git a/service.py b/service.py
@@ -129,7 +129,7 @@ def download(page_id, subtitle_id, filename, stack=False):
 
     delete_old_subs()
     try:
-        result = downloader.get_download_link(page_id, subtitle_id, False)
+        result = downloader.get_download_link(page_id, subtitle_id)
     except Exception as e:
         log(__name__,"failed to connect to service for subtitle download %s" % e)
         return subtitle_list

diff --git a/tests/basic_test.py b/tests/basic_test.py
@@ -30,7 +30,7 @@ def convert_to_utf(file):
 page_id     = search_data.id
 subtitle_id = option.id
 
-result                 =  downloader.get_download_link(page_id, subtitle_id, False)
+result                 =  downloader.get_download_link(page_id, subtitle_id)
 subtitleData, fileName = downloader.download(result)
 extension              = os.path.splitext(fileName)[1]