Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 25 insertions, 37 deletions

diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py
index d24e21779..ac70f42d4 100644
--- a/module/plugins/hoster/UloziskoSk.py
+++ b/module/plugins/hoster/UloziskoSk.py
@@ -1,71 +1,59 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
-
-    @author: zoidberg
-"""
-
 import re
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, PluginParseError
+
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class UloziskoSk(SimpleHoster):
     __name__ = "UloziskoSk"
     __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?ulozisko.sk/.*'
     __version__ = "0.23"
+
+    __pattern__ = r'http://(?:www\.)?ulozisko.sk/.*'
+
     __description__ = """Ulozisko.sk hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
-    URL_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">'
-    ID_PATTERN = r'<input type = "hidden" name = "id" value = "([^"]+)" />'
     FILE_NAME_PATTERN = r'<div class="down1">(?P<N>[^<]+)</div>'
     FILE_SIZE_PATTERN = ur'Veľkosť súboru: <strong>(?P<S>[0-9.]+) (?P<U>[kKMG])i?B</strong><br />'
+    OFFLINE_PATTERN = ur'<span class = "red">Zadaný súbor neexistuje z jedného z nasledujúcich dôvodov:</span>'
+
+    LINK_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="" />'
-    FILE_OFFLINE_PATTERN = ur'<span class = "red">Zadaný súbor neexistuje z jedného z nasledujúcich dôvodov:</span>'
     IMG_PATTERN = ur'<strong>PRE ZVÄČŠENIE KLIKNITE NA OBRÁZOK</strong><br /><a href = "([^"]+)">'
 
+
     def process(self, pyfile):
         self.html = self.load(pyfile.url, decode=True)
         self.getFileInfo()
 
-        found = re.search(self.IMG_PATTERN, self.html)
-        if found:
-            url = "http://ulozisko.sk" + found.group(1)
+        m = re.search(self.IMG_PATTERN, self.html)
+        if m:
+            url = "http://ulozisko.sk" + m.group(1)
             self.download(url)
         else:
             self.handleFree()
 
     def handleFree(self):
-        found = re.search(self.URL_PATTERN, self.html)
-        if found is None:
-            raise PluginParseError('URL')
-        parsed_url = 'http://www.ulozisko.sk' + found.group(1)
+        m = re.search(self.LINK_PATTERN, self.html)
+        if m is None:
+            self.parseError('URL')
+        parsed_url = 'http://www.ulozisko.sk' + m.group(1)
 
-        found = re.search(self.ID_PATTERN, self.html)
-        if found is None:
-            raise PluginParseError('ID')
-        id = found.group(1)
+        m = re.search(self.ID_PATTERN, self.html)
+        if m is None:
+            self.parseError('ID')
+        id = m.group(1)
 
         self.logDebug('URL:' + parsed_url + ' ID:' + id)
 
-        found = re.search(self.CAPTCHA_PATTERN, self.html)
-        if found is None:
-            raise PluginParseError('CAPTCHA')
-        captcha_url = 'http://www.ulozisko.sk' + found.group(1)
+        m = re.search(self.CAPTCHA_PATTERN, self.html)
+        if m is None:
+            self.parseError('CAPTCHA')
+        captcha_url = 'http://www.ulozisko.sk' + m.group(1)
 
         captcha = self.decryptCaptcha(captcha_url, cookies=True)