Spare fixes

14 files changed, 16 insertions, 19 deletions

diff --git a/module/plugins/accounts/EuroshareEu.py b/module/plugins/accounts/EuroshareEu.py
index 09f08dc01..e5a05cd7f 100644
--- a/module/plugins/accounts/EuroshareEu.py
+++ b/module/plugins/accounts/EuroshareEu.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
 class EuroshareEu(Account):
     __name__    = "EuroshareEu"
     __type__    = "account"
-    __version__ = "0.06"
+    __version__ = "0.07"
     __status__  = "testing"
 
     __description__ = """Euroshare.eu account plugin"""
@@ -18,7 +18,6 @@ class EuroshareEu(Account):
 
 
     def grab_info(self, user, password, data):
-        self.relogin(user)
         html = self.load("http://euroshare.eu/customer-zone/settings/")
 
         m = re.search('id="input_expire_date" value="(\d+\.\d+\.\d+ \d+:\d+)"', html)
diff --git a/module/plugins/accounts/HellshareCz.py b/module/plugins/accounts/HellshareCz.py
index cdfa9937a..a552a03b6 100644
--- a/module/plugins/accounts/HellshareCz.py
+++ b/module/plugins/accounts/HellshareCz.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
 class HellshareCz(Account):
     __name__    = "HellshareCz"
     __type__    = "account"
-    __version__ = "0.21"
+    __version__ = "0.22"
     __status__  = "testing"
 
     __description__ = """Hellshare.cz account plugin"""
@@ -21,7 +21,6 @@ class HellshareCz(Account):
 
 
     def grab_info(self, user, password, data):
-        self.relogin(user)
         html = self.load("http://www.hellshare.com/")
 
         m = re.search(self.CREDIT_LEFT_PATTERN, html)
diff --git a/module/plugins/accounts/MegasharesCom.py b/module/plugins/accounts/MegasharesCom.py
index 6967a7502..ee9be072b 100644
--- a/module/plugins/accounts/MegasharesCom.py
+++ b/module/plugins/accounts/MegasharesCom.py
@@ -21,7 +21,6 @@ class MegasharesCom(Account):
 
 
     def grab_info(self, user, password, data):
-        # self.relogin(user)
         html = self.load("http://d01.megashares.com/myms.php")
 
         premium = False if '>Premium Upgrade<' in html else True
diff --git a/module/plugins/accounts/MultishareCz.py b/module/plugins/accounts/MultishareCz.py
index 77facb308..16fa57948 100644
--- a/module/plugins/accounts/MultishareCz.py
+++ b/module/plugins/accounts/MultishareCz.py
@@ -32,7 +32,6 @@ class MultishareCz(Account):
 
 
     def grab_info(self, user, password, data):
-        # self.relogin(user)
         html = self.load("http://www.multishare.cz/profil/")
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
diff --git a/module/plugins/accounts/YibaishiwuCom.py b/module/plugins/accounts/YibaishiwuCom.py
index ba7454183..695dd79cd 100644
--- a/module/plugins/accounts/YibaishiwuCom.py
+++ b/module/plugins/accounts/YibaishiwuCom.py
@@ -20,7 +20,6 @@ class YibaishiwuCom(Account):
 
 
     def grab_info(self, user, password, data):
-        # self.relogin(user)
         html = self.load("http://115.com/")
 
         m = re.search(self.ACCOUNT_INFO_PATTERN, html, re.S)
diff --git a/module/plugins/captcha/AdsCaptcha.py b/module/plugins/captcha/AdsCaptcha.py
index 613283e53..66f6e2993 100644
--- a/module/plugins/captcha/AdsCaptcha.py
+++ b/module/plugins/captcha/AdsCaptcha.py
@@ -18,7 +18,7 @@ class AdsCaptcha(CaptchaService):
 
 
     CAPTCHAID_PATTERN  = r'api\.adscaptcha\.com/Get\.aspx\?.*?CaptchaId=(\d+)'
-    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w-]+)'
+    PUBLICKEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?.*?PublicKey=([\w\-]+)'
 
 
     def detect_key(self, data=None):
diff --git a/module/plugins/captcha/ReCaptcha.py b/module/plugins/captcha/ReCaptcha.py
index a3ac52cb1..379956be6 100644
--- a/module/plugins/captcha/ReCaptcha.py
+++ b/module/plugins/captcha/ReCaptcha.py
@@ -23,8 +23,8 @@ class ReCaptcha(CaptchaService):
                        ("zapp-brannigan", "fuerst.reinje@web.de")]
 
 
-    KEY_V1_PATTERN = r'(?:recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=|Recaptcha\.create\s*\(\s*["\'])([\w-]+)'
-    KEY_V2_PATTERN = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\'])([\w-]+)'
+    KEY_V1_PATTERN = r'(?:recaptcha(?:/api|\.net)/(?:challenge|noscript)\?k=|Recaptcha\.create\s*\(\s*["\'])([\w\-]+)'
+    KEY_V2_PATTERN = r'(?:data-sitekey=["\']|["\']sitekey["\']:\s*["\'])([\w\-]+)'
 
 
     def detect_key(self, data=None):
diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py
index bb9aee1d7..51fdcd30b 100644
--- a/module/plugins/crypter/FilecryptCc.py
+++ b/module/plugins/crypter/FilecryptCc.py
@@ -31,7 +31,7 @@ class FilecryptCc(Crypter):
     # URL_REPLACEMENTS  = [(r'.html$', ""), (r'$', ".html")]  #@TODO: Extend SimpleCrypter
 
     DLC_LINK_PATTERN = r'onclick="DownloadDLC\(\'(.+)\'\);">'
-    WEBLINK_PATTERN  = r"openLink.?'([\w_-]*)',"
+    WEBLINK_PATTERN  = r"openLink.?'([\w\-]*)',"
 
     CAPTCHA_PATTERN          = r'class="safety">Sicherheitsabfrage<'
     INTERNAL_CAPTCHA_PATTERN = r'<img id="nc" src="(.+?)"'
diff --git a/module/plugins/crypter/TinyurlCom.py b/module/plugins/crypter/TinyurlCom.py
index bff1efa12..2b9a8041f 100644
--- a/module/plugins/crypter/TinyurlCom.py
+++ b/module/plugins/crypter/TinyurlCom.py
@@ -9,7 +9,7 @@ class TinyurlCom(SimpleCrypter):
     __version__ = "0.03"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.)?(preview\.)?tinyurl\.com/[\w-]+'
+    __pattern__ = r'https?://(?:www\.)?(preview\.)?tinyurl\.com/[\w\-]+'
 
     __description__ = """Tinyurl.com decrypter plugin"""
     __license__     = "GPLv3"
diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py
index ea09c63f9..302f18ac0 100644
--- a/module/plugins/crypter/YoutubeComFolder.py
+++ b/module/plugins/crypter/YoutubeComFolder.py
@@ -14,7 +14,7 @@ class YoutubeComFolder(Crypter):
     __version__ = "1.03"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w-]+)'
+    __pattern__ = r'https?://(?:www\.|m\.)?youtube\.com/(?P<TYPE>user|playlist|view_play_list)(/|.*?[?&](?:list|p)=)(?P<ID>[\w\-]+)'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True ),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True ),
                    ("likes"             , "bool", "Grab user (channel) liked videos"   , False),
diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py
index f92681f60..3301eda7c 100644
--- a/module/plugins/hoster/LinksnappyCom.py
+++ b/module/plugins/hoster/LinksnappyCom.py
@@ -46,7 +46,7 @@ class LinksnappyCom(MultiHoster):
     @staticmethod
     def _get_host(url):
         host = urlparse.urlsplit(url).netloc
-        return re.search(r'[\w-]+\.\w+$', host).group(0)
+        return re.search(r'[\w\-]+\.\w+$', host).group(0)
 
 
 getInfo = create_getInfo(LinksnappyCom)
diff --git a/module/plugins/hoster/OpenloadIo.py b/module/plugins/hoster/OpenloadIo.py
index 6213a9c09..ee67be95b 100644
--- a/module/plugins/hoster/OpenloadIo.py
+++ b/module/plugins/hoster/OpenloadIo.py
@@ -10,10 +10,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class OpenloadIo(SimpleHoster):
     __name__    = "OpenloadIo"
     __type__    = "hoster"
-    __version__ = "0.07"
+    __version__ = "0.08"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.)?openload\.(?:co|io)/f/([\w-_]+)'
+    __pattern__ = r'https?://(?:www\.)?openload\.(?:co|io)/(?:f|embed)/([\w\-]+)'
 
     __description__ = """Openload.co hoster plugin"""
     __license__     = "GPLv3"
@@ -23,12 +23,14 @@ class OpenloadIo(SimpleHoster):
     # The API reference, that this implementation uses is available at https://openload.co/api
     API_URL = 'https://api.openload.co/1'
 
-    _FILE_ID_PATTERN = '/f/([\w-_]+)'
+    _FILE_ID_PATTERN = '/(?:f|embed)/([\w\-]+)'
 
     _DOWNLOAD_TICKET_URI_PATTERN = '/file/dlticket?file={0}'
     _DOWNLOAD_FILE_URI_PATTERN   = '/file/dl?file={0}&ticket={1}'
     _FILE_INFO_URI_PATTERN       = '/file/info?file={0}'
 
+    OFFLINE_PATTERN = r'>We are sorry'
+
 
     @classmethod
     def _load_json(cls, uri):
diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py
index b189ee1ba..a7a45d028 100644
--- a/module/plugins/hoster/SoundcloudCom.py
+++ b/module/plugins/hoster/SoundcloudCom.py
@@ -12,7 +12,7 @@ class SoundcloudCom(SimpleHoster):
     __version__ = "0.12"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+'
+    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w\-]+/[\w\-]+'
     __config__  = [("use_premium", "bool"        , "Use premium account if available", True    ),
                    ("quality"    , "Lower;Higher", "Quality"                         , "Higher")]
 
diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py
index 354ba1b4c..418f38926 100644
--- a/module/plugins/hoster/YadiSk.py
+++ b/module/plugins/hoster/YadiSk.py
@@ -13,7 +13,7 @@ class YadiSk(SimpleHoster):
     __version__ = "0.06"
     __status__  = "testing"
 
-    __pattern__ = r'https?://yadi\.sk/d/[\w-]+'
+    __pattern__ = r'https?://yadi\.sk/d/[\w\-]+'
 
     __description__ = """Yadi.sk hoster plugin"""
     __license__     = "GPLv3"