From 1c7d9e55ffbfc9204c9e9246d9cc64806fa38326 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Sun, 4 Oct 2015 04:29:58 +0200
Subject: Fixpack (2)

---
 module/plugins/crypter/Dereferer.py             | 2 +-
 module/plugins/crypter/FilecryptCc.py           | 2 +-
 module/plugins/crypter/TinyurlCom.py            | 2 +-
 module/plugins/crypter/XFileSharingProFolder.py | 4 ++--
 module/plugins/crypter/YoutubeComFolder.py      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins/crypter')

diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index 8ecc635ec..0a1c1a918 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 51fdcd30b..70f9bc088 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 2b9a8041f..bff1efa12 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 f693698bc..ca5c3ba96 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)]
 
@@ -33,7 +33,7 @@ class XFileSharingProFolder(XFSCrypter):
         self.__pattern__ = self.pyload.pluginManager.crypterPlugins[self.__name__]['pattern']
 
         self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
-        self.PLUGIN_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+|\-)', self.PLUGIN_DOMAIN) if part != '.')
+        self.PLUGIN_NAME   = "".join(part.capitalize() for part in re.split(r'(\.|\d+|-)', self.PLUGIN_DOMAIN) if part != '.')
 
 
     def _setup(self):
diff --git a/module/plugins/crypter/YoutubeComFolder.py b/module/plugins/crypter/YoutubeComFolder.py
index 302f18ac0..ea09c63f9 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