From 4c43c2948fe0092ca6dfa8f5fa3e52325e01df5e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 10 Jan 2015 02:16:58 +0100
Subject: [FilefactoryComFolder] Fix
 https://github.com/pyload/pyload/issues/961

---
 module/plugins/crypter/FilefactoryComFolder.py | 12 ++++++------
 module/plugins/internal/SimpleCrypter.py       |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'module/plugins')

diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index 26e28acbd..261c7e01a 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryComFolder.py
@@ -6,7 +6,7 @@ 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),
@@ -17,15 +17,15 @@ class FilefactoryComFolder(SimpleCrypter):
     __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)
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py
index e16e45405..c1571c679 100644
--- a/module/plugins/internal/SimpleCrypter.py
+++ b/module/plugins/internal/SimpleCrypter.py
@@ -155,8 +155,7 @@ class SimpleCrypter(Crypter, SimpleHoster):
 
     def handlePages(self, pyfile):
         try:
-            m = re.search(self.PAGES_PATTERN, self.html)
-            pages = int(m.group(1))
+            pages = int(re.search(self.PAGES_PATTERN, self.html).group(1))
         except:
             pages = 1
 
-- 
cgit v1.2.3