Merge pull request #1 from pyload/stable

sync stable

1 files changed, 9 insertions, 8 deletions

diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index 26e28acbd..c0cd028cc 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryComFolder.py
@@ -6,26 +6,27 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 class FilefactoryComFolder(SimpleCrypter):
     __name__    = "FilefactoryComFolder"
     __type__    = "crypter"
-    __version__ = "0.31"
+    __version__ = "0.32"
 
     __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+                   ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """Filefactory.com folder decrypter plugin"""
     __license__     = "GPLv3"
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-    LINK_PATTERN = r'<td><a href="([^"]+)">'
-    NAME_PATTERN = r'<h1>Files in <span>(?P<N>.+)</span></h1>'
-    PAGES_PATTERN = r'data-paginator-totalPages="(\d+)"'
-
     COOKIES = [("filefactory.com", "locale", "en_US.utf8")]
 
+    LINK_PATTERN  = r'<td>\s*<a href="(.+?)"'
+    NAME_PATTERN  = r'<h1>Files in <span>(?P<N>.+?)<'
+    PAGES_PATTERN = r'data-paginator-totalPages="(\d+)'
+
 
     def loadPage(self, page_n):
-        return self.load(self.pyfile.url, get={'page': page_n})
+        return self.load(self.pyfile.url, get={'page': page_n, 'show': 100})
 
 
 getInfo = create_getInfo(FilefactoryComFolder)