From 717faa6d2f2a0017b81516a9d01656487f03be28 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 13:56:01 +0100
Subject: More plugin __pattern__ improved (crypter ones this time)

---
 module/plugins/crypter/MultiloadCz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/crypter/MultiloadCz.py')

diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index b096f63ef..fa1eb02d7 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -9,7 +9,7 @@ class MultiloadCz(Crypter):
     __type__    = "crypter"
     __version__ = "0.40"
 
-    __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.*'
+    __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+'
     __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
                   ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""),
-- 
cgit v1.2.3


From 79725268402043906f619f7c09e848e02ab8a17b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 31 Jan 2015 22:00:59 +0100
Subject: Spare code cosmetics

---
 module/plugins/crypter/MultiloadCz.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/crypter/MultiloadCz.py')

diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index fa1eb02d7..55f424f36 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -35,8 +35,8 @@ class MultiloadCz(Crypter):
             m = re.findall(self.LINK_PATTERN, self.html)
             if m:
                 prefered_set = set(self.getConfig("usedHoster").split('|'))
-                self.urls.extend([x[1] for x in m if x[0] in prefered_set])
+                self.urls.extend(x[1] for x in m if x[0] in prefered_set)
 
                 if not self.urls:
                     ignored_set = set(self.getConfig("ignoredHoster").split('|'))
-                    self.urls.extend([x[1] for x in m if x[0] not in ignored_set])
+                    self.urls.extend(x[1] for x in m if x[0] not in ignored_set)
-- 
cgit v1.2.3


From 7beb65e991bc6d1913c3b5bb2ef69e659d5b8342 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 10 Mar 2015 01:55:52 +0100
Subject: Spare code cosmetics

---
 module/plugins/crypter/MultiloadCz.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/crypter/MultiloadCz.py')

diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 55f424f36..006408c4b 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -34,9 +34,9 @@ class MultiloadCz(Crypter):
         else:
             m = re.findall(self.LINK_PATTERN, self.html)
             if m:
-                prefered_set = set(self.getConfig("usedHoster").split('|'))
+                prefered_set = set(self.getConfig('usedHoster').split('|'))
                 self.urls.extend(x[1] for x in m if x[0] in prefered_set)
 
                 if not self.urls:
-                    ignored_set = set(self.getConfig("ignoredHoster").split('|'))
+                    ignored_set = set(self.getConfig('ignoredHoster').split('|'))
                     self.urls.extend(x[1] for x in m if x[0] not in ignored_set)
-- 
cgit v1.2.3


From 7d90803262ccbb4fc5296a4dc3ce30fe98f55631 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 25 Mar 2015 23:10:07 +0100
Subject: __config__ cosmetics

---
 module/plugins/crypter/MultiloadCz.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/crypter/MultiloadCz.py')

diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 006408c4b..2abb627c3 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -10,10 +10,10 @@ class MultiloadCz(Crypter):
     __version__ = "0.40"
 
     __pattern__ = r'http://(?:[^/]*\.)?multiload\.cz/(stahnout|slozka)/.+'
-    __config__ = [("use_subfolder", "bool", "Save package to subfolder", True),
-                  ("subfolder_per_package", "bool", "Create a subfolder for each package", True),
-                  ("usedHoster", "str", "Prefered hoster list (bar-separated)", ""),
-                  ("ignoredHoster", "str", "Ignored hoster list (bar-separated)", "")]
+    __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"           , True),
+                   ("subfolder_per_pack", "bool", "Create a subfolder for each package" , True),
+                   ("usedHoster"        , "str" , "Prefered hoster list (bar-separated)", ""  ),
+                   ("ignoredHoster"     , "str" , "Ignored hoster list (bar-separated)" , ""  )]
 
     __description__ = """Multiload.cz decrypter plugin"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From 589121e80835c63aea0880a53c6678de5c31c16e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 28 Mar 2015 01:59:01 +0100
Subject: Spare code cosmetics

---
 module/plugins/crypter/MultiloadCz.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/crypter/MultiloadCz.py')

diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 2abb627c3..eea689a09 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -20,8 +20,8 @@ class MultiloadCz(Crypter):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>'
-    LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="([^"]+)">'
+    FOLDER_PATTERN = r'<form action="" method="get"><textarea.*?>([^>]*)</textarea></form>'
+    LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="(.+?)">'
 
 
     def decrypt(self, pyfile):
-- 
cgit v1.2.3