6 files changed, 55 insertions, 26 deletions
diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py
index 0b73a10ae..4ced45355 100644
--- a/module/plugins/crypter/EasybytezComFolder.py
+++ b/module/plugins/crypter/EasybytezComFolder.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter
+from module.plugins.internal.XFSPCrypter import XFSPCrypter
 
 
-class EasybytezComFolder(SimpleCrypter):
+class EasybytezComFolder(XFSPCrypter):
     __name__ = "EasybytezComFolder"
     __type__ = "crypter"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P<ID>\d+/\d+)'
 
@@ -15,9 +15,6 @@ class EasybytezComFolder(SimpleCrypter):
     __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
-    URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g<ID>?per_page=10000")]
-
-    LINK_PATTERN = r'<td><a href="(http://www\.easybytez\.com/\w+)" target="_blank">.+(?:</a>)?</td>'
-    TITLE_PATTERN = r'<Title>Files of \d+: (.+) folder</Title>'
+    HOSTER_NAME = "easybytez.com"
 
     LOGIN_ACCOUNT = True
diff --git a/module/plugins/crypter/HotfileFolderCom.py b/module/plugins/crypter/HotfileComFolder.py
index d9e4e4c39..c2c999275 100644
--- a/module/plugins/crypter/HotfileFolderCom.py
+++ b/module/plugins/crypter/HotfileComFolder.py
@@ -3,8 +3,8 @@
 from module.plugins.internal.DeadCrypter import DeadCrypter
 
 
-class HotfileFolderCom(DeadCrypter):
-    __name__ = "HotfileFolderCom"
+class HotfileComFolder(DeadCrypter):
+    __name__ = "HotfileComFolder"
     __type__ = "crypter"
     __version__ = "0.3"
 
diff --git a/module/plugins/crypter/JunocloudMeFolder.py b/module/plugins/crypter/JunocloudMeFolder.py
index 9e5fa1cbf..32c68e191 100644
--- a/module/plugins/crypter/JunocloudMeFolder.py
+++ b/module/plugins/crypter/JunocloudMeFolder.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter
+from module.plugins.internal.XFSPCrypter import XFSPCrypter
 
 
-class JunocloudMeFolder(SimpleCrypter):
+class JunocloudMeFolder(XFSPCrypter):
     __name__ = "JunocloudMeFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?junocloud\.me/folders/(?P<ID>\d+/\w+)'
 
@@ -15,6 +15,4 @@ class JunocloudMeFolder(SimpleCrypter):
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    URL_REPLACEMENTS = [(__pattern__, r'http://www.junocloud.me/folders/\g<ID>?per_page=10000')]
-
-    LINK_PATTERN = r'<a href="(.+?)" target="_blank">.+?</a>'
+    HOSTER_NAME = "junocloud.me"
diff --git a/module/plugins/crypter/RapidfileshareNetFolder.py b/module/plugins/crypter/RapidfileshareNetFolder.py
index 7f7f85cbd..cca52db20 100644
--- a/module/plugins/crypter/RapidfileshareNetFolder.py
+++ b/module/plugins/crypter/RapidfileshareNetFolder.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter
+from module.plugins.internal.XFSPCrypter import XFSPCrypter
 
 
-class RapidfileshareNetFolder(SimpleCrypter):
+class RapidfileshareNetFolder(XFSPCrypter):
     __name__ = "RapidfileshareNetFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/users/\w+/\d+/\w+'
 
@@ -15,5 +15,4 @@ class RapidfileshareNetFolder(SimpleCrypter):
     __authors__ = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    LINK_PATTERN = r'<a href="(.+?)" target="_blank">.+?</a>'
-    TITLE_PATTERN = r'<Title>Files of \w+: ([^<]+) folder<'
+    HOSTER_NAME = "rapidfileshare.net"
diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index a6e76adb8..fb0842b63 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -4,15 +4,15 @@ import math
 import re
 from urlparse import urljoin
 
-from module.plugins.internal.SimpleCrypter import SimpleCrypter
+from module.plugins.internal.XFSPCrypter import XFSPCrypter
 
 
-class TusfilesNetFolder(SimpleCrypter):
+class TusfilesNetFolder(XFSPCrypter):
     __name__ = "TusfilesNetFolder"
     __type__ = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
-    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)/?'
+    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
 
     __description__ = """Tusfiles.net folder decrypter plugin"""
     __license__ = "GPLv3"
@@ -20,8 +20,8 @@ class TusfilesNetFolder(SimpleCrypter):
                    ("stickell", "l.stickell@yahoo.it")]
 
 
-    LINK_PATTERN = r'<TD align=left><a href="(.*?)">'
-    TITLE_PATTERN = r'<Title>.*?\: (.+) folder</Title>'
+    HOSTER_NAME = "tusfiles.net"
+
     PAGES_PATTERN = r'>\((\d+) \w+\)<'
 
     URL_REPLACEMENTS = [(__pattern__, r'https://www.tusfiles.net/go/\g<ID>/')]
@@ -30,6 +30,7 @@ class TusfilesNetFolder(SimpleCrypter):
     def loadPage(self, page_n):
         return self.load(urljoin(self.pyfile.url, str(page_n)), decode=True)
 
+
     def handleMultiPages(self):
         pages = re.search(self.PAGES_PATTERN, self.html)
         if pages:
diff --git a/module/plugins/crypter/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py
new file mode 100644
index 000000000..e6fb2a7a5
--- /dev/null
+++ b/module/plugins/crypter/XFileSharingProFolder.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from module.plugins.internal.XFSPCrypter import XFSPCrypter
+
+
+class XFileSharingProFolder(XFSPCrypter):
+    __name__ = "XFileSharingProFolder"
+    __type__ = "crypter"
+    __version__ = "0.02"
+
+    __pattern__ = r'^unmatchable$'
+
+    __description__ = """XFileSharingPro dummy folder decrypter plugin for hook"""
+    __license__ = "GPLv3"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    def init(self):
+        self.__pattern__ = self.core.pluginManager.crypterPlugins[self.__name__]['pattern']
+        self.HOSTER_NAME = re.match(self.__pattern__, self.pyfile.url).group(1).lower()
+
+        account_name = "".join([str.capitalize() for str in self.HOSTER_NAME.split('.')])
+        account = self.core.accountManager.getAccountPlugin(account_name)
+
+        if account and account.canUse():
+            self.user, data = account.selectAccount()
+            self.req = account.getAccountRequest(self.user)
+            self.premium = account.isPremium(self.user)
+
+            self.account = account
+        else:
+            self.account.HOSTER_NAME = self.HOSTER_NAME