Merge pull request #1 from pyload/stable

sync with stable

1 files changed, 40 insertions, 17 deletions

diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py
index 2e1a2f022..584cc7668 100644
--- a/module/plugins/crypter/XFileSharingProFolder.py
+++ b/module/plugins/crypter/XFileSharingProFolder.py
@@ -8,7 +8,8 @@ from module.plugins.internal.XFSCrypter import XFSCrypter, create_getInfo
 class XFileSharingProFolder(XFSCrypter):
     __name__    = "XFileSharingProFolder"
     __type__    = "crypter"
-    __version__ = "0.06"
+    __version__ = "0.13"
+    __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
@@ -19,34 +20,56 @@ class XFileSharingProFolder(XFSCrypter):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    def _log(self, type, args):
-        msg = " | ".join(str(a).strip() for a in args if a)
-        logger = getattr(self.log, type)
-        logger("%s: %s: %s" % (self.__name__, self.HOSTER_NAME, msg or _("%s MARK" % type.upper())))
+    def _log(self, level, plugintype, pluginname, messages):
+        return super(XFileSharingProFolder, self)._log(level,
+                                                       plugintype,
+                                                       "%s: %s" % (pluginname, self.HOSTER_NAME),
+                                                       messages)
 
 
     def init(self):
         super(XFileSharingProFolder, self).init()
 
-        self.__pattern__ = self.core.pluginManager.crypterPlugins[self.__name__]['pattern']
+        self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern']
 
         self.HOSTER_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
-        self.HOSTER_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+)', self.HOSTER_DOMAIN) if part != '.')
+        self.HOSTER_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+|\-)', self.HOSTER_DOMAIN) if part != '.')
 
-        account = self.core.accountManager.getAccountPlugin(self.HOSTER_NAME)
 
-        if account and account.canUse():
-            self.account = account
-
-        elif self.account:
-            self.account.HOSTER_DOMAIN = self.HOSTER_DOMAIN
+    def _setup(self):
+        account_name     = self.__name__ if self.account.HOSTER_DOMAIN is None else self.HOSTER_NAME
+        self.chunk_limit = 1
+        self.multiDL     = True
 
+        if self.account:
+            self.req             = self.pyload.requestFactory.getRequest(accountname, self.user)
+            self.premium         = self.account.is_premium(self.user)
+            self.resume_download = self.premium
         else:
-            return
+            self.req             = self.pyload.requestFactory.getRequest(account_name)
+            self.premium         = False
+            self.resume_download = False
+
+
+    def load_account(self):
+        if self.req:
+            self.req.close()
+
+        if not self.account:
+            self.account = self.pyload.accountManager.getAccountPlugin(self.HOSTER_NAME)
+
+        if not self.account:
+            self.account = self.pyload.accountManager.getAccountPlugin(self.__name__)
+
+        if self.account:
+            if not self.account.HOSTER_DOMAIN:
+                self.account.HOSTER_DOMAIN = self.HOSTER_DOMAIN
+
+            if not self.user:
+                self.user = self.account.select()[0]
 
-        self.user, data = self.account.selectAccount()
-        self.req        = self.account.getAccountRequest(self.user)
-        self.premium    = self.account.isPremium(self.user)
+            if not self.user or not self.account.is_logged(self.user, True):
+                self.account = False
 
 
 getInfo = create_getInfo(XFileSharingProFolder)