New crypter EasybytezComFolder

http://forum.pyload.org/viewtopic.php?p=9028#p9028
+ html unescape in SimpleCrypter

2 files changed, 62 insertions, 1 deletions

diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py
new file mode 100644
index 000000000..1b887e421
--- /dev/null
+++ b/module/plugins/crypter/EasybytezComFolder.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+############################################################################
+# This program is free software: you can redistribute it and/or modify     #
+# it under the terms of the GNU Affero General Public License as           #
+# published by the Free Software Foundation, either version 3 of the       #
+# License, or (at your option) any later version.                          #
+#                                                                          #
+# This program is distributed in the hope that it will be useful,          #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU Affero General Public License for more details.                      #
+#                                                                          #
+# You should have received a copy of the GNU Affero General Public License #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.    #
+############################################################################
+
+import re
+
+from module.plugins.internal.SimpleCrypter import SimpleCrypter
+
+
+class EasybytezComFolder(SimpleCrypter):
+    __name__ = "EasybytezComFolder"
+    __type__ = "crypter"
+    __pattern__ = r"https?://(www\.)?easybytez\.com/users/\w+/\w+"
+    __version__ = "0.01"
+    __description__ = """Easybytez Crypter Plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    LINK_PATTERN = r'<div class="link"><a href="(http://www\.easybytez\.com/\w+)" target="_blank">.+</a></div>'
+    TITLE_PATTERN = r'<Title>Files of (?P<title>.+) folder</Title>'
+    PAGES_PATTERN = r"<a href='[^']+'>(\d+)</a><a href='[^']+'>Next &#187;</a><br><small>\(\d+ total\)</small></div>"
+
+    def decrypt(self, pyfile):
+        self.html = self.load(pyfile.url, decode=True)
+
+        package_name, folder_name = self.getPackageNameAndFolder()
+
+        package_links = re.findall(self.LINK_PATTERN, self.html)
+
+        pages = re.search(self.PAGES_PATTERN, self.html)
+        if pages:
+            pages = int(pages.group(1))
+        else:
+            pages = 1
+
+        p = 2
+        while p <= pages:
+            self.html = self.load(pyfile.url, get={'page': p}, decode=True)
+            package_links += re.findall(self.LINK_PATTERN, self.html)
+            p += 1
+
+        self.logDebug('Package has %d links' % len(package_links))
+
+        if package_links:
+            self.packages = [(package_name, package_links, folder_name)]
+        else:
+            self.fail('Could not extract any links')
\ No newline at end of file
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index c9e350e86..d935bf1da 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -20,6 +20,7 @@
 import re
 
 from module.plugins.Crypter import Crypter
+from module.utils import html_unescape
 
 
 class SimpleCrypter(Crypter):
@@ -57,7 +58,7 @@ class SimpleCrypter(Crypter):
         if hasattr(self, 'TITLE_PATTERN'):
             m = re.search(self.TITLE_PATTERN, self.html)
             if m:
-                name = folder = m.group('title').strip()
+                name = folder = html_unescape(m.group('title').strip())
                 self.logDebug("Found name [%s] and folder [%s] in package info" % (name, folder))
                 return name, folder