From adc9ab75ce58712afecf92c87f985fa00e783337 Mon Sep 17 00:00:00 2001
From: saintego <stegena@gmail.com>
Date: Thu, 26 Mar 2015 21:50:54 +0100
Subject: rghost issue #1289

add rghost.ru and fix link_free_patern
---
 module/plugins/hoster/RgHostNet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/RgHostNet.py b/module/plugins/hoster/RgHostNet.py
index 9a8a340ec..9f08cf740 100644
--- a/module/plugins/hoster/RgHostNet.py
+++ b/module/plugins/hoster/RgHostNet.py
@@ -10,7 +10,7 @@ class RgHostNet(SimpleHoster):
     __type__    = "hoster"
     __version__ = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?rghost\.net/\d+(?:r=\d+)?'
+    __pattern__ = r'http://(?:www\.)?rghost\.(?:net|ru)/\d+(?:r=\d+)?'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """RgHost.net hoster plugin"""
@@ -21,7 +21,7 @@ class RgHostNet(SimpleHoster):
     INFO_PATTERN    = r'<h1>\s+(<a[^>]+>)?(?P<N>[^<]+)(</a>)?\s+<small[^>]+>\s+\((?P<S>[^)]+)\)\s+</small>\s+</h1>'
     OFFLINE_PATTERN = r'File is deleted|this page is not found'
 
-    LINK_FREE_PATTERN = r'<a\s+href="([^"]+)"\s+class="btn\s+large\s+download"[^>]+>Download</a>'
+    LINK_FREE_PATTERN = r'<a\s+href="([^"]+)"\s+class="btn\s+large\s+download[^>]+>Download</a>'
 
 
 getInfo = create_getInfo(RgHostNet)
-- 
cgit v1.2.3


From 075311e5dd1ba263d3860752a339d88eb596bc4e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 26 Mar 2015 22:17:51 +0100
Subject: [RgHostNet] Update

---
 module/plugins/hoster/RgHostNet.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/RgHostNet.py b/module/plugins/hoster/RgHostNet.py
index 9f08cf740..1a45def44 100644
--- a/module/plugins/hoster/RgHostNet.py
+++ b/module/plugins/hoster/RgHostNet.py
@@ -8,9 +8,9 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class RgHostNet(SimpleHoster):
     __name__    = "RgHostNet"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
-    __pattern__ = r'http://(?:www\.)?rghost\.(?:net|ru)/\d+(?:r=\d+)?'
+    __pattern__ = r'http://(?:www\.)?rghost\.(net|ru)/[\d-]+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """RgHost.net hoster plugin"""
@@ -18,10 +18,11 @@ class RgHostNet(SimpleHoster):
     __authors__     = [("z00nx", "z00nx0@gmail.com")]
 
 
-    INFO_PATTERN    = r'<h1>\s+(<a[^>]+>)?(?P<N>[^<]+)(</a>)?\s+<small[^>]+>\s+\((?P<S>[^)]+)\)\s+</small>\s+</h1>'
-    OFFLINE_PATTERN = r'File is deleted|this page is not found'
+    INFO_PATTERN    = r'data-share42-text="(?P<N>.+?) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    HASHSUM_PATTERN = r'<dt>(?P<T>\w+)</dt>\s*<dd>(?P<H>\w+)'
+    OFFLINE_PATTERN = r'>(File is deleted|page not found)'
 
-    LINK_FREE_PATTERN = r'<a\s+href="([^"]+)"\s+class="btn\s+large\s+download[^>]+>Download</a>'
+    LINK_FREE_PATTERN = r'<a href="(.+?)" class="btn large'
 
 
 getInfo = create_getInfo(RgHostNet)
-- 
cgit v1.2.3


From 443271807e8eb9fa896a9e31001f64f1af180e41 Mon Sep 17 00:00:00 2001
From: saintego <stegena@gmail.com>
Date: Fri, 27 Mar 2015 01:28:58 +0100
Subject: ifolder issue #1291

add metalare.org and fixed for new layout of page
---
 module/plugins/hoster/IfolderRu.py | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py
index 6ebde9063..01618f37d 100644
--- a/module/plugins/hoster/IfolderRu.py
+++ b/module/plugins/hoster/IfolderRu.py
@@ -10,7 +10,7 @@ class IfolderRu(SimpleHoster):
     __type__    = "hoster"
     __version__ = "0.39"
 
-    __pattern__ = r'http://(?:www\.)?(?:ifolder\.ru|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)'
+    __pattern__ = r'http://(?:www|files\.)?(?:ifolder\.ru|metalarea\.org|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Ifolder.ru hoster plugin"""
@@ -24,11 +24,11 @@ class IfolderRu(SimpleHoster):
     SIZE_PATTERN    = ur'(?:<div><span>)?Размер:(?:</span>)? <b>(?P<S>[^<]+)</b><(?:/div|br)>'
     OFFLINE_PATTERN = ur'<p>Файл номер <b>[^<]*</b> (не найден|удален) !!!</p>'
 
-    SESSION_ID_PATTERN = r'<a href=(http://ints\.(?:rusfolder\.com|ifolder\.ru)/ints/sponsor/\?bi=\d*&session=([^&]+)&u=[^>]+)>'
+    SESSION_ID_PATTERN = r'<input type="hidden" name="session" value="([^"]+)"'
     INTS_SESSION_PATTERN = r'\(\'ints_session\'\);\s*if\(tag\)\{tag\.value = "([^"]+)";\}'
     HIDDEN_INPUT_PATTERN = r'var v = .*?name=\'(.+?)\' value=\'1\''
 
-    LINK_FREE_PATTERN = r'<a id="download_file_href" href="([^"]+)"'
+    LINK_FREE_PATTERN = r'<a href="([^"]+)" class="downloadbutton_files"'
 
     WRONG_CAPTCHA_PATTERN = ur'<font color=Red>неверный код,<br>введите еще раз</font><br>'
 
@@ -39,26 +39,15 @@ class IfolderRu(SimpleHoster):
 
 
     def handleFree(self, pyfile):
+        url = "http://rusfolder.com/%s" % self.info['pattern']['ID']
         self.html = self.load("http://rusfolder.com/%s" % self.info['pattern']['ID'], decode=True)
         self.getFileInfo()
 
-        url = re.search(r"location\.href = '(http://ints\..*?=)'", self.html).group(1)
-        self.html = self.load(url, decode=True)
-
-        url, session_id = re.search(self.SESSION_ID_PATTERN, self.html).groups()
-        self.html = self.load(url, decode=True)
-
-        url = "http://ints.rusfolder.com/ints/frame/?session=%s" % session_id
-        self.html = self.load(url)
-
-        self.wait(31, False)
+        session_id = re.search(self.SESSION_ID_PATTERN, self.html).groups()
 
         captcha_url = "http://ints.rusfolder.com/random/images/?session=%s" % session_id
         for _i in xrange(5):
-            self.html = self.load(url)
-            action, inputs = self.parseHtmlForm('ID="Form1"')
-            inputs['ints_session'] = re.search(self.INTS_SESSION_PATTERN, self.html).group(1)
-            inputs[re.search(self.HIDDEN_INPUT_PATTERN, self.html).group(1)] = '1'
+            action, inputs = self.parseHtmlForm('id="download-step-one-form"')
             inputs['confirmed_number'] = self.decryptCaptcha(captcha_url, cookies=True)
             inputs['action'] = '1'
             self.logDebug(inputs)
@@ -71,7 +60,8 @@ class IfolderRu(SimpleHoster):
         else:
             self.fail(_("Invalid captcha"))
 
-        self.link = re.search(self.LINK_PATTERN, self.html).group(1)
+        self.link = re.search(self.LINK_FREE_PATTERN, self.html).group(1)
 
 
 getInfo = create_getInfo(IfolderRu)
+
-- 
cgit v1.2.3


From 43c335536e8703103850b367ac3dcfbe7da650a9 Mon Sep 17 00:00:00 2001
From: ludoviclehmann <ludo.lehmann@free.fr>
Date: Fri, 27 Mar 2015 16:14:30 +0100
Subject: Fix issue  #1042

https://github.com/pyload/pyload/issues/1042
---
 module/plugins/hoster/OneFichierCom.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 2586fb622..0a49084cf 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+import urllib2
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
@@ -8,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class OneFichierCom(SimpleHoster):
     __name__    = "OneFichierCom"
     __type__    = "hoster"
-    __version__ = "0.79"
+    __version__ = "0.80"
 
     __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -54,6 +55,21 @@ class OneFichierCom(SimpleHoster):
 
         self.download(url, post=inputs)
 
+    def handleDirect(self, pyfile):
+        link = self.directLink(pyfile.url, self.resumeDownload)
+
+        if link:
+            self.logInfo(_("Direct download link detected"))
+            remote = urllib2.urlopen(link)
+            name = remote.info()['Content-Disposition'].split(';')
+            filename = name[1].split('filename=')[1]
+            filename = filename[1:-1]
+            self.logDebug("filename=" + filename)
+            pyfile.name = filename
+            self.link = link
+        else:
+            self.logDebug("Direct download link not found")
+
 
     def handlePremium(self, pyfile):
         self.download(pyfile.url, post={'dl': "Download", 'did': 0})
-- 
cgit v1.2.3


From ba93d07b55a937553d9913813eff6af398bb2f45 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 28 Mar 2015 01:55:37 +0100
Subject: [UlozTo] Update hoster

---
 module/plugins/hoster/UlozTo.py | 96 +++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index 89596512e..3a6e69c45 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -15,7 +15,7 @@ def convertDecimalPrefix(m):
 class UlozTo(SimpleHoster):
     __name__    = "UlozTo"
     __type__    = "hoster"
-    __version__ = "1.04"
+    __version__ = "1.05"
 
     __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -33,9 +33,12 @@ class UlozTo(SimpleHoster):
     URL_REPLACEMENTS  = [(r"(?<=http://)([^/]+)", "www.ulozto.net")]
     SIZE_REPLACEMENTS = [('([\d.]+)\s([kMG])B', convertDecimalPrefix)]
 
-    ADULT_PATTERN   = r'<form action="([^\"]*)" method="post" id="frm-askAgeForm">'
+    CHECK_TRAFFIC = True
+    DISPOSITION   = False  #: Remove in 0.4.10
+
+    ADULT_PATTERN   = r'<form action="(.+?)" method="post" id="frm-askAgeForm">'
     PASSWD_PATTERN  = r'<div class="passwordProtectedFile">'
-    VIPLINK_PATTERN = r'<a href="[^"]*\?disclaimer=1" class="linkVip">'
+    VIPLINK_PATTERN = r'<a href=".+?\?disclaimer=1" class="linkVip">'
     TOKEN_PATTERN   = r'<input type="hidden" name="_token_" .*?value="(.+?)"'
 
 
@@ -45,45 +48,14 @@ class UlozTo(SimpleHoster):
         self.resumeDownload = True
 
 
-    def process(self, pyfile):
-        pyfile.url = re.sub(r"(?<=http://)([^/]+)", "www.ulozto.net", pyfile.url)
-        self.html = self.load(pyfile.url, decode=True)
-
-        if re.search(self.ADULT_PATTERN, self.html):
-            self.logInfo(_("Adult content confirmation needed"))
-
-            m = re.search(self.TOKEN_PATTERN, self.html)
-            if m is None:
-                self.error(_("TOKEN_PATTERN not found"))
-            token = m.group(1)
-
-            self.html = self.load(pyfile.url, get={'do': "askAgeForm-submit"},
-                                  post={"agree": "Confirm", "_token_": token})
-
-        if self.PASSWD_PATTERN in self.html:
-            password = self.getPassword()
-
-            if password:
-                self.logInfo(_("Password protected link, trying ") + password)
-                self.html = self.load(pyfile.url, get={'do': "passwordProtectedForm-submit"},
-                                      post={"password": password, "password_send": 'Send'})
-
-                if self.PASSWD_PATTERN in self.html:
-                    self.fail(_("Incorrect password"))
-            else:
-                self.fail(_("No password found"))
-
-        if re.search(self.VIPLINK_PATTERN, self.html):
-            self.html = self.load(pyfile.url, get={'disclaimer': "1"})
-
-        self.getFileInfo()
-
-        if self.premium and self.checkTrafficLeft():
-            self.handlePremium(pyfile)
-        else:
-            self.handleFree(pyfile)
+    #@NOTE: Temp work-around to `Content-Disposition=filename*=UTF-8` bug!
+    def handleDirect(self, pyfile):
+        self.link = self.directLink(pyfile.url, self.resumeDownload)
 
-        self.checkFile()
+        if self.link:
+            remote = urllib2.urlopen(link)
+            name   = remote.info()['Content-Disposition'].split(';')
+            pyfile.name = name[1].split('filename=')[1][1:]
 
 
     def handleFree(self, pyfile):
@@ -114,15 +86,47 @@ class UlozTo(SimpleHoster):
             self.logDebug("CAPTCHA HASH: " + data['hash'], "CAPTCHA SALT: " + str(data['salt']), "CAPTCHA VALUE: " + captcha_value)
 
             inputs.update({'timestamp': data['timestamp'], 'salt': data['salt'], 'hash': data['hash'], 'captcha_value': captcha_value})
+
         else:
             self.error(_("CAPTCHA form changed"))
 
-        self.multiDL = True
-        self.download("http://www.ulozto.net" + action, post=inputs, disposition=True)
+        self.download("http://www.ulozto.net" + action, post=inputs)
 
 
     def handlePremium(self, pyfile):
-        self.download(pyfile.url, get={'do': "directDownload"}, disposition=True)
+        self.download(pyfile.url, get={'do': "directDownload"})
+
+
+    def checkErrors(self):
+        if re.search(self.ADULT_PATTERN, self.html):
+            self.logInfo(_("Adult content confirmation needed"))
+
+            m = re.search(self.TOKEN_PATTERN, self.html)
+            if m is None:
+                self.error(_("TOKEN_PATTERN not found"))
+
+            self.html = self.load(pyfile.url,
+                                  get={'do': "askAgeForm-submit"},
+                                  post={"agree": "Confirm", "_token_": m.group(1)})
+
+        if self.PASSWD_PATTERN in self.html:
+            password = self.getPassword()
+
+            if password:
+                self.logInfo(_("Password protected link, trying ") + password)
+                self.html = self.load(pyfile.url,
+                                      get={'do': "passwordProtectedForm-submit"},
+                                      post={"password": password, "password_send": 'Send'})
+
+                if self.PASSWD_PATTERN in self.html:
+                    self.fail(_("Incorrect password"))
+            else:
+                self.fail(_("No password found"))
+
+        if re.search(self.VIPLINK_PATTERN, self.html):
+            self.html = self.load(pyfile.url, get={'disclaimer': "1"})
+
+        return super(UlozTo, self).checkErrors()
 
 
     def checkFile(self, rules={}):
@@ -135,8 +139,6 @@ class UlozTo(SimpleHoster):
         })
 
         if check == "wrong_captcha":
-            #self.delStorage("captcha_id")
-            #self.delStorage("captcha_text")
             self.invalidCaptcha()
             self.retry(reason=_("Wrong captcha code"))
 
@@ -153,7 +155,7 @@ class UlozTo(SimpleHoster):
             self.retry()
 
         elif check == "not_found":
-            self.fail(_("Server error - file not downloadable"))
+            self.fail(_("Server error, file not downloadable"))
 
         return super(UlozTo, self).checkFile(rules)
 
-- 
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/hoster/CrockoCom.py       | 12 ++++++------
 module/plugins/hoster/CzshareCom.py      |  6 +++---
 module/plugins/hoster/DataHu.py          |  2 +-
 module/plugins/hoster/DepositfilesCom.py |  2 +-
 module/plugins/hoster/DlFreeFr.py        |  4 ++--
 module/plugins/hoster/EdiskCz.py         |  2 +-
 module/plugins/hoster/ExtabitCom.py      |  2 +-
 module/plugins/hoster/FilejungleCom.py   |  2 +-
 module/plugins/hoster/FilepostCom.py     |  2 +-
 module/plugins/hoster/FileserveCom.py    |  2 +-
 module/plugins/hoster/HugefilesNet.py    |  2 +-
 module/plugins/hoster/IfolderRu.py       | 10 +++++-----
 module/plugins/hoster/Keep2ShareCc.py    |  4 ++--
 module/plugins/hoster/MegaRapidCz.py     |  4 ++--
 module/plugins/hoster/MegaRapidoNet.py   |  8 ++++----
 module/plugins/hoster/MegasharesCom.py   |  8 ++++----
 module/plugins/hoster/MovReelCom.py      |  2 +-
 module/plugins/hoster/NovafileCom.py     |  4 ++--
 module/plugins/hoster/NowDownloadSx.py   |  2 +-
 module/plugins/hoster/OneFichierCom.py   | 25 ++++++++++---------------
 module/plugins/hoster/PornhubCom.py      |  2 +-
 module/plugins/hoster/PromptfileCom.py   |  6 +++---
 module/plugins/hoster/QuickshareCz.py    |  2 +-
 module/plugins/hoster/RapidgatorNet.py   |  2 +-
 module/plugins/hoster/SendspaceCom.py    |  6 +++---
 module/plugins/hoster/StreamCz.py        |  4 ++--
 module/plugins/hoster/UloziskoSk.py      |  8 ++++----
 module/plugins/hoster/UnibytesCom.py     |  4 ++--
 module/plugins/hoster/UploadedTo.py      |  2 +-
 module/plugins/hoster/UpstoreNet.py      |  2 +-
 module/plugins/hoster/VeehdCom.py        |  4 ++--
 31 files changed, 71 insertions(+), 76 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/CrockoCom.py b/module/plugins/hoster/CrockoCom.py
index 6a9715465..1d7468520 100644
--- a/module/plugins/hoster/CrockoCom.py
+++ b/module/plugins/hoster/CrockoCom.py
@@ -19,16 +19,16 @@ class CrockoCom(SimpleHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)'
-    SIZE_PATTERN = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>'
+    NAME_PATTERN    = r'<span class="fz24">Download:\s*<strong>(?P<N>.*)'
+    SIZE_PATTERN    = r'<span class="tip1"><span class="inner">(?P<S>[^<]+)</span></span>'
     OFFLINE_PATTERN = r'<h1>Sorry,<br />the page you\'re looking for <br />isn\'t here.</h1>|File not found'
 
-    CAPTCHA_PATTERN = re.compile(r"u='(/file_contents/captcha/\w+)';\s*w='(\d+)';")
+    CAPTCHA_PATTERN = r"u='(/file_contents/captcha/\w+)';\s*w='(\d+)';"
 
-    FORM_PATTERN = r'<form  method="post" action="([^"]+)">(.*?)</form>'
-    FORM_INPUT_PATTERN = r'<input[^>]* name="?([^" ]+)"? value="?([^" ]+)"?[^>]*>'
+    FORM_PATTERN = r'<form  method="post" action="(.+?)">(.*?)</form>'
+    FORM_INPUT_PATTERN = r'<input[^>]* name="?([^" ]+)"? value="?([^" ]+)"?.*?>'
 
-    NAME_REPLACEMENTS = [(r'<[^>]*>', '')]
+    NAME_REPLACEMENTS = [(r'<.*?>', '')]
 
 
     def handleFree(self, pyfile):
diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py
index 6494ce0bd..8f72f2148 100644
--- a/module/plugins/hoster/CzshareCom.py
+++ b/module/plugins/hoster/CzshareCom.py
@@ -22,7 +22,7 @@ class CzshareCom(SimpleHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN    = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=[^>]*>(?P<N>[^<]+)</a>'
+    NAME_PATTERN    = r'<div class="tab" id="parameters">\s*<p>\s*Cel. n.zev: <a href=.*?>(?P<N>[^<]+)</a>'
     SIZE_PATTERN    = r'<div class="tab" id="category">(?:\s*<p>[^\n]*</p>)*\s*Velikost:\s*(?P<S>[\d .,]+)(?P<U>[\w^_]+)\s*</div>'
     OFFLINE_PATTERN = r'<div class="header clearfix">\s*<h2 class="red">'
 
@@ -31,10 +31,10 @@ class CzshareCom(SimpleHoster):
 
     CHECK_TRAFFIC = True
 
-    FREE_URL_PATTERN     = r'<a href="([^"]+)" class="page-download">[^>]*alt="([^"]+)" /></a>'
+    FREE_URL_PATTERN     = r'<a href="(.+?)" class="page-download">[^>]*alt="(.+?)" /></a>'
     FREE_FORM_PATTERN    = r'<form action="download\.php" method="post">\s*<img src="captcha\.php" id="captcha" />(.*?)</form>'
     PREMIUM_FORM_PATTERN = r'<form action="/profi_down\.php" method="post">(.*?)</form>'
-    FORM_INPUT_PATTERN   = r'<input[^>]* name="([^"]+)" value="([^"]+)"[^>]*/>'
+    FORM_INPUT_PATTERN   = r'<input[^>]* name="(.+?)" value="(.+?)"[^>]*/>'
     MULTIDL_PATTERN      = r'<p><font color=\'red\'>Z[^<]*PROFI.</font></p>'
     USER_CREDIT_PATTERN  = r'<div class="credit">\s*kredit: <strong>([\d .,]+)(\w+)</strong>\s*</div><!-- .credit -->'
 
diff --git a/module/plugins/hoster/DataHu.py b/module/plugins/hoster/DataHu.py
index 58e5b7e3e..955c94437 100644
--- a/module/plugins/hoster/DataHu.py
+++ b/module/plugins/hoster/DataHu.py
@@ -24,7 +24,7 @@ class DataHu(SimpleHoster):
 
     INFO_PATTERN = ur'<title>(?P<N>.*) \((?P<S>[^)]+)\) let\xf6lt\xe9se</title>'
     OFFLINE_PATTERN = ur'Az adott f\xe1jl nem l\xe9tezik'
-    LINK_FREE_PATTERN = r'<div class="download_box_button"><a href="([^"]+)">'
+    LINK_FREE_PATTERN = r'<div class="download_box_button"><a href="(.+?)">'
 
 
     def setup(self):
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index e6f47dc0a..95fd7c1b1 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -28,7 +28,7 @@ class DepositfilesCom(SimpleHoster):
     OFFLINE_PATTERN = r'<span class="html_download_api-not_exists"></span>'
 
     NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))),
-                              (r'.*<b title="(?P<N>[^"]+).*', "\g<N>")]
+                              (r'.*<b title="(?P<N>.+?)".*', "\g<N>")]
     URL_REPLACEMENTS  = [(__pattern__ + ".*", "https://dfiles.eu/files/\g<ID>")]
 
     COOKIES = [("dfiles.eu", "lang_current", "en")]
diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py
index 38cc675a6..72d15852c 100644
--- a/module/plugins/hoster/DlFreeFr.py
+++ b/module/plugins/hoster/DlFreeFr.py
@@ -48,8 +48,8 @@ class DlFreeFr(SimpleHoster):
                        ("Toilal", "toilal.dev@gmail.com")]
 
 
-    NAME_PATTERN = r'Fichier:</td>\s*<td[^>]*>(?P<N>[^>]*)</td>'
-    SIZE_PATTERN = r'Taille:</td>\s*<td[^>]*>(?P<S>[\d.,]+\w)o'
+    NAME_PATTERN = r'Fichier:</td>\s*<td.*?>(?P<N>[^>]*)</td>'
+    SIZE_PATTERN = r'Taille:</td>\s*<td.*?>(?P<S>[\d.,]+\w)o'
     OFFLINE_PATTERN = r'Erreur 404 - Document non trouv|Fichier inexistant|Le fichier demand&eacute; n\'a pas &eacute;t&eacute; trouv&eacute;'
 
 
diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py
index a27bf46d2..cfa6da4eb 100644
--- a/module/plugins/hoster/EdiskCz.py
+++ b/module/plugins/hoster/EdiskCz.py
@@ -18,7 +18,7 @@ class EdiskCz(SimpleHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    INFO_PATTERN = r'<span class="fl" title="(?P<N>[^"]+)">\s*.*?\((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</h1></span>'
+    INFO_PATTERN = r'<span class="fl" title="(?P<N>.+?)">\s*.*?\((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</h1></span>'
     OFFLINE_PATTERN = r'<h3>This file does not exist due to one of the following:</h3><ul><li>'
 
     ACTION_PATTERN = r'/en/download/(\d+/.*\.html)'
diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py
index e0c02e08e..a485f0c4d 100644
--- a/module/plugins/hoster/ExtabitCom.py
+++ b/module/plugins/hoster/ExtabitCom.py
@@ -21,7 +21,7 @@ class ExtabitCom(SimpleHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN = r'<th>File:</th>\s*<td class="col-fileinfo">\s*<div title="(?P<N>[^"]+)">'
+    NAME_PATTERN = r'<th>File:</th>\s*<td class="col-fileinfo">\s*<div title="(?P<N>.+?)">'
     SIZE_PATTERN = r'<th>Size:</th>\s*<td class="col-fileinfo">(?P<S>[^<]+)</td>'
     OFFLINE_PATTERN = r'>File not found<'
     TEMP_OFFLINE_PATTERN = r'>(File is temporary unavailable|No download mirror)<'
diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py
index 8a8aee9e2..236603c6e 100644
--- a/module/plugins/hoster/FilejungleCom.py
+++ b/module/plugins/hoster/FilejungleCom.py
@@ -19,7 +19,7 @@ class FilejungleCom(FileserveCom):
     URLS = ["http://www.filejungle.com/f/", "http://www.filejungle.com/check_links.php",
             "http://www.filejungle.com/checkReCaptcha.php"]
     LINKCHECK_TR = r'<li>\s*(<div class="col1">.*?)</li>'
-    LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<[^>]*>|&nbsp;)*([^<]*)'
+    LINKCHECK_TD = r'<div class="(?:col )?col\d">(?:<.*?>|&nbsp;)*([^<]*)'
 
     LONG_WAIT_PATTERN = r'<h1>Please wait for (\d+) (\w+)\s*to download the next file\.</h1>'
 
diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py
index 610de51f8..78960dc6d 100644
--- a/module/plugins/hoster/FilepostCom.py
+++ b/module/plugins/hoster/FilepostCom.py
@@ -21,7 +21,7 @@ class FilepostCom(SimpleHoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    INFO_PATTERN = r'<input type="text" id="url" value=\'<a href[^>]*>(?P<N>[^>]+?) - (?P<S>[\d.,]+) (?P<U>[\w^_]+)</a>\' class="inp_text"/>'
+    INFO_PATTERN = r'<input type="text" id="url" value=\'<a href.*?>(?P<N>[^>]+?) - (?P<S>[\d.,]+) (?P<U>[\w^_]+)</a>\' class="inp_text"/>'
     OFFLINE_PATTERN = r'class="error_msg_title"> Invalid or Deleted File. </div>|<div class="file_info file_info_deleted">'
 
     PREMIUM_ONLY_PATTERN = r'members only. Please upgrade to premium|a premium membership is required to download this file'
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
index 6f316cea3..4bca2eb59 100644
--- a/module/plugins/hoster/FileserveCom.py
+++ b/module/plugins/hoster/FileserveCom.py
@@ -48,7 +48,7 @@ class FileserveCom(Hoster):
     URLS = ["http://www.fileserve.com/file/", "http://www.fileserve.com/link-checker.php",
             "http://www.fileserve.com/checkReCaptcha.php"]
     LINKCHECK_TR = r'<tr>\s*(<td>http://www\.fileserve\.com/file/.*?)</tr>'
-    LINKCHECK_TD = r'<td>(?:<[^>]*>|&nbsp;)*([^<]*)'
+    LINKCHECK_TD = r'<td>(?:<.*?>|&nbsp;)*([^<]*)'
 
     CAPTCHA_KEY_PATTERN = r'var reCAPTCHA_publickey=\'(.+?)\''
     LONG_WAIT_PATTERN = r'<li class="title">You need to wait (\d+) (\w+) to start another download\.</li>'
diff --git a/module/plugins/hoster/HugefilesNet.py b/module/plugins/hoster/HugefilesNet.py
index b7e599a50..3fdcca1ba 100644
--- a/module/plugins/hoster/HugefilesNet.py
+++ b/module/plugins/hoster/HugefilesNet.py
@@ -17,7 +17,7 @@ class HugefilesNet(XFSHoster):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-    SIZE_PATTERN = r'File Size:</span>\s*<span[^>]*>(?P<S>[^<]+)</span></div>'
+    SIZE_PATTERN = r'File Size:</span>\s*<span.*?>(?P<S>[^<]+)</span></div>'
 
     FORM_INPUTS_MAP = {'ctype': re.compile(r'\d+')}
 
diff --git a/module/plugins/hoster/IfolderRu.py b/module/plugins/hoster/IfolderRu.py
index 01618f37d..0f09731e4 100644
--- a/module/plugins/hoster/IfolderRu.py
+++ b/module/plugins/hoster/IfolderRu.py
@@ -10,7 +10,7 @@ class IfolderRu(SimpleHoster):
     __type__    = "hoster"
     __version__ = "0.39"
 
-    __pattern__ = r'http://(?:www|files\.)?(?:ifolder\.ru|metalarea\.org|rusfolder\.(?:com|net|ru))/(?:files/)?(?P<ID>\d+)'
+    __pattern__ = r'http://(?:www)?(files\.)?(ifolder\.ru|metalarea\.org|rusfolder\.(com|net|ru))/(files/)?(?P<ID>\d+)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Ifolder.ru hoster plugin"""
@@ -22,13 +22,13 @@ class IfolderRu(SimpleHoster):
 
     NAME_PATTERN    = ur'(?:<div><span>)?Название:(?:</span>)? <b>(?P<N>[^<]+)</b><(?:/div|br)>'
     SIZE_PATTERN    = ur'(?:<div><span>)?Размер:(?:</span>)? <b>(?P<S>[^<]+)</b><(?:/div|br)>'
-    OFFLINE_PATTERN = ur'<p>Файл номер <b>[^<]*</b> (не найден|удален) !!!</p>'
+    OFFLINE_PATTERN = ur'<p>Файл номер <b>.*?</b> (не найден|удален) !!!</p>'
 
-    SESSION_ID_PATTERN = r'<input type="hidden" name="session" value="([^"]+)"'
-    INTS_SESSION_PATTERN = r'\(\'ints_session\'\);\s*if\(tag\)\{tag\.value = "([^"]+)";\}'
+    SESSION_ID_PATTERN = r'<input type="hidden" name="session" value="(.+?)"'
+    INTS_SESSION_PATTERN = r'\(\'ints_session\'\);\s*if\(tag\)\{tag\.value = "(.+?)";\}'
     HIDDEN_INPUT_PATTERN = r'var v = .*?name=\'(.+?)\' value=\'1\''
 
-    LINK_FREE_PATTERN = r'<a href="([^"]+)" class="downloadbutton_files"'
+    LINK_FREE_PATTERN = r'<a href="(.+?)" class="downloadbutton_files"'
 
     WRONG_CAPTCHA_PATTERN = ur'<font color=Red>неверный код,<br>введите еще раз</font><br>'
 
diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py
index 6916797bd..5afa87a4a 100644
--- a/module/plugins/hoster/Keep2ShareCc.py
+++ b/module/plugins/hoster/Keep2ShareCc.py
@@ -30,7 +30,7 @@ class Keep2ShareCc(SimpleHoster):
     OFFLINE_PATTERN      = r'File not found or deleted|Sorry, this file is blocked or deleted|Error 404'
     TEMP_OFFLINE_PATTERN = r'Downloading blocked due to'
 
-    LINK_FREE_PATTERN    = r'"([^"]+url.html?file=.+?)"|window\.location\.href = \'(.+?)\';'
+    LINK_FREE_PATTERN    = r'"(.+?url.html?file=.+?)"|window\.location\.href = \'(.+?)\';'
     LINK_PREMIUM_PATTERN = r'window\.location\.href = \'(.+?)\';'
 
     CAPTCHA_PATTERN = r'src="(/file/captcha\.html.+?)"'
@@ -67,7 +67,7 @@ class Keep2ShareCc(SimpleHoster):
 
 
     def handleFree(self, pyfile):
-        self.fid  = re.search(r'<input type="hidden" name="slow_id" value="([^"]+)">', self.html).group(1)
+        self.fid  = re.search(r'<input type="hidden" name="slow_id" value="(.+?)">', self.html).group(1)
         self.html = self.load(pyfile.url, post={'yt0': '', 'slow_id': self.fid})
 
         self.checkErrors()
diff --git a/module/plugins/hoster/MegaRapidCz.py b/module/plugins/hoster/MegaRapidCz.py
index d03225d8e..577a3d511 100644
--- a/module/plugins/hoster/MegaRapidCz.py
+++ b/module/plugins/hoster/MegaRapidCz.py
@@ -36,13 +36,13 @@ class MegaRapidCz(SimpleHoster):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    NAME_PATTERN = r'<h1[^>]*><span[^>]*>(?:<a[^>]*>)?(?P<N>[^<]+)'
+    NAME_PATTERN = r'<h1.*?><span.*?>(?:<a.*?>)?(?P<N>[^<]+)'
     SIZE_PATTERN = r'<td class="i">Velikost:</td>\s*<td class="h"><strong>\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)</strong></td>'
     OFFLINE_PATTERN = ur'Nastala chyba 404|Soubor byl smazán'
 
     CHECK_TRAFFIC = True
 
-    LINK_PREMIUM_PATTERN = r'<a href="([^"]+)" title="Stahnout">([^<]+)</a>'
+    LINK_PREMIUM_PATTERN = r'<a href="(.+?)" title="Stahnout">([^<]+)</a>'
 
     ERR_LOGIN_PATTERN  = ur'<div class="error_div"><strong>Stahování je přístupné pouze přihlášeným uživatelům'
     ERR_CREDIT_PATTERN = ur'<div class="error_div"><strong>Stahování zdarma je možné jen přes náš'
diff --git a/module/plugins/hoster/MegaRapidoNet.py b/module/plugins/hoster/MegaRapidoNet.py
index b38374646..b5bd7f3f2 100644
--- a/module/plugins/hoster/MegaRapidoNet.py
+++ b/module/plugins/hoster/MegaRapidoNet.py
@@ -8,8 +8,8 @@ from module.plugins.internal.MultiHoster import MultiHoster
 def random_with_N_digits(n):
     rand = "0."
     not_zero = 0
-    for i in range(1,n+1):
-        r = randint(0,9)
+    for i in range(1, n + 1):
+        r = randint(0, 9)
         if(r > 0):
             not_zero += 1
         rand += str(r)
@@ -33,9 +33,9 @@ class MegaRapidoNet(MultiHoster):
     __authors__     = [("Kagenoshin", "kagenoshin@gmx.ch")]
 
 
-    LINK_PREMIUM_PATTERN = r'<\s*?a[^>]*?title\s*?=\s*?["\'][^"\']*?download["\'][^>]*?href=["\']([^"\']*)'
+    LINK_PREMIUM_PATTERN = r'<\s*?a[^>]*?title\s*?=\s*?["\'].*?download["\'][^>]*?href=["\']([^"\']+)'
 
-    ERROR_PATTERN = r'<\s*?div[^>]*?class\s*?=\s*?["\']?alert-message error[^>]*>([^<]*)'
+    ERROR_PATTERN = r'<\s*?div[^>]*?class\s*?=\s*?["\']?alert-message error.*?>([^<]*)'
 
 
     def handlePremium(self, pyfile):
diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py
index 473675b64..c6ccdb587 100644
--- a/module/plugins/hoster/MegasharesCom.py
+++ b/module/plugins/hoster/MegasharesCom.py
@@ -20,17 +20,17 @@ class MegasharesCom(SimpleHoster):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    NAME_PATTERN = r'<h1 class="black xxl"[^>]*title="(?P<N>[^"]+)">'
+    NAME_PATTERN = r'<h1 class="black xxl"[^>]*title="(?P<N>.+?)">'
     SIZE_PATTERN = r'<strong><span class="black">Filesize:</span></strong> (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'<dd class="red">(Invalid Link Request|Link has been deleted|Invalid link)'
 
-    LINK_PATTERN = r'<div id="show_download_button_%d"[^>]*>\s*<a href="([^"]+)">'
+    LINK_PATTERN = r'<div id="show_download_button_%d".*?>\s*<a href="(.+?)">'
 
-    PASSPORT_LEFT_PATTERN = r'Your Download Passport is: <[^>]*>(\w+).*?You have.*?<[^>]*>.*?([\d.]+) (\w+)'
+    PASSPORT_LEFT_PATTERN = r'Your Download Passport is: <.*?>(\w+).*?You have.*?<.*?>.*?([\d.]+) (\w+)'
     PASSPORT_RENEW_PATTERN = r'(\d+):<strong>(\d+)</strong>:<strong>(\d+)</strong>'
     REACTIVATE_NUM_PATTERN = r'<input[^>]*id="random_num" value="(\d+)" />'
     REACTIVATE_PASSPORT_PATTERN = r'<input[^>]*id="passport_num" value="(\w+)" />'
-    REQUEST_URI_PATTERN = r'var request_uri = "([^"]+)";'
+    REQUEST_URI_PATTERN = r'var request_uri = "(.+?)";'
     NO_SLOTS_PATTERN = r'<dd class="red">All download slots for this link are currently filled'
 
 
diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py
index 9b8679c10..2fe5184ae 100644
--- a/module/plugins/hoster/MovReelCom.py
+++ b/module/plugins/hoster/MovReelCom.py
@@ -15,7 +15,7 @@ class MovReelCom(XFSHoster):
     __authors__     = [("JorisV83", "jorisv83-pyload@yahoo.com")]
 
 
-    LINK_PATTERN = r'<a href="([^"]+)">Download Link'
+    LINK_PATTERN = r'<a href="(.+?)">Download Link'
 
 
 getInfo = create_getInfo(MovReelCom)
diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py
index bdd66473b..b00f71635 100644
--- a/module/plugins/hoster/NovafileCom.py
+++ b/module/plugins/hoster/NovafileCom.py
@@ -20,8 +20,8 @@ class NovafileCom(XFSHoster):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
-    ERROR_PATTERN = r'class="alert[^"]*alert-separate"[^>]*>\s*(?:<p>)?(.*?)\s*</'
-    WAIT_PATTERN  = r'<p>Please wait <span id="count"[^>]*>(\d+)</span> seconds</p>'
+    ERROR_PATTERN = r'class="alert.+?alert-separate".*?>\s*(?:<p>)?(.*?)\s*</'
+    WAIT_PATTERN  = r'<p>Please wait <span id="count".*?>(\d+)</span> seconds</p>'
 
     LINK_PATTERN = r'<a href="(http://s\d+\.novafile\.com/.*?)" class="btn btn-green">Download File</a>'
 
diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py
index 2fd9293c7..5ef36d270 100644
--- a/module/plugins/hoster/NowDownloadSx.py
+++ b/module/plugins/hoster/NowDownloadSx.py
@@ -28,7 +28,7 @@ class NowDownloadSx(SimpleHoster):
     WAIT_PATTERN = r'\.countdown\(\{until: \+(\d+),'
     LINK_FREE_PATTERN = r'(http://s\d+\.coolcdn\.info/nowdownload/.+?)["\']'
 
-    NAME_REPLACEMENTS = [("&#?\w+;", fixup), (r'<[^>]*>', '')]
+    NAME_REPLACEMENTS = [("&#?\w+;", fixup), (r'<.*?>', '')]
 
 
     def setup(self):
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 0a49084cf..e7d7675e0 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -41,6 +41,16 @@ class OneFichierCom(SimpleHoster):
         self.resumeDownload = True
 
 
+    #@NOTE: Temp work-around to `Content-Disposition=filename*=UTF-8` bug!
+    def handleDirect(self, pyfile):
+        self.link = self.directLink(pyfile.url, self.resumeDownload)
+
+        if self.link:
+            remote = urllib2.urlopen(link)
+            name   = remote.info()['Content-Disposition'].split(';')
+            pyfile.name = name[1].split('filename=')[1][1:]
+
+
     def handleFree(self, pyfile):
         id = self.info['pattern']['ID1'] or self.info['pattern']['ID2']
         url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id)
@@ -55,21 +65,6 @@ class OneFichierCom(SimpleHoster):
 
         self.download(url, post=inputs)
 
-    def handleDirect(self, pyfile):
-        link = self.directLink(pyfile.url, self.resumeDownload)
-
-        if link:
-            self.logInfo(_("Direct download link detected"))
-            remote = urllib2.urlopen(link)
-            name = remote.info()['Content-Disposition'].split(';')
-            filename = name[1].split('filename=')[1]
-            filename = filename[1:-1]
-            self.logDebug("filename=" + filename)
-            pyfile.name = filename
-            self.link = link
-        else:
-            self.logDebug("Direct download link not found")
-
 
     def handlePremium(self, pyfile):
         self.download(pyfile.url, post={'dl': "Download", 'did': 0})
diff --git a/module/plugins/hoster/PornhubCom.py b/module/plugins/hoster/PornhubCom.py
index 1bb787f09..9e0b16a85 100644
--- a/module/plugins/hoster/PornhubCom.py
+++ b/module/plugins/hoster/PornhubCom.py
@@ -64,7 +64,7 @@ class PornhubCom(Hoster):
         if not self.html:
             self.download_html()
 
-        m = re.search(r'<title[^>]+>([^<]+) - ', self.html)
+        m = re.search(r'<title.+?>([^<]+) - ', self.html)
         if m:
             name = m.group(1)
         else:
diff --git a/module/plugins/hoster/PromptfileCom.py b/module/plugins/hoster/PromptfileCom.py
index 97edbd48e..3815a1a24 100644
--- a/module/plugins/hoster/PromptfileCom.py
+++ b/module/plugins/hoster/PromptfileCom.py
@@ -18,10 +18,10 @@ class PromptfileCom(SimpleHoster):
     __authors__     = [("igel", "igelkun@myopera.com")]
 
 
-    INFO_PATTERN = r'<span style="[^"]*" title="[^"]*">(?P<N>.*?) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</span>'
-    OFFLINE_PATTERN = r'<span style="[^"]*" title="File Not Found">File Not Found</span>'
+    INFO_PATTERN = r'<span style=".+?" title=".+?">(?P<N>.*?) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</span>'
+    OFFLINE_PATTERN = r'<span style=".+?" title="File Not Found">File Not Found</span>'
 
-    CHASH_PATTERN = r'<input type="hidden" name="chash" value="([^"]*)" />'
+    CHASH_PATTERN = r'<input type="hidden" name="chash" value="(.+?)" />'
     LINK_FREE_PATTERN = r'<a href=\"(.+)\" target=\"_blank\" class=\"view_dl_link\">Download File</a>'
 
 
diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py
index c9ed1c024..250a33d0d 100644
--- a/module/plugins/hoster/QuickshareCz.py
+++ b/module/plugins/hoster/QuickshareCz.py
@@ -30,7 +30,7 @@ class QuickshareCz(SimpleHoster):
         self.getFileInfo()
 
         # parse js variables
-        self.jsvars = dict((x, y.strip("'")) for x, y in re.findall(r"var (\w+) = ([\d.]+|'[^']*')", self.html))
+        self.jsvars = dict((x, y.strip("'")) for x, y in re.findall(r"var (\w+) = ([\d.]+|'.+?')", self.html))
         self.logDebug(self.jsvars)
         pyfile.name = self.jsvars['ID3']
 
diff --git a/module/plugins/hoster/RapidgatorNet.py b/module/plugins/hoster/RapidgatorNet.py
index 19c77f15d..2626ec925 100644
--- a/module/plugins/hoster/RapidgatorNet.py
+++ b/module/plugins/hoster/RapidgatorNet.py
@@ -43,7 +43,7 @@ class RapidgatorNet(SimpleHoster):
     LINK_FREE_PATTERN = r'return \'(http://\w+.rapidgator.net/.*)\';'
 
     RECAPTCHA_PATTERN  = r'"http://api\.recaptcha\.net/challenge\?k=(.*?)"'
-    ADSCAPTCHA_PATTERN = r'(http://api\.adscaptcha\.com/Get\.aspx[^"\']*)'
+    ADSCAPTCHA_PATTERN = r'(http://api\.adscaptcha\.com/Get\.aspx[^"\']+)'
     SOLVEMEDIA_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.script\?k=(.*?)"'
 
 
diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py
index c3130135b..148217fe6 100644
--- a/module/plugins/hoster/SendspaceCom.py
+++ b/module/plugins/hoster/SendspaceCom.py
@@ -22,10 +22,10 @@ class SendspaceCom(SimpleHoster):
     SIZE_PATTERN    = r'<div class="file_description reverse margin_center">\s*<b>File Size:</b>\s*(?P<S>[\d.,]+)(?P<U>[\w^_]+)\s*</div>'
     OFFLINE_PATTERN = r'<div class="msg error" style="cursor: default">Sorry, the file you requested is not available.</div>'
 
-    LINK_FREE_PATTERN = r'<a id="download_button" href="([^"]+)"'
+    LINK_FREE_PATTERN = r'<a id="download_button" href="(.+?)"'
 
-    CAPTCHA_PATTERN      = r'<td><img src="(/captchas/captcha\.php?captcha=([^"]+))"></td>'
-    USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha\.php?user=([^"]+))"></td>'
+    CAPTCHA_PATTERN      = r'<td><img src="(/captchas/captcha\.php?captcha=(.+?))"></td>'
+    USER_CAPTCHA_PATTERN = r'<td><img src="/captchas/captcha\.php?user=(.+?))"></td>'
 
 
     def handleFree(self, pyfile):
diff --git a/module/plugins/hoster/StreamCz.py b/module/plugins/hoster/StreamCz.py
index 11d4efcdb..97bed8109 100644
--- a/module/plugins/hoster/StreamCz.py
+++ b/module/plugins/hoster/StreamCz.py
@@ -32,10 +32,10 @@ class StreamCz(Hoster):
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN = r'<link rel="video_src" href="http://www\.stream\.cz/\w+/(\d+)-([^"]+)" />'
+    NAME_PATTERN = r'<link rel="video_src" href="http://www\.stream\.cz/\w+/(\d+)-(.+?)" />'
     OFFLINE_PATTERN = r'<h1 class="commonTitle">Str.nku nebylo mo.n. nal.zt \(404\)</h1>'
 
-    CDN_PATTERN = r'<param name="flashvars" value="[^"]*&id=(?P<ID>\d+)(?:&cdnLQ=(?P<cdnLQ>\d*))?(?:&cdnHQ=(?P<cdnHQ>\d*))?(?:&cdnHD=(?P<cdnHD>\d*))?&'
+    CDN_PATTERN = r'<param name="flashvars" value=".+?&id=(?P<ID>\d+)(?:&cdnLQ=(?P<cdnLQ>\d*))?(?:&cdnHQ=(?P<cdnHQ>\d*))?(?:&cdnHD=(?P<cdnHD>\d*))?&'
 
 
     def setup(self):
diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py
index e8355500c..39a375b49 100644
--- a/module/plugins/hoster/UloziskoSk.py
+++ b/module/plugins/hoster/UloziskoSk.py
@@ -22,10 +22,10 @@ class UloziskoSk(SimpleHoster):
     SIZE_PATTERN = ur'Veľkosť súboru: <strong>(?P<S>[\d.,]+) (?P<U>[\w^_]+)</strong><br />'
     OFFLINE_PATTERN = ur'<span class = "red">Zadaný súbor neexistuje z jedného z nasledujúcich dôvodov:</span>'
 
-    LINK_FREE_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">'
-    ID_PATTERN = r'<input type = "hidden" name = "id" value = "([^"]+)" />'
-    CAPTCHA_PATTERN = r'<img src="(/obrazky/obrazky\.php\?fid=[^"]+)" alt="" />'
-    IMG_PATTERN = ur'<strong>PRE ZVÄČŠENIE KLIKNITE NA OBRÁZOK</strong><br /><a href = "([^"]+)">'
+    LINK_FREE_PATTERN = r'<form name = "formular" action = "(.+?)" method = "post">'
+    ID_PATTERN = r'<input type = "hidden" name = "id" value = "(.+?)" />'
+    CAPTCHA_PATTERN = r'<img src="(/obrazky/obrazky\.php\?fid=.+?)" alt="" />'
+    IMG_PATTERN = ur'<strong>PRE ZVÄČŠENIE KLIKNITE NA OBRÁZOK</strong><br /><a href = "(.+?)">'
 
 
     def process(self, pyfile):
diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py
index 93e060b6e..7753f1264 100644
--- a/module/plugins/hoster/UnibytesCom.py
+++ b/module/plugins/hoster/UnibytesCom.py
@@ -24,10 +24,10 @@ class UnibytesCom(SimpleHoster):
 
     HOSTER_DOMAIN = "unibytes.com"
 
-    INFO_PATTERN = r'<span[^>]*?id="fileName"[^>]*>(?P<N>[^>]+)</span>\s*\((?P<S>\d.*?)\)'
+    INFO_PATTERN = r'<span[^>]*?id="fileName".*?>(?P<N>[^>]+)</span>\s*\((?P<S>\d.*?)\)'
 
     WAIT_PATTERN = r'Wait for <span id="slowRest">(\d+)</span> sec'
-    LINK_FREE_PATTERN = r'<a href="([^"]+)">Download</a>'
+    LINK_FREE_PATTERN = r'<a href="(.+?)">Download</a>'
 
 
     def handleFree(self, pyfile):
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index cd1cee6d7..cc64a28eb 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -101,7 +101,7 @@ class UploadedTo(SimpleHoster):
         if "type:'download'" in self.html:
             self.correctCaptcha()
             try:
-                self.link = re.search("url:'([^']+)", self.html).group(1)
+                self.link = re.search("url:'(.+?)'", self.html).group(1)
 
             except Exception:
                 pass
diff --git a/module/plugins/hoster/UpstoreNet.py b/module/plugins/hoster/UpstoreNet.py
index d5d30177a..ec0c88c82 100644
--- a/module/plugins/hoster/UpstoreNet.py
+++ b/module/plugins/hoster/UpstoreNet.py
@@ -23,7 +23,7 @@ class UpstoreNet(SimpleHoster):
     OFFLINE_PATTERN = r'<span class="error">File not found</span>'
 
     WAIT_PATTERN = r'var sec = (\d+)'
-    CHASH_PATTERN = r'<input type="hidden" name="hash" value="([^"]*)">'
+    CHASH_PATTERN = r'<input type="hidden" name="hash" value="(.+?)">'
     LINK_FREE_PATTERN = r'<a href="(https?://.*?)" target="_blank"><b>'
 
 
diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py
index e240df912..78da91020 100644
--- a/module/plugins/hoster/VeehdCom.py
+++ b/module/plugins/hoster/VeehdCom.py
@@ -52,7 +52,7 @@ class VeehdCom(Hoster):
         if not self.html:
             self.download_html()
 
-        m = re.search(r'<title[^>]*>([^<]+) on Veehd</title>', self.html)
+        m = re.search(r'<title.*?>([^<]+) on Veehd</title>', self.html)
         if m is None:
             self.error(_("Video title not found"))
 
@@ -73,7 +73,7 @@ class VeehdCom(Hoster):
         if not self.html:
             self.download_html()
 
-        m = re.search(r'<embed type="video/divx" src="(http://([^/]*\.)?veehd\.com/dl/[^"]+)"',
+        m = re.search(r'<embed type="video/divx" src="(http://([^/]*\.)?veehd\.com/dl/.+?)"',
                           self.html)
         if m is None:
             self.error(_("Embedded video url not found"))
-- 
cgit v1.2.3


From ccc8e88b850846d50089f1f575a3cc2288c3a885 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sat, 28 Mar 2015 01:59:42 +0100
Subject: [GoogledriveCom] Improve

---
 module/plugins/hoster/GoogledriveCom.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py
index d07b5121e..81926080a 100644
--- a/module/plugins/hoster/GoogledriveCom.py
+++ b/module/plugins/hoster/GoogledriveCom.py
@@ -12,7 +12,7 @@ from module.utils import html_unescape
 class GoogledriveCom(SimpleHoster):
     __name__    = "GoogledriveCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -22,7 +22,7 @@ class GoogledriveCom(SimpleHoster):
     __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
-    DISPOSITION = False
+    DISPOSITION = False  #: Remove in 0.4.10
 
     NAME_PATTERN    = r'"og:title" content="(?P<N>.*?)">'
     OFFLINE_PATTERN = r'align="center"><p class="errorMessage"'
@@ -34,6 +34,16 @@ class GoogledriveCom(SimpleHoster):
         self.chunkLimit     = 1
 
 
+    #@NOTE: Temp work-around to `Content-Disposition=filename*=UTF-8` bug!
+    def handleDirect(self, pyfile):
+        self.link = self.directLink(pyfile.url, self.resumeDownload)
+
+        if self.link:
+            remote = urllib2.urlopen(link)
+            name   = remote.info()['Content-Disposition'].split(';')
+            pyfile.name = name[1].split('filename=')[1][1:]
+
+
     def handleFree(self, pyfile):
         try:
             link1 = re.search(r'"(https://docs.google.com/uc\?id.*?export=download)",',
-- 
cgit v1.2.3


From 51d57bfe3d2d37cfa55aec43bbee8d47df84fe7b Mon Sep 17 00:00:00 2001
From: saintego <stegena@gmail.com>
Date: Sun, 29 Mar 2015 17:25:53 +0200
Subject: mediafire link in new format #1297

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

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index 3b39e2420..4490a5057 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -9,7 +9,7 @@ class MediafireCom(SimpleHoster):
     __type__    = "hoster"
     __version__ = "0.85"
 
-    __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/))\w+'
+    __pattern__ = r'(https?://)?(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/)|\?)\w+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Mediafire.com hoster plugin"""
-- 
cgit v1.2.3


From 938986a995454731cdd9820359fc7888ad9c5e8e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 29 Mar 2015 18:36:55 +0200
Subject: [MediafireCom] Version up

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

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/MediafireCom.py b/module/plugins/hoster/MediafireCom.py
index 4490a5057..c022918ae 100644
--- a/module/plugins/hoster/MediafireCom.py
+++ b/module/plugins/hoster/MediafireCom.py
@@ -7,9 +7,9 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class MediafireCom(SimpleHoster):
     __name__    = "MediafireCom"
     __type__    = "hoster"
-    __version__ = "0.85"
+    __version__ = "0.86"
 
-    __pattern__ = r'(https?://)?(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/)|\?)\w+'
+    __pattern__ = r'https?://(?:www\.)?mediafire\.com/(file/|view/\??|download(\.php\?|/)|\?)\w{15}'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Mediafire.com hoster plugin"""
-- 
cgit v1.2.3


From 4b60d0a006b5f4de08ed05c608df2153b0a5aaf8 Mon Sep 17 00:00:00 2001
From: Ludovic Lehmann <ludo.lehmann@gmail.com>
Date: Sun, 29 Mar 2015 23:36:24 +0200
Subject: fix OneFichierCom premium issue : global name 'link' is not defined

---
 module/plugins/hoster/OneFichierCom.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index e7d7675e0..3cbd47838 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class OneFichierCom(SimpleHoster):
     __name__    = "OneFichierCom"
     __type__    = "hoster"
-    __version__ = "0.80"
+    __version__ = "0.81"
 
     __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -22,7 +22,8 @@ class OneFichierCom(SimpleHoster):
                        ("imclem", None),
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+                       ("Walter Purcaro", "vuolter@gmail.com"),
+					   ("Ludovic Lehmann", "ludo.lehmann@gmail.com")]
 
 
     NAME_PATTERN = r'>FileName :</td>\s*<td.*>(?P<N>.+?)<'
@@ -46,7 +47,7 @@ class OneFichierCom(SimpleHoster):
         self.link = self.directLink(pyfile.url, self.resumeDownload)
 
         if self.link:
-            remote = urllib2.urlopen(link)
+            remote = urllib2.urlopen(self.link)
             name   = remote.info()['Content-Disposition'].split(';')
             pyfile.name = name[1].split('filename=')[1][1:]
 
-- 
cgit v1.2.3


From 0bc53014205074fd07cee1a17e38588c8095db07 Mon Sep 17 00:00:00 2001
From: ludoviclehmann <ludo.lehmann@free.fr>
Date: Sun, 29 Mar 2015 23:42:10 +0200
Subject: Fix indentation problem in OneFichierCom.py

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

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 3cbd47838..e585b2d59 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -23,7 +23,7 @@ class OneFichierCom(SimpleHoster):
                        ("stickell", "l.stickell@yahoo.it"),
                        ("Elrick69", "elrick69[AT]rocketmail[DOT]com"),
                        ("Walter Purcaro", "vuolter@gmail.com"),
-					   ("Ludovic Lehmann", "ludo.lehmann@gmail.com")]
+                       ("Ludovic Lehmann", "ludo.lehmann@gmail.com")]
 
 
     NAME_PATTERN = r'>FileName :</td>\s*<td.*>(?P<N>.+?)<'
-- 
cgit v1.2.3


From 1fe7c828b75e86f9a6a1dcc11f9eb3cadec7d84b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 30 Mar 2015 01:07:03 +0200
Subject: [UlozTo] Fix https://github.com/pyload/pyload/issues/1300

---
 module/plugins/hoster/UlozTo.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index 3a6e69c45..49ed598cb 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -15,7 +15,7 @@ def convertDecimalPrefix(m):
 class UlozTo(SimpleHoster):
     __name__    = "UlozTo"
     __type__    = "hoster"
-    __version__ = "1.05"
+    __version__ = "1.06"
 
     __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -30,8 +30,8 @@ class UlozTo(SimpleHoster):
     SIZE_PATTERN    = r'<span id="fileSize">.*?(?P<S>[\d.,]+\s[kMG]?B)</span>'
     OFFLINE_PATTERN = r'<title>404 - Page not found</title>|<h1 class="h1">File (has been deleted|was banned)</h1>'
 
-    URL_REPLACEMENTS  = [(r"(?<=http://)([^/]+)", "www.ulozto.net")]
-    SIZE_REPLACEMENTS = [('([\d.]+)\s([kMG])B', convertDecimalPrefix)]
+    URL_REPLACEMENTS  = [(r'(?<=http://)([^/]+)', "www.ulozto.net")]
+    SIZE_REPLACEMENTS = [(r'([\d.]+)\s([kMG])B', convertDecimalPrefix)]
 
     CHECK_TRAFFIC = True
     DISPOSITION   = False  #: Remove in 0.4.10
@@ -44,7 +44,7 @@ class UlozTo(SimpleHoster):
 
     def setup(self):
         self.chunkLimit     = 16 if self.premium else 1
-        self.multiDL        = self.premium
+        self.multiDL        = True
         self.resumeDownload = True
 
 
@@ -53,8 +53,8 @@ class UlozTo(SimpleHoster):
         self.link = self.directLink(pyfile.url, self.resumeDownload)
 
         if self.link:
-            remote = urllib2.urlopen(link)
-            name   = remote.info()['Content-Disposition'].split(';')
+            remote = urllib2.urlopen(self.link)
+            name = remote.info()['Content-Disposition'].split(';')
             pyfile.name = name[1].split('filename=')[1][1:]
 
 
-- 
cgit v1.2.3


From d15eb15645a91185a0eef553653df19e1e3858ff Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 30 Mar 2015 01:08:22 +0200
Subject: [GoogledriveCom] Fix handleDirect

---
 module/plugins/hoster/GoogledriveCom.py | 6 +++---
 module/plugins/hoster/OneFichierCom.py  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py
index 81926080a..57a5ab7fb 100644
--- a/module/plugins/hoster/GoogledriveCom.py
+++ b/module/plugins/hoster/GoogledriveCom.py
@@ -12,7 +12,7 @@ from module.utils import html_unescape
 class GoogledriveCom(SimpleHoster):
     __name__    = "GoogledriveCom"
     __type__    = "hoster"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -39,8 +39,8 @@ class GoogledriveCom(SimpleHoster):
         self.link = self.directLink(pyfile.url, self.resumeDownload)
 
         if self.link:
-            remote = urllib2.urlopen(link)
-            name   = remote.info()['Content-Disposition'].split(';')
+            remote = urllib2.urlopen(self.link)
+            name = remote.info()['Content-Disposition'].split(';')
             pyfile.name = name[1].split('filename=')[1][1:]
 
 
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index e585b2d59..0c26d4277 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -48,7 +48,7 @@ class OneFichierCom(SimpleHoster):
 
         if self.link:
             remote = urllib2.urlopen(self.link)
-            name   = remote.info()['Content-Disposition'].split(';')
+            name = remote.info()['Content-Disposition'].split(';')
             pyfile.name = name[1].split('filename=')[1][1:]
 
 
-- 
cgit v1.2.3


From 4e05549637e1fd9d417fe0f6a0dec3fed8d1cbdf Mon Sep 17 00:00:00 2001
From: saintego <stegena@gmail.com>
Date: Mon, 30 Mar 2015 01:59:18 +0200
Subject: Some issue in keep2share.cc #1236

`Problem is not fixed. With this change we are able to load captcha, but I got Parse error: No file downloaded | Plugin may be out of date
---
 module/plugins/hoster/Keep2ShareCc.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py
index 5afa87a4a..296226e3c 100644
--- a/module/plugins/hoster/Keep2ShareCc.py
+++ b/module/plugins/hoster/Keep2ShareCc.py
@@ -22,7 +22,7 @@ class Keep2ShareCc(SimpleHoster):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://k2s.cc/file/\g<ID>")]
+    URL_REPLACEMENTS = [(__pattern__ + ".*", "http://keep2s.cc/file/\g<ID>")]
 
     NAME_PATTERN = r'File: <span>(?P<N>.+)</span>'
     SIZE_PATTERN = r'Size: (?P<S>[^<]+)</div>'
@@ -30,7 +30,7 @@ class Keep2ShareCc(SimpleHoster):
     OFFLINE_PATTERN      = r'File not found or deleted|Sorry, this file is blocked or deleted|Error 404'
     TEMP_OFFLINE_PATTERN = r'Downloading blocked due to'
 
-    LINK_FREE_PATTERN    = r'"(.+?url.html?file=.+?)"|window\.location\.href = \'(.+?)\';'
+    LINK_FREE_PATTERN    = r'"([^"]+url.html\?file=.+?)"|window\.location\.href = \'(.+?)\';'
     LINK_PREMIUM_PATTERN = r'window\.location\.href = \'(.+?)\';'
 
     CAPTCHA_PATTERN = r'src="(/file/captcha\.html.+?)"'
@@ -67,8 +67,10 @@ class Keep2ShareCc(SimpleHoster):
 
 
     def handleFree(self, pyfile):
-        self.fid  = re.search(r'<input type="hidden" name="slow_id" value="(.+?)">', self.html).group(1)
+        self.fid  = re.search(r'<input type="hidden" name="slow_id" value="([^"]+)">', self.html).group(1)
         self.html = self.load(pyfile.url, post={'yt0': '', 'slow_id': self.fid})
+        self.logDebug(self.fid)
+        self.logDebug(pyfile.url)
 
         self.checkErrors()
 
@@ -77,7 +79,7 @@ class Keep2ShareCc(SimpleHoster):
         if m is None:
             self.handleCaptcha()
 
-            self.wait(30)
+            self.wait(31)
 
             self.html = self.load(pyfile.url)
 
@@ -89,17 +91,20 @@ class Keep2ShareCc(SimpleHoster):
 
 
     def handleCaptcha(self):
-        recaptcha = ReCaptcha(self)
         post_data = {'free'               : 1,
                      'freeDownloadRequest': 1,
                      'uniqueId'           : self.fid,
                      'yt0'                : ''}
 
+        m = re.search(r'id="(captcha\-form)"', self.html)
+        self.logDebug("captcha-form found %s" % m)
         m = re.search(self.CAPTCHA_PATTERN, self.html)
+        self.logDebug("CAPTCHA_PATTERN found %s" % m)
         if m:
-            captcha_url = urljoin("http://k2s.cc/", m.group(1))
+            captcha_url = urljoin("http://keep2s.cc/", m.group(1))
             post_data['CaptchaForm[code]'] = self.decryptCaptcha(captcha_url)
         else:
+            recaptcha = ReCaptcha(self)
             response, challenge = recaptcha.challenge()
             post_data.update({'recaptcha_challenge_field': challenge,
                               'recaptcha_response_field' : response})
-- 
cgit v1.2.3


From 9291fd15e3eb5baca16f10dcf64fd1f2743af270 Mon Sep 17 00:00:00 2001
From: Ludovic Lehmann <ludo.lehmann@gmail.com>
Date: Mon, 30 Mar 2015 09:39:24 +0200
Subject: OneFichier premium: remove double quote at the end of the filename

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

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 0c26d4277..6803bc91c 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class OneFichierCom(SimpleHoster):
     __name__    = "OneFichierCom"
     __type__    = "hoster"
-    __version__ = "0.81"
+    __version__ = "0.82"
 
     __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -49,7 +49,7 @@ class OneFichierCom(SimpleHoster):
         if self.link:
             remote = urllib2.urlopen(self.link)
             name = remote.info()['Content-Disposition'].split(';')
-            pyfile.name = name[1].split('filename=')[1][1:]
+            pyfile.name = name[1].split('filename=')[1][1:-1]
 
 
     def handleFree(self, pyfile):
-- 
cgit v1.2.3


From 0c86984827d60e0a94d8152df55a16d232020336 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 30 Mar 2015 19:11:33 +0200
Subject: [GoogledriveCom][UlozTo] Fix handleDirect (2)

---
 module/plugins/hoster/GoogledriveCom.py | 4 ++--
 module/plugins/hoster/UlozTo.py         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py
index 57a5ab7fb..bb4a5d1d4 100644
--- a/module/plugins/hoster/GoogledriveCom.py
+++ b/module/plugins/hoster/GoogledriveCom.py
@@ -12,7 +12,7 @@ from module.utils import html_unescape
 class GoogledriveCom(SimpleHoster):
     __name__    = "GoogledriveCom"
     __type__    = "hoster"
-    __version__ = "0.05"
+    __version__ = "0.06"
 
     __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -41,7 +41,7 @@ class GoogledriveCom(SimpleHoster):
         if self.link:
             remote = urllib2.urlopen(self.link)
             name = remote.info()['Content-Disposition'].split(';')
-            pyfile.name = name[1].split('filename=')[1][1:]
+            pyfile.name = name[1].split('filename=')[1][1:-1]
 
 
     def handleFree(self, pyfile):
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index 49ed598cb..c6dcec2cf 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -15,7 +15,7 @@ def convertDecimalPrefix(m):
 class UlozTo(SimpleHoster):
     __name__    = "UlozTo"
     __type__    = "hoster"
-    __version__ = "1.06"
+    __version__ = "1.07"
 
     __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -55,7 +55,7 @@ class UlozTo(SimpleHoster):
         if self.link:
             remote = urllib2.urlopen(self.link)
             name = remote.info()['Content-Disposition'].split(';')
-            pyfile.name = name[1].split('filename=')[1][1:]
+            pyfile.name = name[1].split('filename=')[1][1:-1]
 
 
     def handleFree(self, pyfile):
-- 
cgit v1.2.3


From c63e54009a51140a177681efb0c111d76612ece7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 30 Mar 2015 23:38:29 +0200
Subject: [TusfilesNet] Fix downloadLink

---
 module/plugins/hoster/TusfilesNet.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py
index 9fdb6eae1..6021a4c30 100644
--- a/module/plugins/hoster/TusfilesNet.py
+++ b/module/plugins/hoster/TusfilesNet.py
@@ -7,7 +7,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class TusfilesNet(XFSHoster):
     __name__    = "TusfilesNet"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}'
 
@@ -27,9 +27,9 @@ class TusfilesNet(XFSHoster):
         self.resumeDownload = True
 
 
-    def downloadLink(self, link):
+    def downloadLink(self, link, disposition=True):
         try:
-            return super(TusfilesNet, self).downloadLink(link)
+            return super(TusfilesNet, self).downloadLink(link, disposition)
 
         except BadHeader, e:
             if e.code is 503:
-- 
cgit v1.2.3


From fcaf6c9e4c5c618b8c2741ca7ee5676787b4c3f0 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 31 Mar 2015 23:58:33 +0200
Subject: Temp fixup to `filename*=UTF-8` bug

---
 module/plugins/hoster/BasePlugin.py     | 12 +++++++++++-
 module/plugins/hoster/Ftp.py            | 12 +++++++++++-
 module/plugins/hoster/GoogledriveCom.py | 14 +-------------
 module/plugins/hoster/OneFichierCom.py  | 14 +-------------
 module/plugins/hoster/UlozTo.py         | 13 +------------
 5 files changed, 25 insertions(+), 40 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
index bd73a72b0..8da7ff5df 100644
--- a/module/plugins/hoster/BasePlugin.py
+++ b/module/plugins/hoster/BasePlugin.py
@@ -13,7 +13,7 @@ from module.plugins.Hoster import Hoster
 class BasePlugin(Hoster):
     __name__    = "BasePlugin"
     __type__    = "hoster"
-    __version__ = "0.38"
+    __version__ = "0.39"
 
     __pattern__ = r'^unmatchable$'
 
@@ -41,6 +41,16 @@ class BasePlugin(Hoster):
         self.resumeDownload = True
 
 
+    #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
+    def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
+        try:
+            if disposition:
+                content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
+                self.pyfile.name = content[1].split('filename=')[1][1:-1]
+        finally:
+            return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
+
+
     def process(self, pyfile):
         """main function"""
 
diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py
index 22fc5f67a..370dc7b0f 100644
--- a/module/plugins/hoster/Ftp.py
+++ b/module/plugins/hoster/Ftp.py
@@ -12,7 +12,7 @@ from module.plugins.Hoster import Hoster
 class Ftp(Hoster):
     __name__    = "Ftp"
     __type__    = "hoster"
-    __version__ = "0.46"
+    __version__ = "0.47"
 
     __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
 
@@ -28,6 +28,16 @@ class Ftp(Hoster):
         self.resumeDownload = True
 
 
+    #: Work-around to `filename*=UTF-8` bug; remove in 0.4.10
+    def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
+        try:
+            if disposition:
+                content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
+                self.pyfile.name = content[1].split('filename=')[1][1:-1]
+        finally:
+            return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
+
+
     def process(self, pyfile):
         parsed_url = urlparse(pyfile.url)
         netloc = parsed_url.netloc
diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py
index bb4a5d1d4..66f36e6c0 100644
--- a/module/plugins/hoster/GoogledriveCom.py
+++ b/module/plugins/hoster/GoogledriveCom.py
@@ -12,7 +12,7 @@ from module.utils import html_unescape
 class GoogledriveCom(SimpleHoster):
     __name__    = "GoogledriveCom"
     __type__    = "hoster"
-    __version__ = "0.06"
+    __version__ = "0.07"
 
     __pattern__ = r'https?://(?:www\.)?drive\.google\.com/file/.+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -22,8 +22,6 @@ class GoogledriveCom(SimpleHoster):
     __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
-    DISPOSITION = False  #: Remove in 0.4.10
-
     NAME_PATTERN    = r'"og:title" content="(?P<N>.*?)">'
     OFFLINE_PATTERN = r'align="center"><p class="errorMessage"'
 
@@ -34,16 +32,6 @@ class GoogledriveCom(SimpleHoster):
         self.chunkLimit     = 1
 
 
-    #@NOTE: Temp work-around to `Content-Disposition=filename*=UTF-8` bug!
-    def handleDirect(self, pyfile):
-        self.link = self.directLink(pyfile.url, self.resumeDownload)
-
-        if self.link:
-            remote = urllib2.urlopen(self.link)
-            name = remote.info()['Content-Disposition'].split(';')
-            pyfile.name = name[1].split('filename=')[1][1:-1]
-
-
     def handleFree(self, pyfile):
         try:
             link1 = re.search(r'"(https://docs.google.com/uc\?id.*?export=download)",',
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 6803bc91c..8a5fa9cae 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import re
-import urllib2
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
@@ -9,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class OneFichierCom(SimpleHoster):
     __name__    = "OneFichierCom"
     __type__    = "hoster"
-    __version__ = "0.82"
+    __version__ = "0.83"
 
     __pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -32,7 +31,6 @@ class OneFichierCom(SimpleHoster):
     OFFLINE_PATTERN = r'File not found !\s*<'
 
     COOKIES     = [("1fichier.com", "LG", "en")]
-    DISPOSITION = False  #: Remove in 0.4.10
 
     WAIT_PATTERN = r'>You must wait \d+ minutes'
 
@@ -42,16 +40,6 @@ class OneFichierCom(SimpleHoster):
         self.resumeDownload = True
 
 
-    #@NOTE: Temp work-around to `Content-Disposition=filename*=UTF-8` bug!
-    def handleDirect(self, pyfile):
-        self.link = self.directLink(pyfile.url, self.resumeDownload)
-
-        if self.link:
-            remote = urllib2.urlopen(self.link)
-            name = remote.info()['Content-Disposition'].split(';')
-            pyfile.name = name[1].split('filename=')[1][1:-1]
-
-
     def handleFree(self, pyfile):
         id = self.info['pattern']['ID1'] or self.info['pattern']['ID2']
         url, inputs = self.parseHtmlForm('action="https://1fichier.com/\?%s' % id)
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index c6dcec2cf..c48873387 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -15,7 +15,7 @@ def convertDecimalPrefix(m):
 class UlozTo(SimpleHoster):
     __name__    = "UlozTo"
     __type__    = "hoster"
-    __version__ = "1.07"
+    __version__ = "1.08"
 
     __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj\.cz|zachowajto\.pl)/(?:live/)?(?P<ID>\w+/[^/?]*)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -34,7 +34,6 @@ class UlozTo(SimpleHoster):
     SIZE_REPLACEMENTS = [(r'([\d.]+)\s([kMG])B', convertDecimalPrefix)]
 
     CHECK_TRAFFIC = True
-    DISPOSITION   = False  #: Remove in 0.4.10
 
     ADULT_PATTERN   = r'<form action="(.+?)" method="post" id="frm-askAgeForm">'
     PASSWD_PATTERN  = r'<div class="passwordProtectedFile">'
@@ -48,16 +47,6 @@ class UlozTo(SimpleHoster):
         self.resumeDownload = True
 
 
-    #@NOTE: Temp work-around to `Content-Disposition=filename*=UTF-8` bug!
-    def handleDirect(self, pyfile):
-        self.link = self.directLink(pyfile.url, self.resumeDownload)
-
-        if self.link:
-            remote = urllib2.urlopen(self.link)
-            name = remote.info()['Content-Disposition'].split(';')
-            pyfile.name = name[1].split('filename=')[1][1:-1]
-
-
     def handleFree(self, pyfile):
         action, inputs = self.parseHtmlForm('id="frm-downloadDialog-freeDownloadForm"')
         if not action or not inputs:
-- 
cgit v1.2.3


From d48edc4a00a99b34656453e8d581b1bfe0211926 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 1 Apr 2015 17:37:42 +0200
Subject: [BasePlugin] Fix https://github.com/pyload/pyload/issues/1304

---
 module/plugins/hoster/BasePlugin.py | 4 ++--
 module/plugins/hoster/Ftp.py        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
index 8da7ff5df..7c7e75d33 100644
--- a/module/plugins/hoster/BasePlugin.py
+++ b/module/plugins/hoster/BasePlugin.py
@@ -13,7 +13,7 @@ from module.plugins.Hoster import Hoster
 class BasePlugin(Hoster):
     __name__    = "BasePlugin"
     __type__    = "hoster"
-    __version__ = "0.39"
+    __version__ = "0.40"
 
     __pattern__ = r'^unmatchable$'
 
@@ -48,7 +48,7 @@ class BasePlugin(Hoster):
                 content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
                 self.pyfile.name = content[1].split('filename=')[1][1:-1]
         finally:
-            return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
+            return super(BasePlugin, self).download(url, get, post, ref, cookies, False)
 
 
     def process(self, pyfile):
diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py
index 370dc7b0f..943701fee 100644
--- a/module/plugins/hoster/Ftp.py
+++ b/module/plugins/hoster/Ftp.py
@@ -12,7 +12,7 @@ from module.plugins.Hoster import Hoster
 class Ftp(Hoster):
     __name__    = "Ftp"
     __type__    = "hoster"
-    __version__ = "0.47"
+    __version__ = "0.48"
 
     __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
 
@@ -35,7 +35,7 @@ class Ftp(Hoster):
                 content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
                 self.pyfile.name = content[1].split('filename=')[1][1:-1]
         finally:
-            return super(SimpleHoster, self).download(url, get, post, ref, cookies, False)
+            return super(Ftp, self).download(url, get, post, ref, cookies, False)
 
 
     def process(self, pyfile):
-- 
cgit v1.2.3


From 55073d5073b6cf80bdb865f79546e871d9bbcbc2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 1 Apr 2015 17:39:22 +0200
Subject: [BasePlugin] Fix https://github.com/pyload/pyload/issues/1304 (2)

---
 module/plugins/hoster/BasePlugin.py | 6 +++---
 module/plugins/hoster/Ftp.py        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/BasePlugin.py b/module/plugins/hoster/BasePlugin.py
index 7c7e75d33..418f446eb 100644
--- a/module/plugins/hoster/BasePlugin.py
+++ b/module/plugins/hoster/BasePlugin.py
@@ -13,7 +13,7 @@ from module.plugins.Hoster import Hoster
 class BasePlugin(Hoster):
     __name__    = "BasePlugin"
     __type__    = "hoster"
-    __version__ = "0.40"
+    __version__ = "0.41"
 
     __pattern__ = r'^unmatchable$'
 
@@ -45,8 +45,8 @@ class BasePlugin(Hoster):
     def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
         try:
             if disposition:
-                content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
-                self.pyfile.name = content[1].split('filename=')[1][1:-1]
+                content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
+                self.pyfile.name = content[1].split('filename=')[1][1:-1] or self.pyfile.name
         finally:
             return super(BasePlugin, self).download(url, get, post, ref, cookies, False)
 
diff --git a/module/plugins/hoster/Ftp.py b/module/plugins/hoster/Ftp.py
index 943701fee..cfe230f42 100644
--- a/module/plugins/hoster/Ftp.py
+++ b/module/plugins/hoster/Ftp.py
@@ -12,7 +12,7 @@ from module.plugins.Hoster import Hoster
 class Ftp(Hoster):
     __name__    = "Ftp"
     __type__    = "hoster"
-    __version__ = "0.48"
+    __version__ = "0.49"
 
     __pattern__ = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+'
 
@@ -32,8 +32,8 @@ class Ftp(Hoster):
     def download(self, url, get={}, post={}, ref=True, cookies=True, disposition=False):
         try:
             if disposition:
-                content = urllib2.urlopen(self.link).info()['Content-Disposition'].split(';')
-                self.pyfile.name = content[1].split('filename=')[1][1:-1]
+                content = urllib2.urlopen(url).info()['Content-Disposition'].split(';')
+                self.pyfile.name = content[1].split('filename=')[1][1:-1] or self.pyfile.name
         finally:
             return super(Ftp, self).download(url, get, post, ref, cookies, False)
 
-- 
cgit v1.2.3


From 40add66d77e0eeb1f0f709ad07ecba553123bba1 Mon Sep 17 00:00:00 2001
From: sebdelsol <seb.morin@gmail.com>
Date: Sat, 4 Apr 2015 21:15:35 +0200
Subject: [zippyshare] fix bug #1311

Zippyshare sometimes encode file name with an image.
In this case, use the file link to get the file name.
(it's probably a bad hack. I don't know nothing about pyload Core).
---
 module/plugins/hoster/ZippyshareCom.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 3f392133a..27ec598e1 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+from urllib import unquote
 
 from BeautifulSoup import BeautifulSoup
 
@@ -52,6 +53,9 @@ class ZippyshareCom(SimpleHoster):
         else:
             self.link = self.get_link()
 
+        if  pyfile.name == 'file.html' and self.link:
+            pyfile.name = unquote(self.link.split('/')[-1])
+
 
     def get_link(self):
         # get all the scripts inside the html body
-- 
cgit v1.2.3


From df890c8da4c724be32e616beda318cb6fb97f9a6 Mon Sep 17 00:00:00 2001
From: saintego <stegena@gmail.com>
Date: Tue, 7 Apr 2015 12:05:05 +0200
Subject: [hoster request]yadi.sk #1292

GammaC0de post works
---
 module/plugins/hoster/YadiSk | 84 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 module/plugins/hoster/YadiSk

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/YadiSk b/module/plugins/hoster/YadiSk
new file mode 100644
index 000000000..33f791352
--- /dev/null
+++ b/module/plugins/hoster/YadiSk
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+import re
+import pycurl
+import random
+
+from module.common.json_layer import json_loads
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class YadiSk(SimpleHoster):
+    __name__    = "YadiSk"
+    __type__    = "hoster"
+    __version__ = "0.01"
+
+    __pattern__ = r'https?://yadi\.sk/d/.+'
+
+    __description__ = """yadi.sk hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("GammaC0de", "nomail@fakemailbox.com")]
+
+    OFFLINE_PATTERN = r"Nothing found"
+
+
+    def setup(self):
+        self.resumeDownload = False
+        self.multiDL        = False
+        self.chunkLimit     = 1
+
+    def prepare(self):
+        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:36.0) Gecko/20100101 Firefox/36.0")
+        return super(YadiSk, self).prepare()
+
+    def handleFree(self, pyfile):
+        m = re.search(r'<script id="models-client" type="application/json">(.+?)</script>', self.html)
+        if m is None:
+            self.fail(_("could not find required json data"))
+
+        json = m.group(1)
+
+        res = json_loads(json)
+
+        yadisk_ver = yadisk_sk = yadisk_id = yadisk_size = yadisk_name = yadisk_hash = None
+        try:
+            for sect in res:
+                if 'model' in sect:
+                    if sect['model'] == 'config':
+                        yadisk_ver = sect['data']['version']
+                        yadisk_sk = sect['data']['sk']
+                    elif sect['model'] == 'resource':
+                        yadisk_id = sect['data']['id']
+                        yadisk_size = sect['data']['meta']['size']
+                        yadisk_name = sect['data']['name']
+        except:
+            self.fail(_("Unexpected server response"))
+        if yadisk_id is None or yadisk_sk is None or yadisk_id is None or yadisk_size is None or yadisk_name is None:
+           self.fail(_("json data is missing important information, cannot continue"))
+
+
+        self.pyfile.size = yadisk_size
+        self.pyfile.name = yadisk_name
+
+        yadisk_idclient = ""
+        for i in range(1, 32):
+            yadisk_idclient += random.choice('0123456abcdef')
+
+        post_data = {'idClient': yadisk_idclient,
+                     'version': yadisk_ver,
+                     '_model.0': 'do-get-resource-url',
+                     'sk': yadisk_sk,
+                     'id.0': yadisk_id}
+
+        result_json = self.load("https://yadi.sk/models/?_m=do-get-resource-url", post=post_data)
+
+        res = json_loads(result_json)
+        try:
+            url = res['models'][0]['data']['file']
+        except:
+            self.fail(_("faild to retrieve the download url"))
+
+        self.download(url)
+
+
+getInfo = create_getInfo(YadiSk)
-- 
cgit v1.2.3


From a4a358ce15ecac4aaa35935a074819058e6333a8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 16:47:50 +0200
Subject: [YadiSk] Cleanup

---
 module/plugins/hoster/YadiSk    | 84 ----------------------------------------
 module/plugins/hoster/YadiSk.py | 85 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 84 deletions(-)
 delete mode 100644 module/plugins/hoster/YadiSk
 create mode 100644 module/plugins/hoster/YadiSk.py

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/YadiSk b/module/plugins/hoster/YadiSk
deleted file mode 100644
index 33f791352..000000000
--- a/module/plugins/hoster/YadiSk
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import pycurl
-import random
-
-from module.common.json_layer import json_loads
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class YadiSk(SimpleHoster):
-    __name__    = "YadiSk"
-    __type__    = "hoster"
-    __version__ = "0.01"
-
-    __pattern__ = r'https?://yadi\.sk/d/.+'
-
-    __description__ = """yadi.sk hoster plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("GammaC0de", "nomail@fakemailbox.com")]
-
-    OFFLINE_PATTERN = r"Nothing found"
-
-
-    def setup(self):
-        self.resumeDownload = False
-        self.multiDL        = False
-        self.chunkLimit     = 1
-
-    def prepare(self):
-        self.req.http.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:36.0) Gecko/20100101 Firefox/36.0")
-        return super(YadiSk, self).prepare()
-
-    def handleFree(self, pyfile):
-        m = re.search(r'<script id="models-client" type="application/json">(.+?)</script>', self.html)
-        if m is None:
-            self.fail(_("could not find required json data"))
-
-        json = m.group(1)
-
-        res = json_loads(json)
-
-        yadisk_ver = yadisk_sk = yadisk_id = yadisk_size = yadisk_name = yadisk_hash = None
-        try:
-            for sect in res:
-                if 'model' in sect:
-                    if sect['model'] == 'config':
-                        yadisk_ver = sect['data']['version']
-                        yadisk_sk = sect['data']['sk']
-                    elif sect['model'] == 'resource':
-                        yadisk_id = sect['data']['id']
-                        yadisk_size = sect['data']['meta']['size']
-                        yadisk_name = sect['data']['name']
-        except:
-            self.fail(_("Unexpected server response"))
-        if yadisk_id is None or yadisk_sk is None or yadisk_id is None or yadisk_size is None or yadisk_name is None:
-           self.fail(_("json data is missing important information, cannot continue"))
-
-
-        self.pyfile.size = yadisk_size
-        self.pyfile.name = yadisk_name
-
-        yadisk_idclient = ""
-        for i in range(1, 32):
-            yadisk_idclient += random.choice('0123456abcdef')
-
-        post_data = {'idClient': yadisk_idclient,
-                     'version': yadisk_ver,
-                     '_model.0': 'do-get-resource-url',
-                     'sk': yadisk_sk,
-                     'id.0': yadisk_id}
-
-        result_json = self.load("https://yadi.sk/models/?_m=do-get-resource-url", post=post_data)
-
-        res = json_loads(result_json)
-        try:
-            url = res['models'][0]['data']['file']
-        except:
-            self.fail(_("faild to retrieve the download url"))
-
-        self.download(url)
-
-
-getInfo = create_getInfo(YadiSk)
diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py
new file mode 100644
index 000000000..c71d16cf2
--- /dev/null
+++ b/module/plugins/hoster/YadiSk.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+
+import re
+import pycurl
+import random
+
+from module.common.json_layer import json_loads
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class YadiSk(SimpleHoster):
+    __name__    = "YadiSk"
+    __type__    = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'https?://yadi\.sk/d/\w+'
+
+    __description__ = """Yadi.sk hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("GammaC0de", "nomail@fakemailbox.com")]
+
+
+    OFFLINE_PATTERN = r'Nothing found'
+
+
+    def setup(self):
+        self.resumeDownload = False
+        self.multiDL        = False
+        self.chunkLimit     = 1
+
+
+    def handleFree(self, pyfile):
+        m = re.search(r'<script id="models-client" type="application/json">(.+?)</script>', self.html)
+        if m is None:
+            self.fail(_("could not find required json data"))
+
+        res = json_loads(m.group(1))
+
+        yadisk_ver  = None
+        yadisk_sk   = None
+        yadisk_id   = None
+        yadisk_size = None
+        yadisk_name = None
+        yadisk_hash = None
+        try:  #@TODO: Copy to apiInfo method
+            for sect in res:
+                if 'model' in sect:
+                    if sect['model'] == 'config':
+                        yadisk_ver = sect['data']['version']
+                        yadisk_sk  = sect['data']['sk']
+
+                    elif sect['model'] == 'resource':
+                        yadisk_id   = sect['data']['id']
+                        yadisk_size = sect['data']['meta']['size']
+                        yadisk_name = sect['data']['name']
+
+        except Exception:
+            self.fail(_("Unexpected server response"))
+
+        if None is in (yadisk_id, yadisk_sk, yadisk_id, yadisk_size, yadisk_name):
+           self.fail(_("json data is missing important information, cannot continue"))
+
+        self.pyfile.size = yadisk_size
+        self.pyfile.name = yadisk_name
+
+        yadisk_idclient = ""
+        for _i in range(1, 32):
+            yadisk_idclient += random.choice('0123456abcdef')
+
+        result_json = self.load("https://yadi.sk/models/?_m=do-get-resource-url",
+                                post={'idClient': yadisk_idclient,
+                                      'version' : yadisk_ver,
+                                      '_model.0': 'do-get-resource-url',
+                                      'sk'      : yadisk_sk,
+                                      'id.0'    : yadisk_id})
+
+        res = json_loads(result_json)
+        try:
+            self.link = res['models'][0]['data']['file']
+
+        except Exception:
+            self.fail(_("faild to retrieve the download url"))
+
+
+getInfo = create_getInfo(YadiSk)
-- 
cgit v1.2.3


From 1cfc960fd3ec384364ffb1e09d3ee98fc657eddb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 16:51:14 +0200
Subject: [SimpleDereferer][SimpleHoster] Update user-agent

---
 module/plugins/hoster/Keep2ShareCc.py | 13 ++++++-------
 module/plugins/hoster/YadiSk.py       |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py
index 296226e3c..65e9ddc2d 100644
--- a/module/plugins/hoster/Keep2ShareCc.py
+++ b/module/plugins/hoster/Keep2ShareCc.py
@@ -30,7 +30,7 @@ class Keep2ShareCc(SimpleHoster):
     OFFLINE_PATTERN      = r'File not found or deleted|Sorry, this file is blocked or deleted|Error 404'
     TEMP_OFFLINE_PATTERN = r'Downloading blocked due to'
 
-    LINK_FREE_PATTERN    = r'"([^"]+url.html\?file=.+?)"|window\.location\.href = \'(.+?)\';'
+    LINK_FREE_PATTERN    = r'"(.+?url.html\?file=.+?)"|window\.location\.href = \'(.+?)\';'
     LINK_PREMIUM_PATTERN = r'window\.location\.href = \'(.+?)\';'
 
     CAPTCHA_PATTERN = r'src="(/file/captcha\.html.+?)"'
@@ -67,20 +67,18 @@ class Keep2ShareCc(SimpleHoster):
 
 
     def handleFree(self, pyfile):
-        self.fid  = re.search(r'<input type="hidden" name="slow_id" value="([^"]+)">', self.html).group(1)
+        self.fid  = re.search(r'<input type="hidden" name="slow_id" value="(.+?)">', self.html).group(1)
         self.html = self.load(pyfile.url, post={'yt0': '', 'slow_id': self.fid})
-        self.logDebug(self.fid)
-        self.logDebug(pyfile.url)
+
+        # self.logDebug(self.fid)
+        # self.logDebug(pyfile.url)
 
         self.checkErrors()
 
         m = re.search(self.LINK_FREE_PATTERN, self.html)
-
         if m is None:
             self.handleCaptcha()
-
             self.wait(31)
-
             self.html = self.load(pyfile.url)
 
             m = re.search(self.LINK_FREE_PATTERN, self.html)
@@ -98,6 +96,7 @@ class Keep2ShareCc(SimpleHoster):
 
         m = re.search(r'id="(captcha\-form)"', self.html)
         self.logDebug("captcha-form found %s" % m)
+
         m = re.search(self.CAPTCHA_PATTERN, self.html)
         self.logDebug("CAPTCHA_PATTERN found %s" % m)
         if m:
diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py
index c71d16cf2..57d8ae786 100644
--- a/module/plugins/hoster/YadiSk.py
+++ b/module/plugins/hoster/YadiSk.py
@@ -70,7 +70,7 @@ class YadiSk(SimpleHoster):
         result_json = self.load("https://yadi.sk/models/?_m=do-get-resource-url",
                                 post={'idClient': yadisk_idclient,
                                       'version' : yadisk_ver,
-                                      '_model.0': 'do-get-resource-url',
+                                      '_model.0': "do-get-resource-url",
                                       'sk'      : yadisk_sk,
                                       'id.0'    : yadisk_id})
 
-- 
cgit v1.2.3


From 795eb0814fcf6be6ca4ca0ec322e77f00a6efeab Mon Sep 17 00:00:00 2001
From: sraedler <simon.raedler@yahoo.de>
Date: Tue, 7 Apr 2015 17:34:01 +0200
Subject: Fixed RemixshareCom

---
 module/plugins/hoster/RemixshareCom.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py
index 803256d86..b62db8af3 100644
--- a/module/plugins/hoster/RemixshareCom.py
+++ b/module/plugins/hoster/RemixshareCom.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Test links:
-# http://remixshare.com/download/p946u
+# http://remixshare.com/download/z8uli
 #
 # Note:
 # The remixshare.com website is very very slow, so
@@ -16,7 +16,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class RemixshareCom(SimpleHoster):
     __name__    = "RemixshareCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -24,15 +24,16 @@ class RemixshareCom(SimpleHoster):
     __description__ = """Remixshare.com hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
-                       ("Walter Purcaro", "vuolter@gmail.com")]
+                       ("Walter Purcaro", "vuolter@gmail.com"),
+                       ("sraedler", "simon.raedler@yahoo.de")]
 
 
     INFO_PATTERN = r'title=\'.+?\'>(?P<N>.+?)</span><span class=\'light2\'>&nbsp;\((?P<S>\d+)&nbsp;(?P<U>[\w^_]+)\)<'
     OFFLINE_PATTERN = r'<h1>Ooops!<'
 
-    LINK_FREE_PATTERN = r'(http://remixshare\.com/downloadfinal/.+?)"'
+    LINK_FREE_PATTERN = r'(http:\/\/remixshare\.com\/startloading(\w|\/)+)'
     TOKEN_PATTERN = r'var acc = (\d+)'
-    WAIT_PATTERN = r'var XYZ = r"(\d+)"'
+    WAIT_PATTERN = r'var XYZ = "(\d+)"'
 
 
     def setup(self):
@@ -49,13 +50,15 @@ class RemixshareCom(SimpleHoster):
         if not c:
             self.error(_("Cannot parse file token"))
 
-        self.link = b.group(1) + c.group(1)
+        self.link = b.group(1) + "/zzz/" + c.group(1)
+	self.logDebug(self.link)
 
         #Check if we have to wait
         seconds = re.search(self.WAIT_PATTERN, self.html)
         if seconds:
-            self.logDebug("Wait " + seconds.group(1))
+            self.logDebug("Wait " + seconds.group(1) + " Seconds")
             self.wait(seconds.group(1))
 
+	self.download(self.link)
 
 getInfo = create_getInfo(RemixshareCom)
-- 
cgit v1.2.3


From 034d87c836f9fba82142a06b5f666c84ca10bd50 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 21:26:23 +0200
Subject: [YadiSk] Fix https://github.com/pyload/pyload/issues/1321

---
 module/plugins/hoster/YadiSk.py | 45 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py
index 57d8ae786..c3749d30d 100644
--- a/module/plugins/hoster/YadiSk.py
+++ b/module/plugins/hoster/YadiSk.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import re
-import pycurl
 import random
 
 from module.common.json_layer import json_loads
@@ -11,13 +10,13 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class YadiSk(SimpleHoster):
     __name__    = "YadiSk"
     __type__    = "hoster"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'https?://yadi\.sk/d/\w+'
 
     __description__ = """Yadi.sk hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("GammaC0de", "nomail@fakemailbox.com")]
+    __authors__     = [("GammaC0de", None)]
 
 
     OFFLINE_PATTERN = r'Nothing found'
@@ -32,7 +31,7 @@ class YadiSk(SimpleHoster):
     def handleFree(self, pyfile):
         m = re.search(r'<script id="models-client" type="application/json">(.+?)</script>', self.html)
         if m is None:
-            self.fail(_("could not find required json data"))
+            self.error(_("could not find required json data"))
 
         res = json_loads(m.group(1))
 
@@ -41,45 +40,45 @@ class YadiSk(SimpleHoster):
         yadisk_id   = None
         yadisk_size = None
         yadisk_name = None
-        yadisk_hash = None
-        try:  #@TODO: Copy to apiInfo method
+
+        try:  #@TODO: Copy to apiInfo
             for sect in res:
                 if 'model' in sect:
-                    if sect['model'] == 'config':
+                    if sect['model'] == "config":
                         yadisk_ver = sect['data']['version']
                         yadisk_sk  = sect['data']['sk']
 
-                    elif sect['model'] == 'resource':
+                    elif sect['model'] == "resource":
                         yadisk_id   = sect['data']['id']
                         yadisk_size = sect['data']['meta']['size']
                         yadisk_name = sect['data']['name']
 
-        except Exception:
-            self.fail(_("Unexpected server response"))
+        except Exception, e:
+            self.fail(_("Unexpected server response"), e)
 
-        if None is in (yadisk_id, yadisk_sk, yadisk_id, yadisk_size, yadisk_name):
-           self.fail(_("json data is missing important information, cannot continue"))
+        if None in (yadisk_id, yadisk_sk, yadisk_id, yadisk_size, yadisk_name):
+           self.error(_("Missing JSON data"))
 
         self.pyfile.size = yadisk_size
         self.pyfile.name = yadisk_name
 
         yadisk_idclient = ""
-        for _i in range(1, 32):
+        for _i in range(32):
             yadisk_idclient += random.choice('0123456abcdef')
 
-        result_json = self.load("https://yadi.sk/models/?_m=do-get-resource-url",
-                                post={'idClient': yadisk_idclient,
-                                      'version' : yadisk_ver,
-                                      '_model.0': "do-get-resource-url",
-                                      'sk'      : yadisk_sk,
-                                      'id.0'    : yadisk_id})
-
-        res = json_loads(result_json)
         try:
-            self.link = res['models'][0]['data']['file']
+            self.html = self.load("https://yadi.sk/models/",
+                                  get={'_m': "do-get-resource-url"},
+                                  post={'idClient': yadisk_idclient,
+                                        'version' : yadisk_ver,
+                                        '_model.0': "do-get-resource-url",
+                                        'sk'      : yadisk_sk,
+                                        'id.0'    : yadisk_id})
+
+            self.link = json_loads(self.html)['models'][0]['data']['file']
 
         except Exception:
-            self.fail(_("faild to retrieve the download url"))
+            pass
 
 
 getInfo = create_getInfo(YadiSk)
-- 
cgit v1.2.3


From f33c80efb9437b815deea56a03897a57ae255d06 Mon Sep 17 00:00:00 2001
From: sraedler <simon.raedler@yahoo.de>
Date: Wed, 8 Apr 2015 02:00:00 +0200
Subject: Added Solidfiles Hoster

---
 module/plugins/hoster/Solidfiles.py | 42 +++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 module/plugins/hoster/Solidfiles.py

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/Solidfiles.py b/module/plugins/hoster/Solidfiles.py
new file mode 100644
index 000000000..54631ee50
--- /dev/null
+++ b/module/plugins/hoster/Solidfiles.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+#
+# Test links:
+# http://www.solidfiles.com/d/609cdb4b1b
+
+import re
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class solidfiles(SimpleHoster):
+    __name__    = "solidfiles"
+    __type__    = "hoster"
+    __version__ = "0.01"
+
+    __pattern__ = r'http:\/\/(?:www\.)?solidfiles\.com\/\w+\/(\w)+\/(\w|.|\d)*'
+
+    __description__ = """ solidfiles.com hoster plugin """
+    __license__     = "GPLv3"
+    __authors__     = [("sraedler", "simon.raedler@yahoo.de")]
+
+
+    NAME_PATTERN = r'<h1 title="(?P<N>(\w|\d|\.)+)"'
+    SIZE_PATTERN = r'<p class="meta">(?P<S>(\d|\.)+) (?P<U>(\w)+)'
+    OFFLINE_PATTERN = r'<h1>404<\/h1>'
+
+    LINK_FREE_PATTERN = r'id="ddl-text" href="(https:\/\/(\w|\d|\.|\/)+)"'
+
+    def setup(self):
+        self.multiDL = True
+        self.chunkLimit = 1
+
+
+    def handleFree(self, pyfile):
+        # Search for Download URL
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
+        if m is None:
+            self.error(_("LINK_FREE_PATTERN not found"))
+	self.logDebug("Downloadlink: " + m.group(1))
+	self.download(m.group(1))
+	
+getInfo = create_getInfo(solidfiles)
\ No newline at end of file
-- 
cgit v1.2.3


From eb9edff095dd9f83966723be506a4fd91f64a8c9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 03:23:09 +0200
Subject: [SolidfilesCom] Cleanup

---
 module/plugins/hoster/Solidfiles.py    | 42 ----------------------------------
 module/plugins/hoster/SolidfilesCom.py | 33 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 42 deletions(-)
 delete mode 100644 module/plugins/hoster/Solidfiles.py
 create mode 100644 module/plugins/hoster/SolidfilesCom.py

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/Solidfiles.py b/module/plugins/hoster/Solidfiles.py
deleted file mode 100644
index 54631ee50..000000000
--- a/module/plugins/hoster/Solidfiles.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Test links:
-# http://www.solidfiles.com/d/609cdb4b1b
-
-import re
-
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-
-
-class solidfiles(SimpleHoster):
-    __name__    = "solidfiles"
-    __type__    = "hoster"
-    __version__ = "0.01"
-
-    __pattern__ = r'http:\/\/(?:www\.)?solidfiles\.com\/\w+\/(\w)+\/(\w|.|\d)*'
-
-    __description__ = """ solidfiles.com hoster plugin """
-    __license__     = "GPLv3"
-    __authors__     = [("sraedler", "simon.raedler@yahoo.de")]
-
-
-    NAME_PATTERN = r'<h1 title="(?P<N>(\w|\d|\.)+)"'
-    SIZE_PATTERN = r'<p class="meta">(?P<S>(\d|\.)+) (?P<U>(\w)+)'
-    OFFLINE_PATTERN = r'<h1>404<\/h1>'
-
-    LINK_FREE_PATTERN = r'id="ddl-text" href="(https:\/\/(\w|\d|\.|\/)+)"'
-
-    def setup(self):
-        self.multiDL = True
-        self.chunkLimit = 1
-
-
-    def handleFree(self, pyfile):
-        # Search for Download URL
-        m = re.search(self.LINK_FREE_PATTERN, self.html)
-        if m is None:
-            self.error(_("LINK_FREE_PATTERN not found"))
-	self.logDebug("Downloadlink: " + m.group(1))
-	self.download(m.group(1))
-	
-getInfo = create_getInfo(solidfiles)
\ No newline at end of file
diff --git a/module/plugins/hoster/SolidfilesCom.py b/module/plugins/hoster/SolidfilesCom.py
new file mode 100644
index 000000000..d359577d6
--- /dev/null
+++ b/module/plugins/hoster/SolidfilesCom.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+#
+# Test links:
+# http://www.solidfiles.com/d/609cdb4b1b
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class SolidfilesCom(SimpleHoster):
+    __name__    = "SolidfilesCom"
+    __type__    = "hoster"
+    __version__ = "0.02"
+
+    __pattern__ = r'http://(?:www\.)?solidfiles\.com\/d/\w+'
+
+    __description__ = """Solidfiles.com hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("sraedler", "simon.raedler@yahoo.de")]
+
+
+    NAME_PATTERN    = r'<h1 title="(?P<N>.+?)"'
+    SIZE_PATTERN    = r'<p class="meta">(?P<S>[\d.,]+) (?P<U>[\w_^]+)'
+    OFFLINE_PATTERN = r'<h1>404'
+
+    LINK_FREE_PATTERN = r'id="ddl-text" href="(.+?)"'
+
+
+    def setup(self):
+        self.multiDL    = True
+        self.chunkLimit = 1
+
+
+getInfo = create_getInfo(SolidfilesCom)
-- 
cgit v1.2.3


From a667e20cfc029672801f28e6db3b05483658c13d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 03:37:42 +0200
Subject: [RemixshareCom] Cleanup

---
 module/plugins/hoster/RemixshareCom.py | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/RemixshareCom.py b/module/plugins/hoster/RemixshareCom.py
index b62db8af3..d60101aed 100644
--- a/module/plugins/hoster/RemixshareCom.py
+++ b/module/plugins/hoster/RemixshareCom.py
@@ -16,23 +16,25 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class RemixshareCom(SimpleHoster):
     __name__    = "RemixshareCom"
     __type__    = "hoster"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'https?://remixshare\.com/(download|dl)/\w+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Remixshare.com hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"),
-                       ("Walter Purcaro", "vuolter@gmail.com"),
-                       ("sraedler", "simon.raedler@yahoo.de")]
+    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de"  ),
+                       ("Walter Purcaro", "vuolter@gmail.com"     ),
+                       ("sraedler"      , "simon.raedler@yahoo.de")]
 
 
-    INFO_PATTERN = r'title=\'.+?\'>(?P<N>.+?)</span><span class=\'light2\'>&nbsp;\((?P<S>\d+)&nbsp;(?P<U>[\w^_]+)\)<'
-    OFFLINE_PATTERN = r'<h1>Ooops!<'
+    INFO_PATTERN    = r'title=\'.+?\'>(?P<N>.+?)</span><span class=\'light2\'>&nbsp;\((?P<S>\d+)&nbsp;(?P<U>[\w^_]+)\)<'
+    HASHSUM_PATTERN = r'>(?P<T>MD5): (?P<H>\w+)'
+    OFFLINE_PATTERN = r'<h1>Ooops!'
 
-    LINK_FREE_PATTERN = r'(http:\/\/remixshare\.com\/startloading(\w|\/)+)'
+    LINK_PATTERN  = r'var uri = "(.+?)"'
     TOKEN_PATTERN = r'var acc = (\d+)'
+
     WAIT_PATTERN = r'var XYZ = "(\d+)"'
 
 
@@ -42,23 +44,15 @@ class RemixshareCom(SimpleHoster):
 
 
     def handleFree(self, pyfile):
-        b = re.search(self.LINK_FREE_PATTERN, self.html)
+        b = re.search(self.LINK_PATTERN, self.html)
         if not b:
-            self.error(_("Cannot parse download url"))
+            self.error(_("File url"))
 
         c = re.search(self.TOKEN_PATTERN, self.html)
         if not c:
-            self.error(_("Cannot parse file token"))
+            self.error(_("File token"))
 
         self.link = b.group(1) + "/zzz/" + c.group(1)
-	self.logDebug(self.link)
-
-        #Check if we have to wait
-        seconds = re.search(self.WAIT_PATTERN, self.html)
-        if seconds:
-            self.logDebug("Wait " + seconds.group(1) + " Seconds")
-            self.wait(seconds.group(1))
 
-	self.download(self.link)
 
 getInfo = create_getInfo(RemixshareCom)
-- 
cgit v1.2.3


From 58980accb36660d200d2239f7c801173ec899b56 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 14:22:26 +0200
Subject: [CatShareNet] https://github.com/pyload/pyload/issues/1325

---
 module/plugins/hoster/CatShareNet.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py
index ec9c62a23..9e3f28cfa 100644
--- a/module/plugins/hoster/CatShareNet.py
+++ b/module/plugins/hoster/CatShareNet.py
@@ -9,7 +9,7 @@ from module.plugins.internal.CaptchaService import ReCaptcha
 class CatShareNet(SimpleHoster):
     __name__    = "CatShareNet"
     __type__    = "hoster"
-    __version__ = "0.12"
+    __version__ = "0.13"
 
     __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -24,12 +24,13 @@ class CatShareNet(SimpleHoster):
     TEXT_ENCODING = True
 
     INFO_PATTERN = r'<title>(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)<'
-    OFFLINE_PATTERN = ur'Podany plik został usunięty\s*</div>'
+    OFFLINE_PATTERN = r'<div class="alert alert-error"'
 
     IP_BLOCKED_PATTERN = ur'>Nasz serwis wykrył że Twój adres IP nie pochodzi z Polski.<'
     WAIT_PATTERN       = r'var\scount\s=\s(\d+);'
 
-    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'<form action="(.+?)" method="GET">'
+    LINK_FREE_PATTERN    = r'<form action="(.+?)" method="GET">'
+    LINK_PREMIUM_PATTERN = r'<form action="(.+?)" method="GET">'
 
 
     def setup(self):
@@ -54,11 +55,8 @@ class CatShareNet(SimpleHoster):
                                     'recaptcha_response_field' : response})
 
         m = re.search(self.LINK_FREE_PATTERN, self.html)
-        if m is None:
-            self.invalidCaptcha()
-            self.retry(reason=_("Wrong captcha entered"))
-
-        self.link = m.group(1)
+        if m:
+            self.link = m.group(1)
 
 
 getInfo = create_getInfo(CatShareNet)
-- 
cgit v1.2.3


From 138e514ce4dd9ccce8af5b4dfbecdfcc03b62cbe Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 14:29:06 +0200
Subject: [RapiduNet] https://github.com/pyload/pyload/issues/1326

---
 module/plugins/hoster/RapiduNet.py | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/RapiduNet.py b/module/plugins/hoster/RapiduNet.py
index f43eda0cb..8a85bc844 100644
--- a/module/plugins/hoster/RapiduNet.py
+++ b/module/plugins/hoster/RapiduNet.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class RapiduNet(SimpleHoster):
     __name__    = "RapiduNet"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'https?://(?:www\.)?rapidu\.net/(?P<ID>\d{10})'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -26,7 +26,7 @@ class RapiduNet(SimpleHoster):
     COOKIES = [("rapidu.net", "rapidu_lang", "en")]
 
     INFO_PATTERN    = r'<h1 title="(?P<N>.*)">.*</h1>\s*<small>(?P<S>\d+(\.\d+)?)\s(?P<U>\w+)</small>'
-    OFFLINE_PATTERN = r'404 - File not found'
+    OFFLINE_PATTERN = r'<h1>404'
 
     ERROR_PATTERN = r'<div class="error">'
 
@@ -58,20 +58,18 @@ class RapiduNet(SimpleHoster):
             self.wait(int(jsvars['timeToDownload']) - int(time.time()))
 
         recaptcha = ReCaptcha(self)
+        response, challenge = recaptcha.challenge(self.RECAPTCHA_KEY)
 
-        for _i in xrange(10):
-            response, challenge = recaptcha.challenge(self.RECAPTCHA_KEY)
-
-            jsvars = self.getJsonResponse("https://rapidu.net/ajax.php",
-                                          get={'a': "getCheckCaptcha"},
-                                          post={'_go'     : "",
-                                                'captcha1': challenge,
-                                                'captcha2': response,
-                                                'fileId'  : self.info['pattern']['ID']},
-                                          decode=True)
-            if jsvars['message'] == 'success':
-                self.download(jsvars['url'])
-                break
+        jsvars = self.getJsonResponse("https://rapidu.net/ajax.php",
+                                      get={'a': "getCheckCaptcha"},
+                                      post={'_go'     : "",
+                                            'captcha1': challenge,
+                                            'captcha2': response,
+                                            'fileId'  : self.info['pattern']['ID']},
+                                      decode=True)
+
+        if jsvars['message'] == 'success':
+            self.link = jsvars['url']
 
 
     def getJsonResponse(self, *args, **kwargs):
-- 
cgit v1.2.3


From 02e3ede3edcf4415ac466fbea9d4f25d9ccc8671 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 15:38:01 +0200
Subject: Spare code cosmetics

---
 module/plugins/hoster/EuroshareEu.py   |  2 +-
 module/plugins/hoster/FreakshareCom.py | 20 +++++++++++---------
 module/plugins/hoster/NetloadIn.py     |  2 +-
 module/plugins/hoster/OverLoadMe.py    |  2 +-
 module/plugins/hoster/PornhubCom.py    |  2 +-
 module/plugins/hoster/RealdebridCom.py |  2 +-
 module/plugins/hoster/RedtubeCom.py    |  2 +-
 module/plugins/hoster/ShareplaceCom.py |  2 +-
 module/plugins/hoster/XHamsterCom.py   |  2 +-
 module/plugins/hoster/YoupornCom.py    |  2 +-
 module/plugins/hoster/YourfilesTo.py   |  2 +-
 11 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py
index c5059e69e..922665c2e 100644
--- a/module/plugins/hoster/EuroshareEu.py
+++ b/module/plugins/hoster/EuroshareEu.py
@@ -48,7 +48,7 @@ class EuroshareEu(SimpleHoster):
 
 
     def handleFree(self, pyfile):
-        if re.search(self.ERR_PARDL_PATTERN, self.html) is not None:
+        if re.search(self.ERR_PARDL_PATTERN, self.html):
             self.longWait(5 * 60, 12)
 
         m = re.search(self.LINK_FREE_PATTERN, self.html)
diff --git a/module/plugins/hoster/FreakshareCom.py b/module/plugins/hoster/FreakshareCom.py
index 9a11f933d..6a595e75b 100644
--- a/module/plugins/hoster/FreakshareCom.py
+++ b/module/plugins/hoster/FreakshareCom.py
@@ -107,12 +107,14 @@ class FreakshareCom(Hoster):
     def get_file_name(self):
         if not self.html:
             self.download_html()
+
         if not self.wantReconnect:
-            file_name = re.search(r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">([^ ]+)", self.html)
-            if file_name is not None:
-                file_name = file_name.group(1)
+            m = re.search(r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">([^ ]+)", self.html)
+            if m:
+                file_name = m.group(1)
             else:
                 file_name = self.pyfile.url
+
             return file_name
         else:
             return self.pyfile.url
@@ -122,12 +124,12 @@ class FreakshareCom(Hoster):
         size = 0
         if not self.html:
             self.download_html()
+
         if not self.wantReconnect:
-            file_size_check = re.search(
-                r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">[^ ]+ - ([^ ]+) (\w\w)yte", self.html)
-            if file_size_check is not None:
-                units = float(file_size_check.group(1).replace(",", ""))
-                pow = {'KB': 1, 'MB': 2, 'GB': 3}[file_size_check.group(2)]
+            m = re.search(r"<h1\sclass=\"box_heading\"\sstyle=\"text-align:center;\">[^ ]+ - ([^ ]+) (\w\w)yte", self.html)
+            if m:
+                units = float(m.group(1).replace(",", ""))
+                pow = {'KB': 1, 'MB': 2, 'GB': 3}[m.group(2)]
                 size = int(units * 1024 ** pow)
 
         return size
@@ -153,7 +155,7 @@ class FreakshareCom(Hoster):
         """
         if not self.html:
             self.download_html()
-        if re.search(r"This file does not exist!", self.html) is not None:
+        if re.search(r"This file does not exist!", self.html):
             return False
         else:
             return True
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index 0ff3c25d3..57af3f18e 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -268,7 +268,7 @@ class NetloadIn(Hoster):
         try:
             file_url_pattern = r'<a class="Orange_Link" href="(http://.+)".?>Or click here'
             attempt = re.search(file_url_pattern, page)
-            if attempt is not None:
+            if attempt:
                 return attempt.group(1)
             else:
                 self.logDebug("Backup try for final link")
diff --git a/module/plugins/hoster/OverLoadMe.py b/module/plugins/hoster/OverLoadMe.py
index 398946e43..934de5746 100644
--- a/module/plugins/hoster/OverLoadMe.py
+++ b/module/plugins/hoster/OverLoadMe.py
@@ -42,7 +42,7 @@ class OverLoadMe(MultiHoster):
             self.logWarning(data['msg'])
             self.tempOffline()
         else:
-            if pyfile.name is not None and pyfile.name.endswith('.tmp') and data['filename']:
+            if pyfile.name and pyfile.name.endswith('.tmp') and data['filename']:
                 pyfile.name = data['filename']
                 pyfile.size = parseFileSize(data['filesize'])
 
diff --git a/module/plugins/hoster/PornhubCom.py b/module/plugins/hoster/PornhubCom.py
index 9e0b16a85..16ce36ea9 100644
--- a/module/plugins/hoster/PornhubCom.py
+++ b/module/plugins/hoster/PornhubCom.py
@@ -83,7 +83,7 @@ class PornhubCom(Hoster):
         if not self.html:
             self.download_html()
 
-        if re.search(r'This video is no longer in our database or is in conversion', self.html) is not None:
+        if re.search(r'This video is no longer in our database or is in conversion', self.html):
             return False
         else:
             return True
diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py
index 1a8715e0e..f35eb5e03 100644
--- a/module/plugins/hoster/RealdebridCom.py
+++ b/module/plugins/hoster/RealdebridCom.py
@@ -44,7 +44,7 @@ class RealdebridCom(MultiHoster):
                 self.logWarning(data['message'])
                 self.tempOffline()
         else:
-            if pyfile.name is not None and pyfile.name.endswith('.tmp') and data['file_name']:
+            if pyfile.name and pyfile.name.endswith('.tmp') and data['file_name']:
                 pyfile.name = data['file_name']
             pyfile.size = parseFileSize(data['file_size'])
             self.link = data['generated_links'][0][-1]
diff --git a/module/plugins/hoster/RedtubeCom.py b/module/plugins/hoster/RedtubeCom.py
index d68fbe262..9051c498a 100644
--- a/module/plugins/hoster/RedtubeCom.py
+++ b/module/plugins/hoster/RedtubeCom.py
@@ -56,7 +56,7 @@ class RedtubeCom(Hoster):
         if not self.html:
             self.download_html()
 
-        if re.search(r'This video has been removed.', self.html) is not None:
+        if re.search(r'This video has been removed.', self.html):
             return False
         else:
             return True
diff --git a/module/plugins/hoster/ShareplaceCom.py b/module/plugins/hoster/ShareplaceCom.py
index 07724a9d1..c540dd2df 100644
--- a/module/plugins/hoster/ShareplaceCom.py
+++ b/module/plugins/hoster/ShareplaceCom.py
@@ -83,7 +83,7 @@ class ShareplaceCom(Hoster):
         if not self.html:
             self.download_html()
 
-        if re.search(r"HTTP Status 404", self.html) is not None:
+        if re.search(r"HTTP Status 404", self.html):
             return False
         else:
             return True
diff --git a/module/plugins/hoster/XHamsterCom.py b/module/plugins/hoster/XHamsterCom.py
index fd494e099..9004dbac0 100644
--- a/module/plugins/hoster/XHamsterCom.py
+++ b/module/plugins/hoster/XHamsterCom.py
@@ -123,7 +123,7 @@ class XHamsterCom(Hoster):
         """
         if not self.html:
             self.download_html()
-        if re.search(r"(.*Video not found.*)", self.html) is not None:
+        if re.search(r"(.*Video not found.*)", self.html):
             return False
         else:
             return True
diff --git a/module/plugins/hoster/YoupornCom.py b/module/plugins/hoster/YoupornCom.py
index 4bb2520e6..19d07fa36 100644
--- a/module/plugins/hoster/YoupornCom.py
+++ b/module/plugins/hoster/YoupornCom.py
@@ -54,7 +54,7 @@ class YoupornCom(Hoster):
         """
         if not self.html:
             self.download_html()
-        if re.search(r"(.*invalid video_id.*)", self.html) is not None:
+        if re.search(r"(.*invalid video_id.*)", self.html):
             return False
         else:
             return True
diff --git a/module/plugins/hoster/YourfilesTo.py b/module/plugins/hoster/YourfilesTo.py
index e0def108e..fd65a6a41 100644
--- a/module/plugins/hoster/YourfilesTo.py
+++ b/module/plugins/hoster/YourfilesTo.py
@@ -81,7 +81,7 @@ class YourfilesTo(Hoster):
         if not self.html:
             self.download_html()
 
-        if re.search(r"HTTP Status 404", self.html) is not None:
+        if re.search(r"HTTP Status 404", self.html):
             return False
         else:
             return True
-- 
cgit v1.2.3


From e5ab79dc23dd5a50a4b4a3d5a51427eed55dcad5 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 23:19:29 +0200
Subject: [ZippyshareCom] Fix https://github.com/pyload/pyload/issues/1311

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

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 3f392133a..7af2c3370 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.77"
+    __version__ = "0.78"
 
     __pattern__ = r'http://www\d{0,2}\.zippyshare\.com/v(/|iew\.jsp.*key=)(?P<KEY>[\w^_]+)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -24,7 +24,7 @@ class ZippyshareCom(SimpleHoster):
 
     COOKIES = [("zippyshare.com", "ziplocale", "en")]
 
-    NAME_PATTERN    = r'("/|<title>Zippyshare.com - )(?P<N>[^/]+?)("\);|</title>)'
+    NAME_PATTERN    = r'(<title>Zippyshare.com - |"/)(?P<N>[^/]+)(</title>|";)'
     SIZE_PATTERN    = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'does not exist (anymore )?on this server<'
 
-- 
cgit v1.2.3


From 73f99ea811d01a2e113a882fe5ab86b0aa9c4f4c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Thu, 9 Apr 2015 00:22:51 +0200
Subject: [SimpleHoster] Improve file name handling

---
 module/plugins/hoster/ZippyshareCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index cdb37a18c..fbac432cd 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from urllib import unquote
+import urllib
 
 from BeautifulSoup import BeautifulSoup
 
@@ -53,8 +53,8 @@ class ZippyshareCom(SimpleHoster):
         else:
             self.link = self.get_link()
 
-        if  pyfile.name == 'file.html' and self.link:
-            pyfile.name = unquote(self.link.split('/')[-1])
+        if self.link and pyfile.name == 'file.html':
+            pyfile.name = urllib.unquote(self.link.split('/')[-1])
 
 
     def get_link(self):
-- 
cgit v1.2.3


From 686d51fb3a43cb49ee4c3f44ea48b052d36616e0 Mon Sep 17 00:00:00 2001
From: valdi74 <informatyk74@interia.pl>
Date: Fri, 10 Apr 2015 00:06:18 +0200
Subject: Update - new links pattern

---
 module/plugins/hoster/FileSharkPl.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/FileSharkPl.py b/module/plugins/hoster/FileSharkPl.py
index 63475958a..9f6070806 100644
--- a/module/plugins/hoster/FileSharkPl.py
+++ b/module/plugins/hoster/FileSharkPl.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class FileSharkPl(SimpleHoster):
     __name__    = "FileSharkPl"
     __type__    = "hoster"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __pattern__ = r'http://(?:www\.)?fileshark\.pl/pobierz/\d+/\w+'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -25,8 +25,8 @@ class FileSharkPl(SimpleHoster):
     SIZE_PATTERN    = r'<p class="size-file">(.*?)<strong>(?P<S>\d+\.?\d*)\s(?P<U>\w+)</strong></p>'
     OFFLINE_PATTERN = r'(P|p)lik zosta. (usuni.ty|przeniesiony)'
 
-    LINK_FREE_PATTERN    = r'<a href="(.*?)" class="btn-upload-free">'
-    LINK_PREMIUM_PATTERN = r'<a href="(.*?)" class="btn-upload-premium">'
+    LINK_FREE_PATTERN    = r'<a  rel="nofollow" href="(.*?)" class="btn-upload-free">'
+    LINK_PREMIUM_PATTERN = r'<a rel="nofollow" href="(.*?)" class="btn-upload-premium">'
 
     WAIT_PATTERN       = r'var timeToDownload = (\d+);'
     ERROR_PATTERN      = r'<p class="lead text-center alert alert-warning">(.*?)</p>'
-- 
cgit v1.2.3


From d3f6b9936d45c5eb0308c0d2542dea6e3c001507 Mon Sep 17 00:00:00 2001
From: GammaC0de <GammaC0de@users.noreply.github.com>
Date: Fri, 10 Apr 2015 03:02:37 +0300
Subject: Update DepositfilesCom.py

---
 module/plugins/hoster/DepositfilesCom.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 95fd7c1b1..48b325b48 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -52,7 +52,9 @@ class DepositfilesCom(SimpleHoster):
         params = {'fid': m.group(1)}
         self.logDebug("FID: %s" % params['fid'])
 
+        self.setWait(60)
         self.wait()
+
         recaptcha = ReCaptcha(self)
         captcha_key = recaptcha.detect_key()
         if captcha_key is None:
-- 
cgit v1.2.3


From b92e851691faa9f1f8af5226c77a80c21f55b30e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 10 Apr 2015 03:32:41 +0200
Subject: [DepositfilesCom] Update

---
 module/plugins/hoster/DepositfilesCom.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index 48b325b48..cc24e351e 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class DepositfilesCom(SimpleHoster):
     __name__    = "DepositfilesCom"
     __type__    = "hoster"
-    __version__ = "0.54"
+    __version__ = "0.55"
 
     __pattern__ = r'https?://(?:www\.)?(depositfiles\.com|dfiles\.(eu|ru))(/\w{1,3})?/files/(?P<ID>\w+)'
     __config__  = [("use_premium", "bool", "Use premium account if available", True)]
@@ -28,7 +28,7 @@ class DepositfilesCom(SimpleHoster):
     OFFLINE_PATTERN = r'<span class="html_download_api-not_exists"></span>'
 
     NAME_REPLACEMENTS = [(r'\%u([0-9A-Fa-f]{4})', lambda m: unichr(int(m.group(1), 16))),
-                              (r'.*<b title="(?P<N>.+?)".*', "\g<N>")]
+                         (r'.*<b title="(?P<N>.+?)".*', "\g<N>")]
     URL_REPLACEMENTS  = [(__pattern__ + ".*", "https://dfiles.eu/files/\g<ID>")]
 
     COOKIES = [("dfiles.eu", "lang_current", "en")]
@@ -52,8 +52,7 @@ class DepositfilesCom(SimpleHoster):
         params = {'fid': m.group(1)}
         self.logDebug("FID: %s" % params['fid'])
 
-        self.setWait(60)
-        self.wait()
+        self.checkErrors()
 
         recaptcha = ReCaptcha(self)
         captcha_key = recaptcha.detect_key()
@@ -68,9 +67,6 @@ class DepositfilesCom(SimpleHoster):
 
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m:
-            if 'response' in params:
-                self.correctCaptcha()
-
             self.link = unquote(m.group(1))
 
 
-- 
cgit v1.2.3


From 1e6846b3c435b0d71be83670d09bd019a84823ec Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 10 Apr 2015 14:36:59 +0200
Subject: Spare code cosmetics

---
 module/plugins/hoster/BezvadataCz.py    |  2 +-
 module/plugins/hoster/BitshareCom.py    |  2 +-
 module/plugins/hoster/DataportCz.py     |  2 +-
 module/plugins/hoster/DateiTo.py        |  2 +-
 module/plugins/hoster/DropboxCom.py     |  4 ++--
 module/plugins/hoster/EdiskCz.py        |  2 +-
 module/plugins/hoster/EuroshareEu.py    |  2 +-
 module/plugins/hoster/ExtabitCom.py     |  3 +--
 module/plugins/hoster/FilecloudIo.py    |  3 +--
 module/plugins/hoster/FilepostCom.py    | 11 +----------
 module/plugins/hoster/FlyFilesNet.py    |  4 +---
 module/plugins/hoster/GigapetaCom.py    |  3 +--
 module/plugins/hoster/GooIm.py          |  2 +-
 module/plugins/hoster/LetitbitNet.py    | 11 +----------
 module/plugins/hoster/LoadTo.py         |  8 +++-----
 module/plugins/hoster/LuckyShareNet.py  |  2 +-
 module/plugins/hoster/MegasharesCom.py  |  5 ++---
 module/plugins/hoster/NarodRu.py        |  4 +---
 module/plugins/hoster/NowDownloadSx.py  |  6 +++---
 module/plugins/hoster/NowVideoSx.py     |  2 +-
 module/plugins/hoster/QuickshareCz.py   | 10 ++++------
 module/plugins/hoster/SendspaceCom.py   |  4 +---
 module/plugins/hoster/ShareonlineBiz.py | 13 +++++--------
 module/plugins/hoster/UloziskoSk.py     |  3 +--
 module/plugins/hoster/UnibytesCom.py    |  6 ++----
 module/plugins/hoster/UploadingCom.py   |  5 ++---
 module/plugins/hoster/VeohCom.py        |  3 +--
 module/plugins/hoster/VimeoCom.py       |  4 ++--
 module/plugins/hoster/WrzucTo.py        |  3 +--
 module/plugins/hoster/YibaishiwuCom.py  |  5 ++---
 30 files changed, 47 insertions(+), 89 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index 37dd38e02..fbb17635c 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -76,7 +76,7 @@ class BezvadataCz(SimpleHoster):
         wait_time = (int(m.group(1)) * 60 + int(m.group(2))) if m else 120
         self.wait(wait_time, False)
 
-        self.download(url)
+        self.link = url
 
 
     def checkErrors(self):
diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py
index 43f29c41f..79aaedcd9 100644
--- a/module/plugins/hoster/BitshareCom.py
+++ b/module/plugins/hoster/BitshareCom.py
@@ -72,7 +72,7 @@ class BitshareCom(SimpleHoster):
         self.logDebug("File ajax id is [%s]" % self.ajaxid)
 
         # This may either download our file or forward us to an error page
-        self.download(self.getDownloadUrl())
+        self.link = self.getDownloadUrl()
 
         if self.checkDownload({"error": ">Error occured<"}):
             self.retry(5, 5 * 60, "Bitshare host : Error occured")
diff --git a/module/plugins/hoster/DataportCz.py b/module/plugins/hoster/DataportCz.py
index 89882d7f1..ad514f5eb 100644
--- a/module/plugins/hoster/DataportCz.py
+++ b/module/plugins/hoster/DataportCz.py
@@ -38,7 +38,7 @@ class DataportCz(SimpleHoster):
             else:
                 self.error(_("captcha"))
 
-            self.html = self.download("http://www.dataport.cz%s" % action, post=inputs)
+            self.download("http://www.dataport.cz%s" % action, post=inputs)
 
             check = self.checkDownload({"captcha": 'alert("\u0160patn\u011b opsan\u00fd k\u00f3d z obr\u00e1zu");',
                                         "slot"   : 'alert("Je n\u00e1m l\u00edto, ale moment\u00e1ln\u011b nejsou'})
diff --git a/module/plugins/hoster/DateiTo.py b/module/plugins/hoster/DateiTo.py
index e93ebcf04..71a9eb4bf 100644
--- a/module/plugins/hoster/DateiTo.py
+++ b/module/plugins/hoster/DateiTo.py
@@ -57,7 +57,7 @@ class DateiTo(SimpleHoster):
         else:
             self.fail(_("Too bad..."))
 
-        self.download(self.html)
+        self.link = self.html
 
 
     def checkErrors(self):
diff --git a/module/plugins/hoster/DropboxCom.py b/module/plugins/hoster/DropboxCom.py
index c948039ac..eec968f5a 100644
--- a/module/plugins/hoster/DropboxCom.py
+++ b/module/plugins/hoster/DropboxCom.py
@@ -27,8 +27,8 @@ class DropboxCom(SimpleHoster):
 
 
     def setup(self):
-        self.multiDL = True
-        self.chunkLimit = 1
+        self.multiDL        = True
+        self.chunkLimit     = 1
         self.resumeDownload = True
 
 
diff --git a/module/plugins/hoster/EdiskCz.py b/module/plugins/hoster/EdiskCz.py
index cfa6da4eb..b8485001e 100644
--- a/module/plugins/hoster/EdiskCz.py
+++ b/module/plugins/hoster/EdiskCz.py
@@ -51,7 +51,7 @@ class EdiskCz(SimpleHoster):
         if not re.match(self.LINK_FREE_PATTERN, url):
             self.fail(_("Unexpected server response"))
 
-        self.download(url)
+        self.link = url
 
 
 getInfo = create_getInfo(EdiskCz)
diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py
index 922665c2e..842e0cb87 100644
--- a/module/plugins/hoster/EuroshareEu.py
+++ b/module/plugins/hoster/EuroshareEu.py
@@ -34,7 +34,7 @@ class EuroshareEu(SimpleHoster):
             self.account.relogin(self.user)
             self.retry(reason=_("User not logged in"))
 
-        self.download(pyfile.url.rstrip('/') + "/download/")
+        self.link = pyfile.url.rstrip('/') + "/download/"
 
         check = self.checkDownload({"login": re.compile(self.ERR_NOT_LOGGED_IN_PATTERN),
                                     "json" : re.compile(r'\{"status":"error".*?"message":"(.*?)"')})
diff --git a/module/plugins/hoster/ExtabitCom.py b/module/plugins/hoster/ExtabitCom.py
index a485f0c4d..f3b4d28be 100644
--- a/module/plugins/hoster/ExtabitCom.py
+++ b/module/plugins/hoster/ExtabitCom.py
@@ -72,8 +72,7 @@ class ExtabitCom(SimpleHoster):
         if m is None:
             self.error(_("LINK_FREE_PATTERN not found"))
 
-        url = m.group(1)
-        self.download(url)
+        self.link = m.group(1)
 
 
 getInfo = create_getInfo(ExtabitCom)
diff --git a/module/plugins/hoster/FilecloudIo.py b/module/plugins/hoster/FilecloudIo.py
index f4c8fedd6..38d2972a1 100644
--- a/module/plugins/hoster/FilecloudIo.py
+++ b/module/plugins/hoster/FilecloudIo.py
@@ -104,8 +104,7 @@ class FilecloudIo(SimpleHoster):
             if "size" in self.info and self.info['size']:
                 self.check_data = {"size": int(self.info['size'])}
 
-            download_url = m.group(1)
-            self.download(download_url)
+            self.link = m.group(1)
         else:
             self.fail(_("Unexpected server response"))
 
diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py
index 78960dc6d..2a9e3dc26 100644
--- a/module/plugins/hoster/FilepostCom.py
+++ b/module/plugins/hoster/FilepostCom.py
@@ -79,20 +79,11 @@ class FilepostCom(SimpleHoster):
                     self.logDebug(u"RECAPTCHA: %s : %s : %s" % (
                         captcha_key, post_dict['recaptcha_challenge_field'], post_dict['recaptcha_response_field']))
 
-                download_url = self.getJsonResponse(get_dict, post_dict, 'link')
-                if download_url:
-                    if i:
-                        self.correctCaptcha()
-                    break
-                elif i:
-                    self.invalidCaptcha()
+                self.link = self.getJsonResponse(get_dict, post_dict, 'link')
 
             else:
                 self.fail(_("Invalid captcha"))
 
-        # Download
-        self.download(download_url)
-
 
     def getJsonResponse(self, get_dict, post_dict, field):
         res = json_loads(self.load('https://filepost.com/files/get/', get=get_dict, post=post_dict))
diff --git a/module/plugins/hoster/FlyFilesNet.py b/module/plugins/hoster/FlyFilesNet.py
index bcfaaab69..4420d5d60 100644
--- a/module/plugins/hoster/FlyFilesNet.py
+++ b/module/plugins/hoster/FlyFilesNet.py
@@ -41,6 +41,4 @@ class FlyFilesNet(SimpleHoster):
             self.wait(10 * 60, True)
             self.retry()
 
-        download_url = parsed_url.replace('#downlink|', '')
-
-        self.download(download_url)
+        self.link = parsed_url.replace('#downlink|', '')
diff --git a/module/plugins/hoster/GigapetaCom.py b/module/plugins/hoster/GigapetaCom.py
index bb53a12ee..2fe44ca85 100644
--- a/module/plugins/hoster/GigapetaCom.py
+++ b/module/plugins/hoster/GigapetaCom.py
@@ -45,7 +45,7 @@ class GigapetaCom(SimpleHoster):
 
             m = re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I)
             if m:
-                download_url = m.group(1).rstrip()  #@TODO: Remove .rstrip() in 0.4.10
+                self.link = m.group(1).rstrip()  #@TODO: Remove .rstrip() in 0.4.10
                 break
             elif "Entered figures don&#96;t coincide with the picture" in self.html:
                 self.invalidCaptcha()
@@ -53,7 +53,6 @@ class GigapetaCom(SimpleHoster):
             self.fail(_("No valid captcha code entered"))
 
         self.req.http.c.setopt(FOLLOWLOCATION, 1)
-        self.download(download_url)
 
 
     def checkErrors(self):
diff --git a/module/plugins/hoster/GooIm.py b/module/plugins/hoster/GooIm.py
index c6d8ce83d..4b27e6cc8 100644
--- a/module/plugins/hoster/GooIm.py
+++ b/module/plugins/hoster/GooIm.py
@@ -32,7 +32,7 @@ class GooIm(SimpleHoster):
 
     def handleFree(self, pyfile):
         self.wait(10)
-        self.download(pyfile.url)
+        self.link = pyfile.url
 
 
 getInfo = create_getInfo(GooIm)
diff --git a/module/plugins/hoster/LetitbitNet.py b/module/plugins/hoster/LetitbitNet.py
index 27f2cadb8..79dbd8133 100644
--- a/module/plugins/hoster/LetitbitNet.py
+++ b/module/plugins/hoster/LetitbitNet.py
@@ -119,16 +119,7 @@ class LetitbitNet(SimpleHoster):
         else:
             self.error(_("Unknown response - captcha check"))
 
-        self.correctCaptcha()
-
-        for download_url in urls:
-            try:
-                self.download(download_url)
-                break
-            except Exception, e:
-                self.logError(e)
-        else:
-            self.fail(_("Download did not finish correctly"))
+        self.link = urls[0]
 
 
     def handlePremium(self, pyfile):
diff --git a/module/plugins/hoster/LoadTo.py b/module/plugins/hoster/LoadTo.py
index 8f4f8808c..2b4202051 100644
--- a/module/plugins/hoster/LoadTo.py
+++ b/module/plugins/hoster/LoadTo.py
@@ -45,7 +45,7 @@ class LoadTo(SimpleHoster):
         if m is None:
             self.error(_("LINK_FREE_PATTERN not found"))
 
-        download_url = m.group(1)
+        self.link = m.group(1)
 
         # Set Timer - may be obsolete
         m = re.search(self.WAIT_PATTERN, self.html)
@@ -56,11 +56,9 @@ class LoadTo(SimpleHoster):
         solvemedia  = SolveMedia(self)
         captcha_key = solvemedia.detect_key()
 
-        if captcha_key is None:
-            self.download(download_url)
-        else:
+        if captcha_key:
             response, challenge = solvemedia.challenge(captcha_key)
-            self.download(download_url,
+            self.download(self.link,
                           post={'adcopy_challenge': challenge,
                                 'adcopy_response' : response,
                                 'returnUrl'       : pyfile.url})
diff --git a/module/plugins/hoster/LuckyShareNet.py b/module/plugins/hoster/LuckyShareNet.py
index 980072744..26af8153f 100644
--- a/module/plugins/hoster/LuckyShareNet.py
+++ b/module/plugins/hoster/LuckyShareNet.py
@@ -69,7 +69,7 @@ class LuckyShareNet(SimpleHoster):
         if not json['link']:
             self.fail(_("No Download url retrieved/all captcha attempts failed"))
 
-        self.download(json['link'])
+        self.link = json['link']
 
 
 getInfo = create_getInfo(LuckyShareNet)
diff --git a/module/plugins/hoster/MegasharesCom.py b/module/plugins/hoster/MegasharesCom.py
index c6ccdb587..ed2363fe3 100644
--- a/module/plugins/hoster/MegasharesCom.py
+++ b/module/plugins/hoster/MegasharesCom.py
@@ -105,9 +105,8 @@ class MegasharesCom(SimpleHoster):
         if m is None:
             self.error(msg)
 
-        download_url = m.group(1)
-        self.logDebug("%s: %s" % (msg, download_url))
-        self.download(download_url)
+        self.link = m.group(1)
+        self.logDebug("%s: %s" % (msg, self.link))
 
 
 getInfo = create_getInfo(MegasharesCom)
diff --git a/module/plugins/hoster/NarodRu.py b/module/plugins/hoster/NarodRu.py
index 7de041f36..65ad90d17 100644
--- a/module/plugins/hoster/NarodRu.py
+++ b/module/plugins/hoster/NarodRu.py
@@ -48,7 +48,7 @@ class NarodRu(SimpleHoster):
 
             m = re.search(self.LINK_FREE_PATTERN, self.html)
             if m:
-                url = 'http://narod.ru' + m.group(1)
+                self.link = 'http://narod.ru' + m.group(1)
                 self.correctCaptcha()
                 break
 
@@ -61,7 +61,5 @@ class NarodRu(SimpleHoster):
         else:
             self.fail(_("No valid captcha code entered"))
 
-        self.download(url)
-
 
 getInfo = create_getInfo(NarodRu)
diff --git a/module/plugins/hoster/NowDownloadSx.py b/module/plugins/hoster/NowDownloadSx.py
index 5ef36d270..a1cf9baf7 100644
--- a/module/plugins/hoster/NowDownloadSx.py
+++ b/module/plugins/hoster/NowDownloadSx.py
@@ -55,11 +55,11 @@ class NowDownloadSx(SimpleHoster):
 
         self.html = self.load(baseurl + str(continuelink.group(1)))
 
-        url = re.search(self.LINK_FREE_PATTERN, self.html)
-        if url is None:
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
+        if m is None:
             self.error(_("Download link not found"))
 
-        self.download(str(url.group(1)))
+        self.link = m.group(1)
 
 
 getInfo = create_getInfo(NowDownloadSx)
diff --git a/module/plugins/hoster/NowVideoSx.py b/module/plugins/hoster/NowVideoSx.py
index 04274ed82..477379597 100644
--- a/module/plugins/hoster/NowVideoSx.py
+++ b/module/plugins/hoster/NowVideoSx.py
@@ -39,7 +39,7 @@ class NowVideoSx(SimpleHoster):
         if m is None:
             self.error(_("Free download link not found"))
 
-        self.download(m.group(1))
+        self.link = m.group(1)
 
 
 getInfo = create_getInfo(NowVideoSx)
diff --git a/module/plugins/hoster/QuickshareCz.py b/module/plugins/hoster/QuickshareCz.py
index 250a33d0d..893c3b6c7 100644
--- a/module/plugins/hoster/QuickshareCz.py
+++ b/module/plugins/hoster/QuickshareCz.py
@@ -68,11 +68,12 @@ class QuickshareCz(SimpleHoster):
         m = re.search(r'Location\s*:\s*(.+)', self.header, re.I)
         if m is None:
             self.fail(_("File not found"))
-        download_url = m.group(1).rstrip()  #@TODO: Remove .rstrip() in 0.4.10
-        self.logDebug("FREE URL2:" + download_url)
+
+        self.link = m.group(1).rstrip()  #@TODO: Remove .rstrip() in 0.4.10
+        self.logDebug("FREE URL2:" + self.link)
 
         # check errors
-        m = re.search(r'/chyba/(\d+)', download_url)
+        m = re.search(r'/chyba/(\d+)', self.link)
         if m:
             if m.group(1) == '1':
                 self.retry(60, 2 * 60, "This IP is already downloading")
@@ -81,9 +82,6 @@ class QuickshareCz(SimpleHoster):
             else:
                 self.fail(_("Error %d") % m.group(1))
 
-        # download file
-        self.download(download_url)
-
 
     def handlePremium(self, pyfile):
         download_url = '%s/download_premium.php' % self.jsvars['server']
diff --git a/module/plugins/hoster/SendspaceCom.py b/module/plugins/hoster/SendspaceCom.py
index 148217fe6..0ab20949d 100644
--- a/module/plugins/hoster/SendspaceCom.py
+++ b/module/plugins/hoster/SendspaceCom.py
@@ -35,7 +35,7 @@ class SendspaceCom(SimpleHoster):
             if m:
                 if 'captcha_hash' in params:
                     self.correctCaptcha()
-                download_url = m.group(1)
+                self.link = m.group(1)
                 break
 
             m = re.search(self.CAPTCHA_PATTERN, self.html)
@@ -56,7 +56,5 @@ class SendspaceCom(SimpleHoster):
         else:
             self.fail(_("Download link not found"))
 
-        self.download(download_url)
-
 
 getInfo = create_getInfo(SendspaceCom)
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py
index 102e91276..fea5781fe 100644
--- a/module/plugins/hoster/ShareonlineBiz.py
+++ b/module/plugins/hoster/ShareonlineBiz.py
@@ -98,16 +98,14 @@ class ShareonlineBiz(SimpleHoster):
 
         self.checkErrors()
 
-        res          = self.handleCaptcha()
-        download_url = res.decode('base64')
+        res = self.handleCaptcha()
+        self.link = res.decode('base64')
 
-        if not download_url.startswith("http://"):
+        if not self.link.startswith("http://"):
             self.error(_("Wrong download url"))
 
         self.wait()
 
-        self.download(download_url)
-
 
     def checkFile(self, rules={}):
         check = self.checkDownload({'cookie': re.compile(r'<div id="dl_failure"'),
@@ -145,13 +143,12 @@ class ShareonlineBiz(SimpleHoster):
             pyfile.name = dlinfo['name']
             pyfile.size = int(dlinfo['size'])
 
-            dlLink = dlinfo['url']
+            self.link = dlinfo['url']
 
-            if dlLink == "server_under_maintenance":
+            if self.link == "server_under_maintenance":
                 self.tempOffline()
             else:
                 self.multiDL = True
-                self.download(dlLink)
 
 
     def checkErrors(self):
diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py
index 39a375b49..d687ae7cb 100644
--- a/module/plugins/hoster/UloziskoSk.py
+++ b/module/plugins/hoster/UloziskoSk.py
@@ -34,8 +34,7 @@ class UloziskoSk(SimpleHoster):
 
         m = re.search(self.IMG_PATTERN, self.html)
         if m:
-            url = "http://ulozisko.sk" + m.group(1)
-            self.download(url)
+            self.link = "http://ulozisko.sk" + m.group(1)
         else:
             self.handleFree(pyfile)
 
diff --git a/module/plugins/hoster/UnibytesCom.py b/module/plugins/hoster/UnibytesCom.py
index 7753f1264..14447b0b0 100644
--- a/module/plugins/hoster/UnibytesCom.py
+++ b/module/plugins/hoster/UnibytesCom.py
@@ -42,7 +42,7 @@ class UnibytesCom(SimpleHoster):
 
             m = re.search(r'location:\s*(\S+)', self.req.http.header, re.I)
             if m:
-                url = m.group(1)
+                self.link = m.group(1)
                 break
 
             if '>Somebody else is already downloading using your IP-address<' in self.html:
@@ -52,7 +52,7 @@ class UnibytesCom(SimpleHoster):
             if post_data['step'] == 'last':
                 m = re.search(self.LINK_FREE_PATTERN, self.html)
                 if m:
-                    url = m.group(1)
+                    self.link = m.group(1)
                     self.correctCaptcha()
                     break
                 else:
@@ -73,7 +73,5 @@ class UnibytesCom(SimpleHoster):
 
         self.req.http.c.setopt(FOLLOWLOCATION, 1)
 
-        self.download(url)
-
 
 getInfo = create_getInfo(UnibytesCom)
diff --git a/module/plugins/hoster/UploadingCom.py b/module/plugins/hoster/UploadingCom.py
index 164b7b243..d0e0b1fd7 100644
--- a/module/plugins/hoster/UploadingCom.py
+++ b/module/plugins/hoster/UploadingCom.py
@@ -53,8 +53,7 @@ class UploadingCom(SimpleHoster):
         self.html = self.load('http://uploading.com/files/get/?JsHttpRequest=%d-xml' % timestamp(), post=postData)
         url = re.search(r'"link"\s*:\s*"(.*?)"', self.html)
         if url:
-            url = url.group(1).replace("\\/", "/")
-            self.download(url)
+            self.link = url.group(1).replace("\\/", "/")
 
         raise Exception("Plugin defect")
 
@@ -93,7 +92,7 @@ class UploadingCom(SimpleHoster):
         else:
             self.error(_("No URL"))
 
-        self.download(url)
+        self.link = url
 
 
 getInfo = create_getInfo(UploadingCom)
diff --git a/module/plugins/hoster/VeohCom.py b/module/plugins/hoster/VeohCom.py
index 2f79f5aa4..57b24623b 100644
--- a/module/plugins/hoster/VeohCom.py
+++ b/module/plugins/hoster/VeohCom.py
@@ -43,8 +43,7 @@ class VeohCom(SimpleHoster):
             m = re.search(pattern, self.html)
             if m:
                 pyfile.name += ".mp4"
-                link = m.group(1).replace("\\", "")
-                self.download(link)
+                self.link = m.group(1).replace("\\", "")
                 return
             else:
                 self.logInfo(_("No %s quality video found") % q.upper())
diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py
index 02aef98ec..a5196cb92 100644
--- a/module/plugins/hoster/VimeoCom.py
+++ b/module/plugins/hoster/VimeoCom.py
@@ -49,7 +49,7 @@ class VimeoCom(SimpleHoster):
 
         if self.getConfig('original'):
             if "original" in link:
-                self.download(link[q])
+                self.link = link[q]
                 return
             else:
                 self.logInfo(_("Original file not downloadable"))
@@ -64,7 +64,7 @@ class VimeoCom(SimpleHoster):
 
         for q in qlevel:
             if q in link:
-                self.download(link[q])
+                self.link = link[q]
                 return
             else:
                 self.logInfo(_("No %s quality video found") % q.upper())
diff --git a/module/plugins/hoster/WrzucTo.py b/module/plugins/hoster/WrzucTo.py
index 0d78058d7..50a45babe 100644
--- a/module/plugins/hoster/WrzucTo.py
+++ b/module/plugins/hoster/WrzucTo.py
@@ -46,8 +46,7 @@ class WrzucTo(SimpleHoster):
         if len(data) != 4:
             self.error(_("No download URL"))
 
-        download_url = "http://%s.wrzuc.to/pobierz/%s" % (data['server_id'], data['download_link'])
-        self.download(download_url)
+        self.link = "http://%s.wrzuc.to/pobierz/%s" % (data['server_id'], data['download_link'])
 
 
 getInfo = create_getInfo(WrzucTo)
diff --git a/module/plugins/hoster/YibaishiwuCom.py b/module/plugins/hoster/YibaishiwuCom.py
index 44f2b7b83..7ca6e1ac0 100644
--- a/module/plugins/hoster/YibaishiwuCom.py
+++ b/module/plugins/hoster/YibaishiwuCom.py
@@ -47,9 +47,8 @@ class YibaishiwuCom(SimpleHoster):
 
         for mr in mirrors:
             try:
-                url = mr['url'].replace("\\", "")
-                self.logDebug("Trying URL: " + url)
-                self.download(url)
+                self.link = mr['url'].replace("\\", "")
+                self.logDebug("Trying URL: " + self.link)
                 break
             except Exception:
                 continue
-- 
cgit v1.2.3


From 20d433b55b40203a8f302a8ecd3c58b47c2869e3 Mon Sep 17 00:00:00 2001
From: zapp-brannigan <zapp-brannigan@users.noreply.github.com>
Date: Sat, 11 Apr 2015 11:23:36 +0200
Subject: [New Hoster] lolabits.es

As requested in https://github.com/pyload/pyload/issues/1343
---
 module/plugins/hoster/LolabitsEs.py | 46 +++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 module/plugins/hoster/LolabitsEs.py

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/LolabitsEs.py b/module/plugins/hoster/LolabitsEs.py
new file mode 100644
index 000000000..fe25aa838
--- /dev/null
+++ b/module/plugins/hoster/LolabitsEs.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*
+
+import re
+import HTMLParser
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+
+
+class LolabitsEs(SimpleHoster):
+    __name__    = "LolabitsEs"
+    __type__    = "hoster"
+    __version__ = "0.01"
+
+    __pattern__ = r'https?://(?:www\.)?lolabits.es/.*'
+
+    __description__ = """lolabits.es hoster plugin"""
+    __license__     = "GPLv3"
+    __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
+
+
+    NAME_PATTERN    = r'Descargar: <b>(?P<N>.+?)</b>'
+    SIZE_PATTERN    = r'class="fileSize">(?P<S>[\d.,]+) (?P<U>[\w^_]+)<'
+    
+    OFFLINE_PATTERN = r'Un usuario con este nombre no existe'
+
+
+    def setup(self):
+        self.chunkLimit = 1
+
+    def handleFree(self, pyfile):
+        fileid = re.search(r'name="FileId" value="(\d+)"',self.html).group(1)
+        self.logDebug("FileID: %s" %fileid)
+        
+        token = re.search(r'name="__RequestVerificationToken" type="hidden" value="(.+?)"',self.html).group(1)
+        self.logDebug("Token: %s" %token)
+        
+        self.html = self.load("http://lolabits.es/action/License/Download",
+                              cookies = True,
+                              post    = {"fileId"                     : fileid,
+                                         "__RequestVerificationToken" : token}
+                             ).decode('unicode-escape')
+        m = re.search(r'"redirectUrl":"(.+?)"',self.html)
+        self.link = HTMLParser.HTMLParser().unescape(m.group(1))
+        
+        
+getInfo = create_getInfo(LolabitsEs)
-- 
cgit v1.2.3


From c7bbcf09791a3754c393e6f1e57dd768306aa63a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 12 Apr 2015 19:18:24 +0200
Subject: [LolabitsEs] Cleanup

---
 module/plugins/hoster/LolabitsEs.py | 44 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/LolabitsEs.py b/module/plugins/hoster/LolabitsEs.py
index fe25aa838..61df5f0bb 100644
--- a/module/plugins/hoster/LolabitsEs.py
+++ b/module/plugins/hoster/LolabitsEs.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*
 
-import re
 import HTMLParser
+import re
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
@@ -9,38 +9,40 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class LolabitsEs(SimpleHoster):
     __name__    = "LolabitsEs"
     __type__    = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
-    __pattern__ = r'https?://(?:www\.)?lolabits.es/.*'
+    __pattern__ = r'https?://(?:www\.)?lolabits\.es/.+'
 
-    __description__ = """lolabits.es hoster plugin"""
+    __description__ = """Lolabits.es hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
-    NAME_PATTERN    = r'Descargar: <b>(?P<N>.+?)</b>'
-    SIZE_PATTERN    = r'class="fileSize">(?P<S>[\d.,]+) (?P<U>[\w^_]+)<'
-    
+    NAME_PATTERN    = r'Descargar: <b>(?P<N>.+?)<'
+    SIZE_PATTERN    = r'class="fileSize">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
     OFFLINE_PATTERN = r'Un usuario con este nombre no existe'
 
+    FILEID_PATTERN = r'name="FileId" value="(\d+)"'
+    TOKEN_PATTERN  = r'name="__RequestVerificationToken" type="hidden" value="(.+?)"'
+    LINK_PATTERN   = r'"redirectUrl":"(.+?)"'
+
 
     def setup(self):
         self.chunkLimit = 1
 
+
     def handleFree(self, pyfile):
-        fileid = re.search(r'name="FileId" value="(\d+)"',self.html).group(1)
-        self.logDebug("FileID: %s" %fileid)
-        
-        token = re.search(r'name="__RequestVerificationToken" type="hidden" value="(.+?)"',self.html).group(1)
-        self.logDebug("Token: %s" %token)
-        
+        fileid = re.search(self.FILEID_PATTERN, self.html).group(1)
+        self.logDebug("FileID: " + fileid)
+
+        token = re.search(self.TOKEN_PATTERN, self.html).group(1)
+        self.logDebug("Token: " + token)
+
         self.html = self.load("http://lolabits.es/action/License/Download",
-                              cookies = True,
-                              post    = {"fileId"                     : fileid,
-                                         "__RequestVerificationToken" : token}
-                             ).decode('unicode-escape')
-        m = re.search(r'"redirectUrl":"(.+?)"',self.html)
-        self.link = HTMLParser.HTMLParser().unescape(m.group(1))
-        
-        
+                              post={'fileId'                     : fileid,
+                                    '__RequestVerificationToken' : token}).decode('unicode-escape')
+
+        self.link = HTMLParser.HTMLParser().unescape(re.search(self.LINK_PATTERN, self.html).group(1))
+
+
 getInfo = create_getInfo(LolabitsEs)
-- 
cgit v1.2.3