From 2e76cf0f532ff89ffa58e5db264a14deb60db6da Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 10 Aug 2009 10:43:57 +0200
Subject: plugin fixes, core config functions

---
 Plugins/RapidshareCom.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'Plugins/RapidshareCom.py')

diff --git a/Plugins/RapidshareCom.py b/Plugins/RapidshareCom.py
index 52d731053..2c78a2672 100644
--- a/Plugins/RapidshareCom.py
+++ b/Plugins/RapidshareCom.py
@@ -62,7 +62,7 @@ class RapidshareCom(Plugin):
 
             tries += 1
             if tries > 5:
-                raise Exception, "Error when downloading, HTML dump:"+ str(self.html[0]) + str(self.html[1])
+                raise Exception, "Error while preparing, HTML dump:"+ str(self.html[0]) + str(self.html[1])
 
         return True
 
@@ -78,8 +78,6 @@ class RapidshareCom(Plugin):
     def download_serverhtml(self):
         """downloads html with the important informations
         """
-        if self.html[0] == None:
-            self.download_html()
 
         if self.config['premium']:
             return False
@@ -95,9 +93,6 @@ class RapidshareCom(Plugin):
             self.time_plus_wait = 0
             return True
 
-        if self.html[1] == None:
-            self.download_serverhtml(self)
-
         if re.search(r".*is already downloading.*", self.html[1]) != None:
             self.time_plus_wait = time() + 10 * 60
         try:
@@ -114,8 +109,6 @@ class RapidshareCom(Plugin):
     def file_exists(self):
         """ returns True or False
         """
-        if self.html[0] == None:
-            self.download_html()
         if re.search(r".*The File could not be found.*", self.html[0]) != None or \
             re.search(r"(<p>This limit is reached.</p>)", self.html[0]) or \
             re.search(r"(.*is momentarily not available.*)", self.html[0]) or \
@@ -132,9 +125,6 @@ class RapidshareCom(Plugin):
             self.start_dl = True
             return self.parent.url
 
-        if self.html[1] == None:
-            self.download_serverhtml()
-
         #if (self.html_old + 5 * 60) < time(): # nach einiger zeit ist die file_url nicht mehr aktuell
         #   self.download_serverhtml()
 
@@ -154,8 +144,6 @@ class RapidshareCom(Plugin):
             #raise Exception, "Error when retrieving download url"
 
     def get_file_name(self):
-        if self.html[0] == None:
-            self.download_html()
             
         file_name_pattern = r"<p class=\"downloadlink\">.+/(.+) <font"
         return re.findall(file_name_pattern, self.html[0])[0]
-- 
cgit v1.2.3