Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 17 insertions, 7 deletions

diff --git a/module/plugins/hoster/BitshareCom.py b/module/plugins/hoster/BitshareCom.py
index f5d59d428..644345387 100644
--- a/module/plugins/hoster/BitshareCom.py
+++ b/module/plugins/hoster/BitshareCom.py
@@ -46,7 +46,7 @@ class BitshareCom(Hoster):
     __name__ = "BitshareCom"
     __type__ = "hoster"
     __pattern__ = r"http://(www\.)?bitshare\.com/(files/(?P<id1>[a-zA-Z0-9]+)(/(?P<name>.*?)\.html)?|\?f=(?P<id2>[a-zA-Z0-9]+))"
-    __version__ = "0.45"
+    __version__ = "0.47"
     __description__ = """Bitshare.Com File Download Hoster"""
     __author_name__ = ("paulking", "fragonib")
     __author_mail__ = (None, "fragonib[AT]yahoo[DOT]es")
@@ -55,8 +55,9 @@ class BitshareCom(Hoster):
     FILE_OFFLINE_PATTERN = r'''(>We are sorry, but the requested file was not found in our database|>Error - File not available<|The file was deleted either by the uploader, inactivity or due to copyright claim)'''
     FILE_INFO_PATTERN = r'<h1>(Downloading|Streaming)\s(?P<name>.+?)\s-\s(?P<size>[\d.]+)\s(?P<units>..)yte</h1>'
     FILE_AJAXID_PATTERN = r'var ajaxdl = "(.*?)";'
-    CAPTCHA_KEY_PATTERN = r"http://api\.recaptcha\.net/challenge\?k=(.*?) " 
-        
+    CAPTCHA_KEY_PATTERN = r"http://api\.recaptcha\.net/challenge\?k=(.*?) "
+    TRAFFIC_USED_UP = r"Your Traffic is used up for today. Upgrade to premium to continue!"
+
     def setup(self):
         self.multiDL = self.premium
         self.chunkLimit = 1
@@ -74,12 +75,21 @@ class BitshareCom(Hoster):
 
         # Load main page
         self.req.cj.setCookie(self.HOSTER_DOMAIN, "language_selection", "EN")
-        self.html = self.load(self.pyfile.url, ref=False, decode=True, cookies = False)
+        self.html = self.load(self.pyfile.url, ref=False, decode=True)
 
         # Check offline
         if re.search(self.FILE_OFFLINE_PATTERN, self.html) is not None:
             self.offline()
-           
+
+        # Check Traffic used up
+        if re.search(BitshareCom.TRAFFIC_USED_UP, self.html) is not None:
+            self.logInfo("Your Traffic is used up for today. Wait 1800 seconds or reconnect!")
+            self.logDebug("Waiting %d seconds." % 1800)
+            self.setWait(1800, True)
+            self.wantReconnect = True
+            self.wait()
+            self.retry()
+
         # File name
         m = re.search(BitshareCom.__pattern__, self.pyfile.url)
         name1 = m.group('name') if m is not None else None
@@ -124,8 +134,8 @@ class BitshareCom(Hoster):
             else:
                 self.setWait(wait - 55, True)
                 self.wait()
-                self.retry()  
-            
+                self.retry()
+
         # Resolve captcha
         if captcha == 1:
             self.logDebug("File is captcha protected")