From cf6531b2c87fea99fd03884636bac4c80d1b475d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 4 Oct 2015 20:09:55 +0200
Subject: Fixpack (3)

---
 module/plugins/crypter/Dereferer.py             | 2 +-
 module/plugins/crypter/FilecryptCc.py           | 2 +-
 module/plugins/crypter/ILoadTo.py               | 2 +-
 module/plugins/crypter/SafelinkingNet.py        | 2 +-
 module/plugins/crypter/SecuredIn.py             | 2 +-
 module/plugins/crypter/ShareLinksBiz.py         | 2 +-
 module/plugins/crypter/TinyurlCom.py            | 2 +-
 module/plugins/crypter/XFileSharingProFolder.py | 2 +-
 module/plugins/crypter/YoutubeComFolder.py      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'module/plugins/crypter')

diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index 0a1c1a918..8ecc635ec 100644
--- a/module/plugins/crypter/Dereferer.py
+++ b/module/plugins/crypter/Dereferer.py
@@ -11,7 +11,7 @@ class Dereferer(SimpleCrypter):
     __version__ = "0.19"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w-]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>(?:ht|f)tps?://.+)'
+    __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/.*?(?P<LINK>(?:ht|f)tps?://.+)'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
diff --git a/module/plugins/crypter/FilecryptCc.py b/module/plugins/crypter/FilecryptCc.py
index 70f9bc088..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/ILoadTo.py b/module/plugins/crypter/ILoadTo.py
index 03826cc5a..7d73b898f 100644
--- a/module/plugins/crypter/ILoadTo.py
+++ b/module/plugins/crypter/ILoadTo.py
@@ -9,7 +9,7 @@ class ILoadTo(DeadCrypter):
     __version__ = "0.12"
     __status__  = "testing"
 
-    __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+-[\w.-]+/'
+    __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+\-[\w\-.]+/'
     __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Iload.to decrypter plugin"""
diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py
index 29e1cce4f..c5fac837a 100644
--- a/module/plugins/crypter/SafelinkingNet.py
+++ b/module/plugins/crypter/SafelinkingNet.py
@@ -24,7 +24,7 @@ class SafelinkingNet(Crypter):
     __authors__     = [("quareevo", "quareevo@arcor.de")]
 
 
-    SOLVEMEDIA_PATTERN = "solvemediaApiKey = '([\w.-]+)';"
+    SOLVEMEDIA_PATTERN = "solvemediaApiKey = '([\w\-.]+)';"
 
 
     def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py
index 95416585a..4731e41f4 100644
--- a/module/plugins/crypter/SecuredIn.py
+++ b/module/plugins/crypter/SecuredIn.py
@@ -9,7 +9,7 @@ class SecuredIn(DeadCrypter):
     __version__ = "0.22"
     __status__  = "testing"
 
-    __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+-\w{8}\.html'
+    __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+\-\w{8}\.html'
     __config__  = []  #@TODO: Remove in 0.4.10
 
     __description__ = """Secured.in decrypter plugin"""
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index e372d7c6a..c189229ce 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -124,7 +124,7 @@ class ShareLinksBiz(Crypter):
 
         #: Request user for captcha coords
         m = re.search(r'<img src="/captcha.gif\?d=(.+?)&PHPSESSID=(.+?)&legend=1"', self.html)
-        if not m:
+        if m is None:
             self.log_debug("Captcha url data not found, maybe plugin out of date?")
             self.fail(_("Captcha url data not found"))
 
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/XFileSharingProFolder.py b/module/plugins/crypter/XFileSharingProFolder.py
index ca5c3ba96..615e9f224 100644
--- a/module/plugins/crypter/XFileSharingProFolder.py
+++ b/module/plugins/crypter/XFileSharingProFolder.py
@@ -11,7 +11,7 @@ class XFileSharingProFolder(XFSCrypter):
     __version__ = "0.14"
     __status__  = "testing"
 
-    __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+'
+    __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:user|folder)s?/\w+'
     __config__  = [("use_subfolder"     , "bool", "Save package to subfolder"          , True),
                    ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
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),
-- 
cgit v1.2.3