fix reconnecting router with user-script to special times

[vuplus_dvbapp-plugin] / rsdownloader / src / plugin.py

diff --git a/rsdownloader/src/plugin.py b/rsdownloader/src/plugin.py
index 567ae7f..b3802f0 100644 (file)
--- a/rsdownloader/src/plugin.py
+++ b/rsdownloader/src/plugin.py
@@ -274,12 +274,13 @@ class RSDownload:
                if self.url.__contains__("rapidshare.com") and username == "" and password == "":\r
                        writeLog("Free RS-Download: %s"%self.url)\r
                        self.status = _("Checking")
-                       if config.plugins.RSDownloader.reconnect_type.value == "fritz" and self.mayReconnect():
-                               reconnect()\r
-                               sleep(3)
-                       elif config.plugins.RSDownloader.reconnect_type.value == "script" and self.mayReconnect():
-                               reconnect_script()
-                               sleep(3)\r
+                       if self.mayReconnect():
+                               if config.plugins.RSDownloader.reconnect_type.value == "fritz":
+                                       reconnect()\r
+                                       sleep(3)
+                               if config.plugins.RSDownloader.reconnect_type.value == "script":
+                                       reconnect_script()
+                                       sleep(3)\r
                        data = get(self.url)\r
                        url = matchGet('<form[^>]+action="([^"]+)', data)\r
                        if not url:\r
@@ -304,12 +305,13 @@ class RSDownload:
                elif (self.url.__contains__("uploaded.to") or self.url.__contains__("ul.to")) and ul_username == "" and ul_password == "":
                        writeLog("Free Uploaded.to-Download: %s"%self.url)\r
                        self.status = _("Checking")
-                       if config.plugins.RSDownloader.reconnect_type.value == "fritz" and self.mayReconnect():
-                               reconnect()\r
-                               sleep(3)
-                       elif config.plugins.RSDownloader.reconnect_type.value == "script" and self.mayReconnect():
-                               reconnect_script()
-                               sleep(3)\r
+                       if self.mayReconnect():
+                               if config.plugins.RSDownloader.reconnect_type.value == "fritz":
+                                       reconnect()\r
+                                       sleep(3)
+                               if config.plugins.RSDownloader.reconnect_type.value == "script":
+                                       reconnect_script()
+                                       sleep(3)\r
                        data = get(self.url)
                        tmp = re.search(r"Or wait (\d+) minutes", data)
                        if tmp: