3 files changed, 94 insertions, 7 deletions
diff --git a/module/plugins/crypter/FilesonicComFolder.py b/module/plugins/crypter/FilesonicComFolder.py
index b967a74a1..02ae66295 100644
--- a/module/plugins/crypter/FilesonicComFolder.py
+++ b/module/plugins/crypter/FilesonicComFolder.py
@@ -4,8 +4,6 @@ import re
 from module.plugins.Crypter import Crypter
 
 class FilesonicComFolder(Crypter):
-    __name__ = "FilesonicComFolder"
-    __type__ = "crypter"
     __pattern__ = r"http://(\w*\.)?(sharingmatrix|filesonic|wupload)\.[^/]*/folder/\w+/?"
     __version__ = "0.11"
     __description__ = """Filesonic.com/Wupload.com Folder Plugin"""
@@ -15,9 +13,8 @@ class FilesonicComFolder(Crypter):
     FOLDER_PATTERN = r'<table>\s*<caption>Files Folder</caption>(.*?)</table>'
     LINK_PATTERN = r'<a href="([^"]+)">'
 
-    def decrypt(self, pyfile):
-        html = self.load(self.pyfile.url)
-
+    def decryptURL(self, url):
+        html = self.load(url)
         new_links = []
 
         folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
@@ -26,6 +23,7 @@ class FilesonicComFolder(Crypter):
         new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1)))
 
         if new_links:
-            self.core.files.addLinks(new_links, self.pyfile.package().id)
+            return new_links
         else:
-            self.fail('Could not extract any links')
-\ No newline at end of file
+            self.fail('Could not extract any links')
+
diff --git a/module/plugins/crypter/LinkList.py b/module/plugins/crypter/LinkList.py
new file mode 100644
index 000000000..ebfa373eb
--- /dev/null
+++ b/module/plugins/crypter/LinkList.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from module.plugins.Crypter import Crypter, Package
+
+class LinkList(Crypter):
+    __name__ = "LinkList"
+    __version__ = "0.11"
+    __pattern__ = r".+\.txt$"
+    __description__ = """Read Link Lists in txt format"""
+    __author_name__ = ("spoob", "jeix")
+    __author_mail__ = ("spoob@pyload.org", "jeix@hasnomail.com")
+
+    # method declaration is needed here
+    def decryptURL(self, url):
+        return Crypter.decryptURL(self, url)
+
+    def decryptFile(self, content):
+        links = content.splitlines()
+
+        curPack = "default"
+        packages = {curPack:[]}
+        
+        for link in links:
+            link = link.strip()
+            if not link: continue
+            
+            if link.startswith(";"):
+                continue
+            if link.startswith("[") and link.endswith("]"):
+                # new package
+                curPack = link[1:-1]
+                packages[curPack] = []
+                continue
+            packages[curPack].append(link)
+        
+        # empty packages fix
+        delete = []
+        
+        for key,value in packages.iteritems():
+            if not value:
+                delete.append(key)
+                
+        for key in delete:
+            del packages[key]
+
+        urls = []
+
+        for name, links in packages.iteritems():
+            if name == "default":
+                urls.extend(links)
+            else:
+                urls.append(Package(name, links))
+
+        return urls
+\ No newline at end of file
diff --git a/module/plugins/crypter/XfilesharingProFolder.py b/module/plugins/crypter/XfilesharingProFolder.py
new file mode 100644
index 000000000..8e58c207d
--- /dev/null
+++ b/module/plugins/crypter/XfilesharingProFolder.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+from module.plugins.Crypter import Crypter, Package
+import re
+
+class XfilesharingProFolder(Crypter):
+    __name__ = "XfilesharingProFolder"
+    __type__ = "crypter"
+    __pattern__ = r"http://(?:www\.)?((easybytez|turboupload|uploadville|file4safe|fileband|filebeep|grupload|247upload)\.com|(muchshare|annonhost).net|bzlink.us)/users/.*"  
+    __version__ = "0.01"
+    __description__ = """Generic XfilesharingPro Folder Plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+
+    LINK_PATTERN = r'<div class="link"><a href="([^"]+)" target="_blank">[^<]*</a></div>'
+    SUBFOLDER_PATTERN = r'<TD width="1%"><img src="[^"]*/images/folder2.gif"></TD><TD><a href="([^"]+)"><b>(?!\. \.<)([^<]+)</b></a></TD>' 
+  
+    def decryptURL(self, url):
+        return self.decryptFile(self.load(url, decode = True))
+
+    def decryptFile(self, html):
+        new_links = []
+
+        new_links.extend(re.findall(self.LINK_PATTERN, html))
+        
+        subfolders = re.findall(self.SUBFOLDER_PATTERN, html)
+        #self.logDebug(subfolders)        
+        for (url, name) in subfolders:
+            if self.package: name = "%s/%s" % (self.package.name, name)                 
+            new_links.append(Package(name, [url]))        
+           
+        if not new_links: self.fail('Could not extract any links')
+    
+        return new_links
+\ No newline at end of file