Convert some crypters to use XFSPCrypter instead SimpleCrypter

4 files changed, 18 insertions, 23 deletions

diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py
index c80b6cd61..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/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 1d804c2a8..fb0842b63 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -4,13 +4,13 @@ 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+)'
 
@@ -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: