Merge pull request #1 from pyload/stable

sync stable

1 files changed, 6 insertions, 8 deletions

diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index 0db3470cc..1cc505b81 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -2,7 +2,7 @@
 
 import math
 import re
-from urlparse import urljoin
+import urlparse
 
 from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 
@@ -10,11 +10,11 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 class TusfilesNetFolder(XFSCrypter):
     __name__    = "TusfilesNetFolder"
     __type__    = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Tusfiles.net folder decrypter plugin"""
     __license__     = "GPLv3"
@@ -22,18 +22,16 @@ class TusfilesNetFolder(XFSCrypter):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
-    HOSTER_DOMAIN = "tusfiles.net"
-
     PAGES_PATTERN = r'>\((\d+) \w+\)<'
 
     URL_REPLACEMENTS = [(__pattern__ + ".*", r'https://www.tusfiles.net/go/\g<ID>/')]
 
 
     def loadPage(self, page_n):
-        return self.load(urljoin(self.pyfile.url, str(page_n)), decode=True)
+        return self.load(urlparse.urljoin(self.pyfile.url, str(page_n)), decode=True)
 
 
-    def handleMultiPages(self):
+    def handlePages(self, pyfile):
         pages = re.search(self.PAGES_PATTERN, self.html)
         if pages:
             pages = int(math.ceil(int(pages.group('pages')) / 25.0))