merged stable into default

19 files changed, 330 insertions, 276 deletions

diff --git a/module/plugins/hoster/BezvadataCz.py b/module/plugins/hoster/BezvadataCz.py
index 680bbc173..a0717ad64 100644
--- a/module/plugins/hoster/BezvadataCz.py
+++ b/module/plugins/hoster/BezvadataCz.py
@@ -23,7 +23,7 @@ class BezvadataCz(SimpleHoster):
     __name__ = "BezvadataCz"
     __type__ = "hoster"
     __pattern__ = r"http://(\w*\.)*bezvadata.cz/stahnout/.*"
-    __version__ = "0.22"
+    __version__ = "0.23"
     __description__ = """BezvaData.cz"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
diff --git a/module/plugins/hoster/DdlstorageCom.py b/module/plugins/hoster/DdlstorageCom.py
index 0177d9648..1ad5fa6d8 100644
--- a/module/plugins/hoster/DdlstorageCom.py
+++ b/module/plugins/hoster/DdlstorageCom.py
@@ -5,12 +5,12 @@ class DdlstorageCom(XFileSharingPro):
     __name__ = "DdlstorageCom"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)*?ddlstorage.com/\w{12}"
-    __version__ = "0.05"
+    __version__ = "0.06"
     __description__ = """DDLStorage.com hoster plugin"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
     
-    FILE_INFO_PATTERN = r'<h2>Download File\s*<span[^>]*>(?P<N>[^>]+)</span></h2>\s*[^\(]*\((?P<S>[^\)]+)\)</h2>'
+    FILE_INFO_PATTERN = r'<h2>\s*Download File\s*<span[^>]*>(?P<N>[^>]+)</span></h2>\s*[^\(]*\((?P<S>[^\)]+)\)</h2>'
     HOSTER_NAME = "ddlstorage.com"
    
     def setup(self):
diff --git a/module/plugins/hoster/DlFreeFr.py b/module/plugins/hoster/DlFreeFr.py
index 8b32e5eb4..5b318fd54 100644
--- a/module/plugins/hoster/DlFreeFr.py
+++ b/module/plugins/hoster/DlFreeFr.py
@@ -103,7 +103,6 @@ class DlFreeFr(SimpleHoster):
     #FILE_URL_PATTERN = r'href="(?P<url>http://.*?)">T&eacute;l&eacute;charger ce fichier'   
                     
     def setup(self):
-        self.multiDL = True
         self.limitDL = 5
         self.resumeDownload = True
         self.chunkLimit = 1        
diff --git a/module/plugins/hoster/EuroshareEu.py b/module/plugins/hoster/EuroshareEu.py
index a0bfe0ab2..1e1cc0b4b 100644
--- a/module/plugins/hoster/EuroshareEu.py
+++ b/module/plugins/hoster/EuroshareEu.py
@@ -37,7 +37,7 @@ class EuroshareEu(Hoster):
     __name__ = "EuroshareEu"
     __type__ = "hoster"
     __pattern__ = r"http://(\w*\.)?euroshare.eu/file/.*"
-    __version__ = "0.2b"
+    __version__ = "0.30"
     __description__ = """Euroshare.eu"""
     __author_name__ = ("zoidberg")
 
diff --git a/module/plugins/hoster/FilesMailRu.py b/module/plugins/hoster/FilesMailRu.py
index 6002ab3dc..1284329b5 100644
--- a/module/plugins/hoster/FilesMailRu.py
+++ b/module/plugins/hoster/FilesMailRu.py
@@ -2,9 +2,8 @@
 # -*- coding: utf-8 -*-
 
 import re
-from module.plugins.Hoster import Hoster
+from module.plugins.Hoster import Hoster, chunks
 from module.network.RequestFactory import getURL
-from module.plugins.Plugin import chunks
 
 def getInfo(urls):
     result = []
diff --git a/module/plugins/hoster/FilesonicCom.py b/module/plugins/hoster/FilesonicCom.py
index 525a99e7a..b35ce1b1f 100644
--- a/module/plugins/hoster/FilesonicCom.py
+++ b/module/plugins/hoster/FilesonicCom.py
@@ -7,7 +7,7 @@ from urllib import unquote
 

 from module.plugins.Hoster import Hoster

 from module.plugins.ReCaptcha import ReCaptcha

-from module.plugins.Plugin import chunks

+from module.utils import chunks

 

 from module.network.RequestFactory import getURL

 from module.common.json_layer import json_loads

diff --git a/module/plugins/hoster/HotfileCom.py b/module/plugins/hoster/HotfileCom.py
index bf4250767..df652edcc 100644
--- a/module/plugins/hoster/HotfileCom.py
+++ b/module/plugins/hoster/HotfileCom.py
@@ -6,7 +6,7 @@ from module.plugins.Hoster import Hoster
 from module.plugins.ReCaptcha import ReCaptcha
 
 from module.network.RequestFactory import getURL
-from module.plugins.Plugin import chunks
+from module.utils import chunks
 
 def getInfo(urls):
     api_url_base = "http://api.hotfile.com/"
diff --git a/module/plugins/hoster/MegauploadCom.py b/module/plugins/hoster/MegauploadCom.py
index 336cbfb58..8693e4303 100644
--- a/module/plugins/hoster/MegauploadCom.py
+++ b/module/plugins/hoster/MegauploadCom.py
@@ -2,17 +2,13 @@
 # -*- coding: utf-8 -*-

 

 import re

-from time import sleep

 

 from module.plugins.Hoster import Hoster

 

 from module.network.RequestFactory import getURL

-from module.network.HTTPRequest import BadHeader

 

 from module.utils import html_unescape

-from module.PyFile import statusMap

-

-from pycurl import error

+from datatypes.PyFile import statusMap

 

 def getInfo(urls):

     yield [(url, 0, 1, url) for url in urls]

diff --git a/module/plugins/hoster/MultishareCz.py b/module/plugins/hoster/MultishareCz.py
index a0dda30b8..af7aa94cf 100644
--- a/module/plugins/hoster/MultishareCz.py
+++ b/module/plugins/hoster/MultishareCz.py
@@ -24,7 +24,7 @@ class MultishareCz(SimpleHoster):
     __name__ = "MultishareCz"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?multishare.cz/stahnout/(?P<ID>\d+).*"
-    __version__ = "0.34"
+    __version__ = "0.40"
     __description__ = """MultiShare.cz"""
     __author_name__ = ("zoidberg")
 
@@ -50,11 +50,12 @@ class MultishareCz(SimpleHoster):
         self.download("http://www.multishare.cz/html/download_free.php?ID=%s" % self.fileID)
         
     def handlePremium(self):
-        if not self.checkCredit():
+        if not self.checkTrafficLeft():
             self.logWarning("Not enough credit left to download file")
             self.resetAccount() 
                 
         self.download("http://www.multishare.cz/html/download_premium.php?ID=%s" % self.fileID)
+        self.checkTrafficLeft()
     
     def handleOverriden(self):
         if not self.premium: 
@@ -63,18 +64,13 @@ class MultishareCz(SimpleHoster):
         self.html = self.load('http://www.multishare.cz/html/mms_ajax.php', post = {"link": self.pyfile.url}, decode = True)        
         self.getFileInfo()       
         
-        if not self.checkCredit():
+        if not self.checkTrafficLeft():
             self.fail("Not enough credit left to download file")
         
         url = "http://dl%d.mms.multishare.cz/html/mms_process.php" % round(random()*10000*random())    
         params = {"u_ID" : self.acc_info["u_ID"], "u_hash" : self.acc_info["u_hash"], "link" : self.pyfile.url}
         self.logDebug(url, params)
         self.download(url, get = params)
-    
-    def checkCredit(self):                   
-        self.acc_info = self.account.getAccountInfo(self.user, True)
-        self.logInfo("User %s has %i MB left" % (self.user, self.acc_info["trafficleft"]/1024))
-                
-        return self.pyfile.size / 1024 <= self.acc_info["trafficleft"]
+        self.checkTrafficLeft()
 
 getInfo = create_getInfo(MultishareCz)
\ No newline at end of file
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index fa2f3ddef..9310b5c34 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -5,14 +5,12 @@ import re
 from time import sleep, time
 
 
+from module.utils import chunks
 from module.plugins.Hoster import Hoster
 from module.network.RequestFactory import getURL
-from module.plugins.Plugin import chunks
-
-
 
 def getInfo(urls):
- ##  returns list of tupels (name, size (in bytes), status (see FileDatabase), url)
+ ##  returns list of tuples (name, size (in bytes), status (see FileDatabase), url)
 
 
     apiurl = "http://api.netload.in/info.php?auth=Zf9SnQh9WiReEsb18akjvQGqT0I830e8&bz=1&md5=1&file_id="
@@ -202,7 +200,7 @@ class NetloadIn(Hoster):
             file_id = re.search('<input name="file_id" type="hidden" value="(.*)" />', page).group(1)
             if not captchawaited:
                 wait = self.get_wait_time(page)
-                if i == 0: self.pyfile.waitUntil = time() # dont wait contrary to time on website
+                if i == 0: self.pyfile.waitUntil = time() # don't wait contrary to time on web site
                 else: self.pyfile.waitUntil = t
                 self.log.info(_("Netload: waiting for captcha %d s.") % (self.pyfile.waitUntil - time()))
                 #self.setWait(wait)
diff --git a/module/plugins/hoster/Premium4Me.py b/module/plugins/hoster/Premium4Me.py
index d029b3df1..cd47a9e91 100644
--- a/module/plugins/hoster/Premium4Me.py
+++ b/module/plugins/hoster/Premium4Me.py
@@ -6,7 +6,7 @@ from module.plugins.Hoster import Hoster
 

 class Premium4Me(Hoster):

     __name__ = "Premium4Me"

-    __version__ = "0.03"

+    __version__ = "0.10"

     __type__ = "hoster"

 

     __pattern__ = r"http://premium4.me/.*"

diff --git a/module/plugins/hoster/PutlockerCom.py b/module/plugins/hoster/PutlockerCom.py
index 4de0ca218..8cfcd4d9e 100644
--- a/module/plugins/hoster/PutlockerCom.py
+++ b/module/plugins/hoster/PutlockerCom.py
@@ -52,7 +52,7 @@ class PutlockerCom(Hoster):
     __name__ = "PutlockerCom"
     __type__ = "hoster"
     __pattern__ = r'http://(www\.)?putlocker\.com/(file|embed)/[A-Z0-9]+'
-    __version__ = "0.1"
+    __version__ = "0.2"
     __description__ = """Putlocker.Com"""
     __author_name__ = ("jeix")
    
@@ -121,6 +121,6 @@ class PutlockerCom(Hoster):
         # if link is None:
             # self.fail("%s: Plugin broken." % self.__name__)
 
-        return self.link.group(1)
+        return self.link.group(1).replace("&amp;", "&")
          
         
diff --git a/module/plugins/hoster/RapidshareCom.py b/module/plugins/hoster/RapidshareCom.py
index 8b31dd42c..6aacd684e 100644
--- a/module/plugins/hoster/RapidshareCom.py
+++ b/module/plugins/hoster/RapidshareCom.py
@@ -52,7 +52,7 @@ class RapidshareCom(Hoster):
     __pattern__ = r"https?://[\w\.]*?rapidshare.com/(?:files/(?P<id>\d*?)/(?P<name>[^?]+)|#!download\|(?:\w+)\|(?P<id_new>\d+)\|(?P<name_new>[^|]+))"
     __version__ = "1.38"
     __description__ = """Rapidshare.com Download Hoster"""
-    __config__ = [["server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None"]] 
+    __config__ = [("server", "Cogent;Deutsche Telekom;Level(3);Level(3) #2;GlobalCrossing;Level(3) #3;Teleglobe;GlobalCrossing #2;TeliaSonera #2;Teleglobe #2;TeliaSonera #3;TeliaSonera", "Preferred Server", "None")]
     __author_name__ = ("spoob", "RaNaN", "mkaay")
     __author_mail__ = ("spoob@pyload.org", "ranan@pyload.org", "mkaay@mkaay.de")
 
@@ -129,7 +129,7 @@ class RapidshareCom(Hoster):
             self.handleFree()
 
     def handlePremium(self):
-        info = self.account.getAccountInfo(self.user, True)
+        info = self.account.getAccountInfo(True)
         self.log.debug("%s: Use Premium Account" % self.__name__)
         url = self.api_data["mirror"]
         self.download(url, get={"directstart":1})
diff --git a/module/plugins/hoster/RealdebridCom.py b/module/plugins/hoster/RealdebridCom.py
index ff4843afd..3c796232e 100644
--- a/module/plugins/hoster/RealdebridCom.py
+++ b/module/plugins/hoster/RealdebridCom.py
@@ -1,88 +1,88 @@
-#!/usr/bin/env python

-# -*- coding: utf-8 -*-

-

-import re

-from time import time

-from urllib import quote, unquote

-from random import randrange

-

-from module.utils import parseFileSize, remove_chars

-from module.common.json_layer import json_loads

-from module.plugins.Hoster import Hoster

-

-class RealdebridCom(Hoster):

-    __name__ = "RealdebridCom"

-    __version__ = "0.49"

-    __type__ = "hoster"

-

-    __pattern__ = r"https?://.*real-debrid\..*"

-    __description__ = """Real-Debrid.com hoster plugin"""

-    __author_name__ = ("Devirex, Hazzard")

-    __author_mail__ = ("naibaf_11@yahoo.de")

-

-    def getFilename(self, url):

-        try:

-            name = unquote(url.rsplit("/", 1)[1])

-        except IndexError:

-            name = "Unknown_Filename..."

-        if not name or name.endswith(".."): #incomplete filename, append random stuff

-            name += "%s.tmp" % randrange(100,999)

-        return name

-

-    def init(self):

-        self.tries = 0

-        self.chunkLimit = 3

-        self.resumeDownload = True

-

-

-    def process(self, pyfile):

-        if not self.account:

-            self.logError(_("Please enter your Real-debrid account or deactivate this plugin"))

-            self.fail("No Real-debrid account provided")

-

-        self.log.debug("Real-Debrid: Old URL: %s" % pyfile.url)

-        if re.match(self.__pattern__, pyfile.url):

-            new_url = pyfile.url

-        else:

-            password = self.getPassword().splitlines()

-            if not password: password = ""

-            else: password = password[0]

-

-            url = "http://real-debrid.com/ajax/unrestrict.php?lang=en&link=%s&password=%s&time=%s" % (quote(pyfile.url, ""), password, int(time()*1000))

-            page = self.load(url)

-            data = json_loads(page)

-

-            self.logDebug("Returned Data: %s" % data)

-

-            if data["error"] != 0:

-                if data["message"] == "Your file is unavailable on the hoster.":

-                    self.offline()

-                else:

-                    self.logWarning(data["message"])

-                    self.tempOffline()

-            else:

-                if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data["file_name"]:

-                    self.pyfile.name = data["file_name"]

-                self.pyfile.size = parseFileSize(data["file_size"])

-                new_url = data['generated_links'][0][-1]

-

-        if self.getConfig("https"):

-            new_url = new_url.replace("http://", "https://")

-        else:

-            new_url = new_url.replace("https://", "http://")

-

-        self.log.debug("Real-Debrid: New URL: %s" % new_url)

-

-        if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'):

-            #only use when name wasnt already set

-            pyfile.name = self.getFilename(new_url)

-

-        self.download(new_url, disposition=True)

-

-        check = self.checkDownload(

-                {"error": "<title>An error occured while processing your request</title>"})

-

-        if check == "error":

-            #usual this download can safely be retried

-            self.retry(reason="An error occured while generating link.", wait_time=60)

-

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import re
+from time import time
+from urllib import quote, unquote
+from random import randrange
+
+from module.utils import parseFileSize, remove_chars
+from module.common.json_layer import json_loads
+from module.plugins.Hoster import Hoster
+
+class RealdebridCom(Hoster):
+    __name__ = "RealdebridCom"
+    __version__ = "0.49"
+    __type__ = "hoster"
+
+    __pattern__ = r"https?://.*real-debrid\..*"
+    __description__ = """Real-Debrid.com hoster plugin"""
+    __author_name__ = ("Devirex, Hazzard")
+    __author_mail__ = ("naibaf_11@yahoo.de")
+
+    def getFilename(self, url):
+        try:
+            name = unquote(url.rsplit("/", 1)[1])
+        except IndexError:
+            name = "Unknown_Filename..."
+        if not name or name.endswith(".."): #incomplete filename, append random stuff
+            name += "%s.tmp" % randrange(100,999)
+        return name
+
+    def init(self):
+        self.tries = 0
+        self.chunkLimit = 3
+        self.resumeDownload = True
+
+
+    def process(self, pyfile):
+        if not self.account:
+            self.logError(_("Please enter your Real-debrid account or deactivate this plugin"))
+            self.fail("No Real-debrid account provided")
+
+        self.log.debug("Real-Debrid: Old URL: %s" % pyfile.url)
+        if re.match(self.__pattern__, pyfile.url):
+            new_url = pyfile.url
+        else:
+            password = self.getPassword().splitlines()
+            if not password: password = ""
+            else: password = password[0]
+
+            url = "http://real-debrid.com/ajax/unrestrict.php?lang=en&link=%s&password=%s&time=%s" % (quote(pyfile.url, ""), password, int(time()*1000))
+            page = self.load(url)
+            data = json_loads(page)
+
+            self.logDebug("Returned Data: %s" % data)
+
+            if data["error"] != 0:
+                if data["message"] == "Your file is unavailable on the hoster.":
+                    self.offline()
+                else:
+                    self.logWarning(data["message"])
+                    self.tempOffline()
+            else:
+                if self.pyfile.name is not None and self.pyfile.name.endswith('.tmp') and data["file_name"]:
+                    self.pyfile.name = data["file_name"]
+                self.pyfile.size = parseFileSize(data["file_size"])
+                new_url = data['generated_links'][0][-1]
+
+        if self.getConfig("https"):
+            new_url = new_url.replace("http://", "https://")
+        else:
+            new_url = new_url.replace("https://", "http://")
+
+        self.log.debug("Real-Debrid: New URL: %s" % new_url)
+
+        if pyfile.name.startswith("http") or pyfile.name.startswith("Unknown") or pyfile.name.endswith('..'):
+            #only use when name wasnt already set
+            pyfile.name = self.getFilename(new_url)
+
+        self.download(new_url, disposition=True)
+
+        check = self.checkDownload(
+                {"error": "<title>An error occured while processing your request</title>"})
+
+        if check == "error":
+            #usual this download can safely be retried
+            self.retry(reason="An error occured while generating link.", wait_time=60)
+
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py
index 9de7f9bd0..b3b01c92b 100644
--- a/module/plugins/hoster/TurbobitNet.py
+++ b/module/plugins/hoster/TurbobitNet.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 """
+    Copyright (C) 2012  pyLoad team
+    Copyright (C) 2012  JD-Team support@jdownloader.org
+
     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,
@@ -17,8 +20,13 @@
 """
 
 import re
+import random
+from urllib import quote
+from binascii import hexlify, unhexlify
+from Crypto.Cipher import ARC4
 
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
+from module.network.RequestFactory import getURL
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp
 from module.plugins.ReCaptcha import ReCaptcha
 
 from pycurl import HTTPHEADER
@@ -27,29 +35,38 @@ class TurbobitNet(SimpleHoster):
     __name__ = "TurbobitNet"
     __type__ = "hoster"
     __pattern__ = r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*"
-    __version__ = "0.05"
+    __version__ = "0.07"
     __description__ = """Turbobit.net plugin"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
-    
+
     FILE_INFO_PATTERN = r"<span class='file-icon1[^>]*>(?P<N>[^<]+)</span>\s*\((?P<S>[^\)]+)\)\s*</h1>" #long filenames are shortened
-    FILE_NAME_PATTERN = r'<meta name="keywords" content="\s*(?P<N>[^,]+)' #full name but missing on page2
-    FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>'
-    FILE_URL_REPLACEMENTS = [(r"(?<=http://)([^/]+)", "turbobit.net")]
+    FILE_NAME_PATTERN = r'<meta name="keywords" content="\s+(?P<N>[^,]+)' #full name but missing on page2
+    FILE_OFFLINE_PATTERN = r'<h2>File Not Found</h2>|html\(\'File was not found'
+    FILE_URL_REPLACEMENTS = [(r"http://(?:\w*\.)?(turbobit.net|unextfiles.com)/(?:download/free/)?(?P<ID>\w+).*", "http://turbobit.net/\g<ID>.html")]
     SH_COOKIES = [("turbobit.net", "user_lang", "en")]
-    
+
     CAPTCHA_KEY_PATTERN = r'src="http://api\.recaptcha\.net/challenge\?k=([^"]+)"'
     DOWNLOAD_URL_PATTERN = r'(?P<url>/download/redirect/[^"\']+)'
     LIMIT_WAIT_PATTERN = r'<div id="time-limit-text">\s*.*?<span id=\'timeout\'>(\d+)</span>'
-    CAPTCHA_SRC_PATTERN = r'<img alt="Captcha" src="(.*?)"'      
+    CAPTCHA_SRC_PATTERN = r'<img alt="Captcha" src="(.*?)"'
 
-    def handleFree(self):                
+    def handleFree(self):
         self.url = "http://turbobit.net/download/free/%s" % self.file_info['ID']
-        if not '/download/free/' in self.pyfile.url:
-            self.html = self.load(self.url)
-        
-        recaptcha = ReCaptcha(self)                                    
+        self.html = self.load(self.url)
+
+        rtUpdate = self.getRtUpdate()
+
+        self.solveCaptcha()
+        self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])       
+        self.url = self.getDownloadUrl(rtUpdate)
 
+        self.wait()
+        self.html = self.load(self.url)
+        self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With:"])
+        self.downloadFile()
+
+    def solveCaptcha(self):       
         for i in range(5):
             found = re.search(self.LIMIT_WAIT_PATTERN, self.html)
             if found:
@@ -57,12 +74,13 @@ class TurbobitNet(SimpleHoster):
                 self.setWait(wait_time, wait_time > 60)
                 self.wait()
                 self.retry()
-        
+
             action, inputs = self.parseHtmlForm("action='#'")
-            if not inputs: self.parseError("inputs")
+            if not inputs: self.parseError("captcha form")
             self.logDebug(inputs)
-            
+
             if inputs['captcha_type'] == 'recaptcha':
+                recaptcha = ReCaptcha(self)
                 found = re.search(self.CAPTCHA_KEY_PATTERN, self.html)
                 captcha_key = found.group(1) if found else '6LcTGLoSAAAAAHCWY9TTIrQfjUlxu6kZlTYP50_c'
                 inputs['recaptcha_challenge_field'], inputs['recaptcha_response_field'] = recaptcha.challenge(captcha_key)
@@ -70,36 +88,82 @@ class TurbobitNet(SimpleHoster):
                 found = re.search(self.CAPTCHA_SRC_PATTERN, self.html)
                 if not found: self.parseError('captcha')
                 captcha_url = found.group(1)
-                inputs['captcha_response'] = self.decryptCaptcha(captcha_url)                                                  
+                inputs['captcha_response'] = self.decryptCaptcha(captcha_url)
 
             self.logDebug(inputs)
             self.html = self.load(self.url, post = inputs)
-            
+
             if not "<div class='download-timer-header'>" in self.html:
                 self.invalidCaptcha()
             else:
                 self.correctCaptcha()
                 break
         else: self.fail("Invalid captcha")
-        
+
+    def getRtUpdate(self):
+        rtUpdate = self.getStorage("rtUpdate")
+        if not rtUpdate:
+            if self.getStorage("version") != self.__version__ or int(self.getStorage("timestamp", 0)) +  86400000 < timestamp(): 
+                # that's right, we are even using jdownloader updates
+                rtUpdate = getURL("http://update0.jdownloader.org/pluginstuff/tbupdate.js")
+                rtUpdate = self.decrypt(rtUpdate.splitlines()[1])
+                # but we still need to fix the syntax to work with other engines than rhino                
+                rtUpdate = re.sub(r'for each\(var (\w+) in(\[[^\]]+\])\)\{',r'zza=\2;for(var zzi=0;zzi<zza.length;zzi++){\1=zza[zzi];',rtUpdate)
+                rtUpdate = re.sub(r"for\((\w+)=",r"for(var \1=", rtUpdate)
+                
+                self.logDebug("rtUpdate")
+                self.setStorage("rtUpdate", rtUpdate)
+                self.setStorage("timestamp", timestamp())
+                self.setStorage("version", self.__version__)
+            else:
+                self.logError("Unable to download, wait for update...")
+                self.tempOffline()
+
+        return rtUpdate
+
+    def getDownloadUrl(self, rtUpdate):
         self.req.http.lastURL = self.url
-        self.req.http.c.setopt(HTTPHEADER, ["X-Requested-With: XMLHttpRequest"])
-        
-        self.setWait(60, False)
-        self.wait()
-        
-        self.html = self.load("http://turbobit.net/download/getLinkTimeout/" + self.file_info['ID'])
-        self.downloadFile()       
+
+        found = re.search("(/\w+/timeout\.js\?\w+=)([^\"\'<>]+)", self.html)
+        url = "http://turbobit.net%s%s" % (found.groups() if found else ('/files/timeout.js?ver=', ''.join(random.choice('0123456789ABCDEF') for x in range(32))))
+        fun = self.load(url)
+
+        self.setWait(65, False)
+
+        for b in [1,3]:
+            self.jscode = "var id = \'%s\';var b = %d;var inn = \'%s\';%sout" % (self.file_info['ID'], b, quote(fun), rtUpdate)
+            
+            try:
+                out = self.js.eval(self.jscode)
+                self.logDebug("URL", self.js.engine, out)
+                if out.startswith('/download/'):
+                    return "http://turbobit.net%s" % out.strip()
+            except Exception, e:
+                self.logError(e)
+        else:
+            if self.retries >= 2:
+                # retry with updated js
+                self.delStorage("rtUpdate")
+            self.retry()
+
+    def decrypt(self, data):
+        cipher = ARC4.new(hexlify('E\x15\xa1\x9e\xa3M\xa0\xc6\xa0\x84\xb6H\x83\xa8o\xa0'))
+        return unhexlify(cipher.encrypt(unhexlify(data)))
     
+    def getLocalTimeString():
+        lt = time.localtime()
+        tz = time.altzone if lt.tm_isdst else time.timezone 
+        return "%s GMT%+03d%02d" % (time.strftime("%a %b %d %Y %H:%M:%S", lt), -tz // 3600, tz % 3600)        
+
     def handlePremium(self):
         self.logDebug("Premium download as user %s" % self.user)
         self.downloadFile()
-        
+
     def downloadFile(self):
         found = re.search(self.DOWNLOAD_URL_PATTERN, self.html)
-        if not found: self.parseError("download link")        
+        if not found: self.parseError("download link")
         self.url = "http://turbobit.net" + found.group('url')
         self.logDebug(self.url)
-        self.download(self.url)  
+        self.download(self.url)
 
 getInfo = create_getInfo(TurbobitNet)
\ No newline at end of file
diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py
index 19ca4ba9d..3cb1e71ff 100644
--- a/module/plugins/hoster/UploadedTo.py
+++ b/module/plugins/hoster/UploadedTo.py
@@ -2,11 +2,10 @@
 
 import re
 
-from module.utils import html_unescape, parseFileSize
+from module.utils import html_unescape, parseFileSize, chunks
 
 from module.plugins.Hoster import Hoster
 from module.network.RequestFactory import getURL
-from module.plugins.Plugin import chunks
 from module.plugins.ReCaptcha import ReCaptcha
 
 key = "bGhGMkllZXByd2VEZnU5Y2NXbHhYVlZ5cEE1bkEzRUw=".decode('base64')
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index 7ddbeb280..8e213e9bf 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -34,7 +34,7 @@ class XFileSharingPro(SimpleHoster):
     __name__ = "XFileSharingPro"
     __type__ = "hoster"
     __pattern__ = r"^unmatchable$"
-    __version__ = "0.09"
+    __version__ = "0.11"
     __description__ = """XFileSharingPro common hoster base"""
     __author_name__ = ("zoidberg")
     __author_mail__ = ("zoidberg@mujmail.cz")
@@ -52,7 +52,6 @@ class XFileSharingPro(SimpleHoster):
     RECAPTCHA_URL_PATTERN = r'http://[^"\']+?recaptcha[^"\']+?\?k=([^"\']+)"'
     CAPTCHA_DIV_PATTERN = r'<b>Enter code.*?<div.*?>(.*?)</div>'
     ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)</'      
-    #DIRECT_LINK_PATTERN = r'This direct link.*?href=["\'](.*?)["\']'
     
     def setup(self):
         self.__pattern__ = self.core.pluginManager.hosterPlugins[self.__name__]['pattern']
@@ -74,25 +73,29 @@ class XFileSharingPro(SimpleHoster):
             else:
                 self.fail("Only premium users can download from other hosters with %s" % self.HOSTER_NAME)
         else:
-            location = None                   
+            try:
+                self.html = self.load(pyfile.url, cookies = False, decode = True)
+                self.file_info = self.getFileInfo()
+            except PluginParseError:
+                self.file_info = None
+                
+            self.req.http.lastURL = self.pyfile.url
             
             self.req.http.c.setopt(FOLLOWLOCATION, 0)
             self.html = self.load(self.pyfile.url, cookies = True, decode = True)
             self.header = self.req.http.header
-            self.req.http.c.setopt(FOLLOWLOCATION, 1)    
-            
+            self.req.http.c.setopt(FOLLOWLOCATION, 1)
+
+            self.location = None
             found = re.search("Location\s*:\s*(.*)", self.header, re.I)
             if found and re.match(self.DIRECT_LINK_PATTERN, found.group(1)):
-                location = found.group(1) 
-                self.html = self.load(pyfile.url, cookies = False, decode = True)
-                
-            try:
-                self.file_info = self.getFileInfo()
-            except PluginParseError:
-                pyfile.name = html_unescape(unquote(urlparse(location if location else pyfile.url).path.split("/")[-1]))
-                
-            if location:    
-                self.startDownload(location)              
+                self.location = found.group(1).strip()                 
+                     
+            if not self.file_info:
+                pyfile.name = html_unescape(unquote(urlparse(self.location if self.location else pyfile.url).path.split("/")[-1]))
+            
+            if self.location:    
+                self.startDownload(self.location)
             elif self.premium:
                 self.handlePremium()
             else:
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 222e9bf84..3ba40e937 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -77,8 +77,8 @@ class YoutubeCom(Hoster):
         self.logDebug("Found links: %s" % fmt_dict)
         for fmt in fmt_dict.keys():
             if fmt not in self.formats:
-	        self.logDebug("FMT not supported: %s" % fmt)
-		del fmt_dict[fmt]
+                self.logDebug("FMT not supported: %s" % fmt)
+                del fmt_dict[fmt]
 
         allowed = lambda x: self.getConfig(self.formats[x][0])
         sel = lambda x: self.formats[x][3] #select quality index
diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py
index cbedfcb68..8be725d2f 100644
--- a/module/plugins/hoster/ZeveraCom.py
+++ b/module/plugins/hoster/ZeveraCom.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python

-# -*- coding: utf-8 -*-

-

-from module.plugins.Hoster import Hoster

-from module.utils import html_unescape

-from urllib import quote, unquote

-from time import sleep

-

-class ZeveraCom(Hoster):

-    __name__ = "ZeveraCom"

-    __version__ = "0.20"

-    __type__ = "hoster"

-    __pattern__ = r"http://zevera.com/.*"

-    __description__ = """zevera.com hoster plugin"""

-    __author_name__ = ("zoidberg")

-    __author_mail__ = ("zoidberg@mujmail.cz")

-    

-    def setup(self):

-        self.resumeDownload = self.multiDL = True

-        self.chunkLimit = 1

-    

-    def process(self, pyfile):

-        if not self.account:

-            self.logError(_("Please enter your zevera.com account or deactivate this plugin"))

-            self.fail("No zevera.com account provided")

-

-        self.logDebug("zevera.com: Old URL: %s" % pyfile.url)

-        

-        if self.account.getAPIData(self.req, cmd = "checklink", olink = pyfile.url) != "Alive":

-            self.fail("Offline or not downloadable - contact Zevera support")                 

-        

-        header = self.account.getAPIData(self.req, just_header = True, cmd="generatedownloaddirect", olink = pyfile.url)

-        if not "location" in header:

-            self.fail("Unable to initialize download - contact Zevera support")

-        

-        self.download(header['location'], disposition = True)

-        

-        check = self.checkDownload({"error" : 'action="ErrorDownload.aspx'})

-        if check == "error":

-            self.fail("Error response received - contact Zevera support")

-                            

-    """

-    # BitAPI not used - defunct, probably abandoned by Zevera

-    

-    api_url = "http://zevera.com/API.ashx"        

-    

-    def process(self, pyfile): 

-        if not self.account:

-            self.logError(_("Please enter your zevera.com account or deactivate this plugin"))

-            self.fail("No zevera.com account provided")

-

-        self.logDebug("zevera.com: Old URL: %s" % pyfile.url)

-        

-        last_size = retries = 0

-        olink = self.pyfile.url #quote(self.pyfile.url.encode('utf_8'))

-        

-        for i in range(100):

-            self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_request', olink = olink)       

-            self.checkAPIErrors(self.retData)

-            

-            if self.retData['FileInfo']['StatusID'] == 100: 

-                break

-            elif self.retData['FileInfo']['StatusID'] == 99:

-                self.fail('Failed to initialize download (99)')              

-            else:               

-                if self.retData['FileInfo']['Progress']['BytesReceived'] <= last_size: 

-                    if retries >= 6:

-                        self.fail('Failed to initialize download (%d)' % self.retData['FileInfo']['StatusID'] )

-                    retries += 1

-                else:               

-                    retries = 0

-                

-                last_size = self.retData['FileInfo']['Progress']['BytesReceived']

-                

-                self.setWait(self.retData['Update_Wait'])

-                self.wait()                

-        

-        pyfile.name = self.retData['FileInfo']['RealFileName']

-        pyfile.size = self.retData['FileInfo']['FileSizeInBytes'] 

-        

-        self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_start', FileID = self.retData['FileInfo']['FileID'])

-        self.checkAPIErrors(self.retData)

-        

-        self.download(self.api_url, get = {

-            'cmd': "open_stream",

-            'login': self.account.loginname,

-            'pass': self.account.password,

-            'FileID': self.retData['FileInfo']['FileID'],

-            'startBytes': 0

-            }

-        )                        

-

-    def checkAPIErrors(self, retData):

-        if not retData: 

-            self.fail('Unknown API response')

-            

-        if retData['ErrorCode']: 

-            self.logError(retData['ErrorCode'], retData['ErrorMessage'])

-            #self.fail('ERROR: ' + retData['ErrorMessage'])

-            

-        if self.pyfile.size / 1024000 > retData['AccountInfo']['AvailableTODAYTrafficForUseInMBytes']:

-            self.logWarning("Not enough data left to download the file")

-    

-    def crazyDecode(self, ustring):       

-        # accepts decoded ie. unicode string - API response is double-quoted, double-utf8-encoded

-        # no idea what the proper order of calling these functions would be :-/

-        return html_unescape(unquote(unquote(ustring.replace('@DELIMITER@','#'))).encode('raw_unicode_escape').decode('utf-8'))

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from module.plugins.Hoster import Hoster
+from module.utils import html_unescape
+from urllib import quote, unquote
+from time import sleep
+
+class ZeveraCom(Hoster):
+    __name__ = "ZeveraCom"
+    __version__ = "0.20"
+    __type__ = "hoster"
+    __pattern__ = r"http://zevera.com/.*"
+    __description__ = """zevera.com hoster plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+    
+    def setup(self):
+        self.resumeDownload = self.multiDL = True
+        self.chunkLimit = 1
+    
+    def process(self, pyfile):
+        if not self.account:
+            self.logError(_("Please enter your zevera.com account or deactivate this plugin"))
+            self.fail("No zevera.com account provided")
+
+        self.logDebug("zevera.com: Old URL: %s" % pyfile.url)
+        
+        if self.account.getAPIData(self.req, cmd = "checklink", olink = pyfile.url) != "Alive":
+            self.fail("Offline or not downloadable - contact Zevera support")                 
+        
+        header = self.account.getAPIData(self.req, just_header = True, cmd="generatedownloaddirect", olink = pyfile.url)
+        if not "location" in header:
+            self.fail("Unable to initialize download - contact Zevera support")
+        
+        self.download(header['location'], disposition = True)
+        
+        check = self.checkDownload({"error" : 'action="ErrorDownload.aspx'})
+        if check == "error":
+            self.fail("Error response received - contact Zevera support")
+                            
+    """
+    # BitAPI not used - defunct, probably abandoned by Zevera
+    
+    api_url = "http://zevera.com/API.ashx"        
+    
+    def process(self, pyfile): 
+        if not self.account:
+            self.logError(_("Please enter your zevera.com account or deactivate this plugin"))
+            self.fail("No zevera.com account provided")
+
+        self.logDebug("zevera.com: Old URL: %s" % pyfile.url)
+        
+        last_size = retries = 0
+        olink = self.pyfile.url #quote(self.pyfile.url.encode('utf_8'))
+        
+        for i in range(100):
+            self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_request', olink = olink)       
+            self.checkAPIErrors(self.retData)
+            
+            if self.retData['FileInfo']['StatusID'] == 100: 
+                break
+            elif self.retData['FileInfo']['StatusID'] == 99:
+                self.fail('Failed to initialize download (99)')              
+            else:               
+                if self.retData['FileInfo']['Progress']['BytesReceived'] <= last_size: 
+                    if retries >= 6:
+                        self.fail('Failed to initialize download (%d)' % self.retData['FileInfo']['StatusID'] )
+                    retries += 1
+                else:               
+                    retries = 0
+                
+                last_size = self.retData['FileInfo']['Progress']['BytesReceived']
+                
+                self.setWait(self.retData['Update_Wait'])
+                self.wait()                
+        
+        pyfile.name = self.retData['FileInfo']['RealFileName']
+        pyfile.size = self.retData['FileInfo']['FileSizeInBytes'] 
+        
+        self.retData = self.account.loadAPIRequest(self.req, cmd = 'download_start', FileID = self.retData['FileInfo']['FileID'])
+        self.checkAPIErrors(self.retData)
+        
+        self.download(self.api_url, get = {
+            'cmd': "open_stream",
+            'login': self.account.loginname,
+            'pass': self.account.password,
+            'FileID': self.retData['FileInfo']['FileID'],
+            'startBytes': 0
+            }
+        )                        
+
+    def checkAPIErrors(self, retData):
+        if not retData: 
+            self.fail('Unknown API response')
+            
+        if retData['ErrorCode']: 
+            self.logError(retData['ErrorCode'], retData['ErrorMessage'])
+            #self.fail('ERROR: ' + retData['ErrorMessage'])
+            
+        if self.pyfile.size / 1024000 > retData['AccountInfo']['AvailableTODAYTrafficForUseInMBytes']:
+            self.logWarning("Not enough data left to download the file")
+    
+    def crazyDecode(self, ustring):       
+        # accepts decoded ie. unicode string - API response is double-quoted, double-utf8-encoded
+        # no idea what the proper order of calling these functions would be :-/
+        return html_unescape(unquote(unquote(ustring.replace('@DELIMITER@','#'))).encode('raw_unicode_escape').decode('utf-8'))
     """
\ No newline at end of file