4 files changed, 16 insertions, 18 deletions
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index e821f7aa4..41ba4d429 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -23,7 +23,7 @@ class PasswordError(Exception):
 class Extractor(Plugin):
     __name__    = "Extractor"
     __type__    = "extractor"
-    __version__ = "0.40"
+    __version__ = "0.41"
     __status__  = "stable"
 
     __description__ = """Base extractor plugin"""
@@ -80,7 +80,6 @@ class Extractor(Plugin):
                  fullpath=True,
                  overwrite=False,
                  excludefiles=[],
-                 renice=False,
                  priority=0,
                  keepbroken=False,
                  fid=None):
diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py
index bbe37f39f..f5ba13875 100644
--- a/module/plugins/internal/Hoster.py
+++ b/module/plugins/internal/Hoster.py
@@ -15,7 +15,7 @@ from module.plugins.internal.utils import encode, exists, fixurl, fs_join, parse
 class Hoster(Base):
     __name__    = "Hoster"
     __type__    = "hoster"
-    __version__ = "0.45"
+    __version__ = "0.46"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -226,7 +226,7 @@ class Hoster(Base):
                                             disposition=disposition)
 
         except BadHeader, e:
-            self.req.code = e.code
+            self.req.http.code = e.code
             raise BadHeader(e)
 
         finally:
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index 59b9acc31..5a9bd5c84 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -5,13 +5,13 @@ import re
 from module.network.HTTPRequest import BadHeader
 from module.network.RequestFactory import getURL as get_url
 from module.plugins.internal.Crypter import Crypter, create_getInfo, parse_fileInfo
-from module.plugins.internal.utils import replace_patterns, set_cookie, set_cookies
+from module.plugins.internal.utils import parse_name, replace_patterns, set_cookie, set_cookies
 
 
 class SimpleCrypter(Crypter):
     __name__    = "SimpleCrypter"
     __type__    = "crypter"
-    __version__ = "0.79"
+    __version__ = "0.80"
     __status__  = "testing"
 
     __pattern__ = r'^unmatchable$'
@@ -41,7 +41,7 @@ class SimpleCrypter(Crypter):
         example: TEMP_OFFLINE_PATTERN = r'Server maintainance'
 
 
-    You can override the getLinks method if you need a more sophisticated way to extract the links.
+    You can override the get_links method if you need a more sophisticated way to extract the links.
 
 
     If the links are splitted on multiple pages you can define the PAGES_PATTERN regex:
@@ -49,7 +49,7 @@ class SimpleCrypter(Crypter):
       PAGES_PATTERN: (optional) group(1) should be the number of overall pages containing the links
         example: PAGES_PATTERN = r'Pages: (\d+)'
 
-    and its loadPage method:
+    and its load_page method:
 
       def load_page(self, page_n):
           return the html of the page number page_n
@@ -256,11 +256,11 @@ class SimpleCrypter(Crypter):
         """
         if self.premium:
             self.log_info(_("Decrypting as premium link..."))
-            self.handle_premium(pyfile)
+            self.handle_premium(self.pyfile)
 
         elif not self.LOGIN_ACCOUNT:
             self.log_info(_("Decrypting as free link..."))
-            self.handle_free(pyfile)
+            self.handle_free(self.pyfile)
 
         return self.links
 
diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index b67c12da7..4d7697d57 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -16,7 +16,7 @@ from module.plugins.internal.utils import (encode, parse_name, parse_size,
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "2.08"
+    __version__ = "2.14"
     __status__  = "stable"
 
     __pattern__ = r'^unmatchable$'
@@ -277,6 +277,9 @@ class SimpleHoster(Hoster):
                     self.log_info(_("Processing as free download..."))
                     self.handle_free(pyfile)
 
+                if not self.link and not self.last_download:
+                    self.error(_("%s download link not found") % ("Premium" if self.premium else "Free"))
+
         if not self.last_download:
             self.log_info(_("Downloading file..."))
             self.download(self.link, disposition=self.DISPOSITION)
@@ -428,12 +431,10 @@ class SimpleHoster(Hoster):
 
     def handle_free(self, pyfile):
         if not self.LINK_FREE_PATTERN:
-            self.log_warning(_("Free download not implemented"))
+            self.error(_("Free download not implemented"))
 
         m = re.search(self.LINK_FREE_PATTERN, self.data)
-        if m is None:
-            self.error(_("Free download link not found"))
-        else:
+        if m is not None:
             self.link = m.group(1)
 
 
@@ -443,7 +444,5 @@ class SimpleHoster(Hoster):
             self.restart(premium=False)
 
         m = re.search(self.LINK_PREMIUM_PATTERN, self.data)
-        if m is None:
-            self.error(_("Premium download link not found"))
-        else:
+        if m is not None:
             self.link = m.group(1)