Merge pull request #1 from pyload/stable

sync stable

1 files changed, 22 insertions, 6 deletions

diff --git a/module/plugins/internal/XFSCrypter.py b/module/plugins/internal/XFSCrypter.py
index 4b57dab90..80eff53ea 100644
--- a/module/plugins/internal/XFSCrypter.py
+++ b/module/plugins/internal/XFSCrypter.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class XFSCrypter(SimpleCrypter):
     __name__    = "XFSCrypter"
     __type__    = "crypter"
-    __version__ = "0.05"
+    __version__ = "0.09"
 
     __pattern__ = r'^unmatchable$'
 
@@ -16,14 +16,30 @@ class XFSCrypter(SimpleCrypter):
 
 
     HOSTER_DOMAIN = None
-    HOSTER_NAME = None
 
     URL_REPLACEMENTS = [(r'&?per_page=\d+', ""), (r'[?/&]+$', ""), (r'(.+/[^?]+)$', r'\1?'), (r'$', r'&per_page=10000')]
 
-    COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
-
-    LINK_PATTERN = r'<(?:td|TD).*?>\s*<a href="(.+?)".*?>.+?(?:</a>)?\s*</(?:td|TD)>'
-    NAME_PATTERN = r'<[tT]itle>.*?\: (?P<N>.+) folder</[tT]itle>'
+    LINK_PATTERN = r'<(?:td|TD).*?>\s*(?:<.+>\s*)?<a href="(.+?)".*?>.+?(?:</a>)?\s*(?:<.+>\s*)?</(?:td|TD)>'
+    NAME_PATTERN = r'<[Tt]itle>.*?\: (?P<N>.+) folder</[Tt]itle>'
 
     OFFLINE_PATTERN      = r'>\s*\w+ (Not Found|file (was|has been) removed)'
     TEMP_OFFLINE_PATTERN = r'>\s*\w+ server (is in )?(maintenance|maintainance)'
+
+
+    def prepare(self):
+        if not self.HOSTER_DOMAIN:
+            if self.account:
+                account      = self.account
+            else:
+                account_name = (self.__name__ + ".py").replace("Folder.py", "").replace(".py", "")
+                account      = self.pyfile.m.core.accountManager.getAccountPlugin(account_name)
+
+            if account and hasattr(account, "HOSTER_DOMAIN") and account.HOSTER_DOMAIN:
+                self.HOSTER_DOMAIN = account.HOSTER_DOMAIN
+            else:
+                self.fail(_("Missing HOSTER_DOMAIN"))
+
+        if isinstance(self.COOKIES, list):
+            self.COOKIES.insert((self.HOSTER_DOMAIN, "lang", "english"))
+
+        return super(XFSCrypter, self).prepare()