little fixes

5 files changed, 11 insertions, 8 deletions

diff --git a/Plugins/RapidshareCom.py b/Plugins/RapidshareCom.py
index bbbcbebd1..ea95e1e8b 100644
--- a/Plugins/RapidshareCom.py
+++ b/Plugins/RapidshareCom.py
@@ -36,19 +36,17 @@ class RapidshareCom(Plugin):
         self.want_reconnect = False
 
         self.download_html()
+        pyfile.status.filename = self.get_file_name()
 
         pyfile.status.exists = self.file_exists()
 
         if not pyfile.status.exists:
             raise Exception, "The file was not found on the server."
 
-        self.download_serverhtml()
-
-        pyfile.status.filename = self.get_file_name()
 
+        self.download_serverhtml()
         pyfile.status.waituntil = self.time_plus_wait
 
-
         pyfile.status.want_reconnect = self.want_reconnect
         thread.wait(self.parent)
 
@@ -101,7 +99,8 @@ class RapidshareCom(Plugin):
             self.want_reconnect = True
         except:
             if re.search(r".*Currently a lot of users.*", self.html[1]) != None:
-                self.time_plus_wait = time() + 2 * 60
+                self.time_plus_wait = time() + 130
+                return True
             wait_seconds = re.search(r"var c=(.*);.*", self.html[1]).group(1)
             self.time_plus_wait = time() + int(wait_seconds) + 5
 
diff --git a/config b/config
index 3001e6b24..6ee4bb799 100644
--- a/config
+++ b/config
@@ -16,8 +16,8 @@ log_count = 5
 #each log has 100kb
 [downloadTime]
 #use HH:MM
-start = 00:00
-end = 00:00
+start = 0:00
+end = 0:00
 [remote]
 port = 7272
 remotePassword = pwhere
diff --git a/module/download_thread.py b/module/download_thread.py
index 2c9cc8791..27abe919d 100644
--- a/module/download_thread.py
+++ b/module/download_thread.py
@@ -113,6 +113,8 @@ class Download_Thread(threading.Thread):
                 pyfile.status.type = "reconnected"
                 pyfile.status.want_reconnect = False
                 raise Reconnect
+            if pyfile.plugin.req.abort:
+                raise AbortDownload
             sleep(1)
         pyfile.status.want_reconnect = False
         return True
diff --git a/module/file_list.py b/module/file_list.py
index 303c49a80..cb7336620 100644
--- a/module/file_list.py
+++ b/module/file_list.py
@@ -129,7 +129,7 @@ class File_List(object):
         for i in obj['order']:
             self.append(obj[i].url)
 
-        self.core.logger.info("Links loaded: " + str(int(len(obj) - 1)))
+        self.core.logger.info("Links loaded: " + str(int(len(obj) - 2)))
 
     def inform_client(self):
         obj = RequestObject()
diff --git a/pyLoadCore.py b/pyLoadCore.py
index b250d3f55..70b815858 100644
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -169,6 +169,8 @@ class Core(object):
 
         if hour > int(start_h) and hour < int(end_h):
             return True
+        elif hour < int(end_h) and int(start_h) > int(end_h):
+            return True
         elif hour == int(start_h) and minute >= int(start_m):
             return True
         elif hour == int(end_h) and minute <= int(end_m):