update letitbit.net, fix fileserve lists

1 files changed, 12 insertions, 11 deletions

diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py
index f9fd9f1cc..9fe806971 100644
--- a/module/plugins/crypter/FileserveComFolder.py
+++ b/module/plugins/crypter/FileserveComFolder.py
@@ -1,31 +1,32 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from module.plugins.Crypter import Crypter
 
 class FileserveComFolder(Crypter):
     __name__ = "FileserveComFolder"
     __type__ = "crypter"
-    __pattern__ = r"http://(www\.)?fileserve\.com/list/\w+"
-    __version__ = "0.10"
-    __description__ = """Fileserve.com Folder Plugin"""
-    __author_name__ = ("zoidberg")
-    __author_mail__ = ("zoidberg@mujmail.cz")
+    __pattern__ = r"http://(?:www\.)?fileserve.com/list/\w+"
+    __version__ = "0.11"
+    __description__ = """FileServeCom.com Folder Plugin"""
+    __author_name__ = ("fionnc")
+    __author_mail__ = ("fionnc@gmail.com")
 
-    FOLDER_PATTERN = r'<div class="middle">(.*?)<div class="tail">'
-    LINK_PATTERN = r'<a href="(/file/[^"]+)"'
+    FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>'
+    LINK_PATTERN = r'<a href="([^"]+)" class="sheet_icon wbold">'
 
     def decrypt(self, pyfile):
-        html = self.load(pyfile.url)
+        html = self.load(self.pyfile.url)
 
         new_links = []
 
         folder = re.search(self.FOLDER_PATTERN, html, re.DOTALL)
-        if not folder: self.fail("Parse error (FOLDER)")
+        if folder is None: self.fail("Parse error (FOLDER)")
 
-        new_links.extend(map(lambda s:"http://www.fileserve.com%s" % s, re.findall(self.LINK_PATTERN, folder.group(1))))
+        new_links.extend(re.findall(self.LINK_PATTERN, folder.group(1)))
 
         if new_links:
-            self.core.files.addLinks(new_links, self.pyfile.package().id)
+            self.core.files.addLinks(map(lambda s:"http://fileserve.com%s" % s, new_links), self.pyfile.package().id)
         else:
             self.fail('Could not extract any links')
\ No newline at end of file