Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/MegaRapidCz.py
	module/plugins/accounts/ShareRapidCom.py
	module/plugins/crypter/HotfileComFolder.py
	module/plugins/crypter/HotfileFolderCom.py
	module/plugins/hoster/Keep2shareCC.py
	module/plugins/hoster/Keep2shareCc.py
	module/plugins/hoster/MegaCoNz.py
	module/plugins/hoster/MegaNz.py
	module/plugins/hoster/MegaRapidCz.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/internal/CaptchaService.py
	pyload/api/__init__.py
	pyload/manager/AccountManager.py
	pyload/manager/PluginManager.py
	pyload/manager/thread/PluginThread.py
	pyload/network/HTTPRequest.py
	pyload/network/XDCCRequest.py
	pyload/plugins/Plugin.py
	pyload/plugins/account/BillionuploadsCom.py
	pyload/plugins/account/CramitIn.py
	pyload/plugins/account/EasybytezCom.py
	pyload/plugins/account/FastshareCz.py
	pyload/plugins/account/File4safeCom.py
	pyload/plugins/account/FileParadoxIn.py
	pyload/plugins/account/FileomCom.py
	pyload/plugins/account/FilerNet.py
	pyload/plugins/account/FilerioCom.py
	pyload/plugins/account/FourSharedCom.py
	pyload/plugins/account/Ftp.py
	pyload/plugins/account/Http.py
	pyload/plugins/account/HugefilesNet.py
	pyload/plugins/account/HundredEightyUploadCom.py
	pyload/plugins/account/LomafileCom.py
	pyload/plugins/account/MovReelCom.py
	pyload/plugins/account/MultishareCz.py
	pyload/plugins/account/MyfastfileCom.py
	pyload/plugins/account/NosuploadCom.py
	pyload/plugins/account/NovafileCom.py
	pyload/plugins/account/QuickshareCz.py
	pyload/plugins/account/RarefileNet.py
	pyload/plugins/account/RyushareCom.py
	pyload/plugins/account/SecureUploadEu.py
	pyload/plugins/account/SendmywayCom.py
	pyload/plugins/account/ShareRapidCom.py
	pyload/plugins/account/StahnuTo.py
	pyload/plugins/account/StreamcloudEu.py
	pyload/plugins/account/TusfilesNet.py
	pyload/plugins/account/UploadingCom.py
	pyload/plugins/account/UptoboxCom.py
	pyload/plugins/account/VidPlayNet.py
	pyload/plugins/addon/Checksum.py
	pyload/plugins/addon/ClickAndLoad.py
	pyload/plugins/addon/DeleteFinished.py
	pyload/plugins/addon/DownloadScheduler.py
	pyload/plugins/addon/ExternalScripts.py
	pyload/plugins/addon/ExtractArchive.py
	pyload/plugins/addon/HotFolder.py
	pyload/plugins/addon/IRCInterface.py
	pyload/plugins/addon/MergeFiles.py
	pyload/plugins/addon/MultiHome.py
	pyload/plugins/addon/RestartFailed.py
	pyload/plugins/addon/UnSkipOnFail.py
	pyload/plugins/addon/WindowsPhoneToastNotify.py
	pyload/plugins/addon/XMPPInterface.py
	pyload/plugins/base/Container.py
	pyload/plugins/base/Crypter.py
	pyload/plugins/base/Hook.py
	pyload/plugins/base/OCR.py
	pyload/plugins/container/RSDF.py
	pyload/plugins/crypter/DuploadOrgFolder.py
	pyload/plugins/crypter/EasybytezComFolder.py
	pyload/plugins/crypter/FiredriveComFolder.py
	pyload/plugins/crypter/HotfileFolderCom.py
	pyload/plugins/crypter/LinkSaveIn.py
	pyload/plugins/crypter/MultiuploadCom.py
	pyload/plugins/crypter/ShareRapidComFolder.py
	pyload/plugins/crypter/TusfilesNetFolder.py
	pyload/plugins/crypter/UploadableChFolder.py
	pyload/plugins/crypter/UploadedToFolder.py
	pyload/plugins/hook/Captcha9kw.py
	pyload/plugins/hook/MyfastfileCom.py
	pyload/plugins/hoster/BillionuploadsCom.py
	pyload/plugins/hoster/CramitIn.py
	pyload/plugins/hoster/EasybytezCom.py
	pyload/plugins/hoster/File4safeCom.py
	pyload/plugins/hoster/FileParadoxIn.py
	pyload/plugins/hoster/FilefactoryCom.py
	pyload/plugins/hoster/FileomCom.py
	pyload/plugins/hoster/FilerioCom.py
	pyload/plugins/hoster/FileshareInUa.py
	pyload/plugins/hoster/FiredriveCom.py
	pyload/plugins/hoster/Ftp.py
	pyload/plugins/hoster/HugefilesNet.py
	pyload/plugins/hoster/HundredEightyUploadCom.py
	pyload/plugins/hoster/Keep2shareCC.py
	pyload/plugins/hoster/LoadTo.py
	pyload/plugins/hoster/LomafileCom.py
	pyload/plugins/hoster/MegaNz.py
	pyload/plugins/hoster/MegacrypterCom.py
	pyload/plugins/hoster/MovReelCom.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NosuploadCom.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/PandaPlaNet.py
	pyload/plugins/hoster/PremiumTo.py
	pyload/plugins/hoster/RarefileNet.py
	pyload/plugins/hoster/RyushareCom.py
	pyload/plugins/hoster/SecureUploadEu.py
	pyload/plugins/hoster/SendmywayCom.py
	pyload/plugins/hoster/ShareRapidCom.py
	pyload/plugins/hoster/SockshareCom.py
	pyload/plugins/hoster/StreamcloudEu.py
	pyload/plugins/hoster/TurbobitNet.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UptoboxCom.py
	pyload/plugins/hoster/VidPlayNet.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/internal/DeadCrypter.py
	pyload/plugins/internal/DeadHoster.py
	pyload/plugins/internal/MultiHoster.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py
	pyload/plugins/internal/UpdateManager.py
	pyload/plugins/internal/XFSPAccount.py
	pyload/plugins/internal/XFSPHoster.py
	pyload/utils/__init__.py
	pyload/utils/packagetools.py
	pyload/webui/app/cnl.py

1 files changed, 21 insertions, 16 deletions

diff --git a/pyload/plugins/hoster/XHamsterCom.py b/pyload/plugins/hoster/XHamsterCom.py
index 6d0dbd4d0..acbcc2192 100644
--- a/pyload/plugins/hoster/XHamsterCom.py
+++ b/pyload/plugins/hoster/XHamsterCom.py
@@ -17,15 +17,16 @@ def clean_json(json_expr):
 
 
 class XHamsterCom(Hoster):
-    __name__ = "XHamsterCom"
-    __type__ = "hoster"
+    __name__    = "XHamsterCom"
+    __type__    = "hoster"
     __version__ = "0.12"
 
     __pattern__ = r'http://(?:www\.)?xhamster\.com/movies/.+'
     __config__ = [("type", ".mp4;.flv", "Preferred type", ".mp4")]
 
     __description__ = """XHamster.com hoster plugin"""
-    __authors__ = []
+    __license__     = "GPLv3"
+    __authors__     = []
 
 
     def process(self, pyfile):
@@ -40,21 +41,23 @@ class XHamsterCom(Hoster):
         pyfile.name = self.get_file_name() + self.desired_fmt
         self.download(self.get_file_url())
 
+
     def download_html(self):
         url = self.pyfile.url
         self.html = self.load(url)
 
+
     def get_file_url(self):
         """ returns the absolute downloadable filepath
         """
         if not self.html:
             self.download_html()
 
-        flashvar_pattern = re.compile('flashvars = ({.*?});', re.DOTALL)
+        flashvar_pattern = re.compile('flashvars = ({.*?});', re.S)
         json_flashvar = flashvar_pattern.search(self.html)
 
         if not json_flashvar:
-            self.fail("Parse error (flashvars)")
+            self.error(_("flashvar not found"))
 
         j = clean_json(json_flashvar.group(1))
         flashvars = json_loads(j)
@@ -62,57 +65,59 @@ class XHamsterCom(Hoster):
         if flashvars['srv']:
             srv_url = flashvars['srv'] + '/'
         else:
-            self.fail("Parse error (srv_url)")
+            self.error(_("srv_url not found"))
 
         if flashvars['url_mode']:
             url_mode = flashvars['url_mode']
 
 
         else:
-            self.fail("Parse error (url_mode)")
+            self.error(_("url_mode not found"))
 
         if self.desired_fmt == ".mp4":
             file_url = re.search(r"<a href=\"" + srv_url + "(.+?)\"", self.html)
             if file_url is None:
-                self.fail("Parse error (file_url)")
+                self.error(_("file_url not found"))
             file_url = file_url.group(1)
             long_url = srv_url + file_url
-            self.logDebug("long_url: %s" % long_url)
+            self.logDebug("long_url = " + long_url)
         else:
             if flashvars['file']:
                 file_url = unquote(flashvars['file'])
             else:
-                self.fail("Parse error (file_url)")
+                self.error(_("file_url not found"))
 
             if url_mode == '3':
                 long_url = file_url
-                self.logDebug("long_url: %s" % long_url)
+                self.logDebug("long_url = " + long_url)
             else:
                 long_url = srv_url + "key=" + file_url
-                self.logDebug("long_url: %s" % long_url)
+                self.logDebug("long_url = " + long_url)
 
         return long_url
 
+
     def get_file_name(self):
         if not self.html:
             self.download_html()
 
-        pattern = r"<title>(.*?) - xHamster\.com</title>"
+        pattern = r'<title>(.*?) - xHamster\.com</title>'
         name = re.search(pattern, self.html)
         if name is None:
-            pattern = r"<h1 >(.*)</h1>"
+            pattern = r'<h1 >(.*)</h1>'
             name = re.search(pattern, self.html)
             if name is None:
-                pattern = r"http://[www.]+xhamster\.com/movies/.*/(.*?)\.html?"
+                pattern = r'http://[www.]+xhamster\.com/movies/.*/(.*?)\.html?'
                 name = re.match(file_name_pattern, self.pyfile.url)
                 if name is None:
-                    pattern = r"<div id=\"element_str_id\" style=\"display:none;\">(.*)</div>"
+                    pattern = r'<div id="element_str_id" style="display:none;">(.*)</div>'
                     name = re.search(pattern, self.html)
                     if name is None:
                         return "Unknown"
 
         return name.group(1)
 
+
     def file_exists(self):
         """ returns True or False
         """