Update SimpleCrypter based plugins

20 files changed, 43 insertions, 43 deletions

diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py
index 219dabce8..f6a74bcad 100644
--- a/module/plugins/crypter/BitshareComFolder.py
+++ b/module/plugins/crypter/BitshareComFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class BitshareComFolder(SimpleCrypter):
     __name__ = "BitshareComFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
 
@@ -15,4 +15,4 @@ class BitshareComFolder(SimpleCrypter):
     __author_mail__ = "l.stickell@yahoo.it"
 
     LINK_PATTERN = r'<a href="(http://bitshare.com/files/.+)">.+</a></td>'
-    TITLE_PATTERN = r'View public folder "(?P<title>.+)"</h1>'
+    TITLE_PATTERN = r'View public folder "(.+)"</h1>'
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index a500ac796..31e71944f 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHuFolder.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class DataHuFolder(SimpleCrypter):
     __name__ = "DataHuFolder"
     __type__ = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'http://(?:www\.)?data.hu/dir/\w+'
 
@@ -17,7 +17,7 @@ class DataHuFolder(SimpleCrypter):
     __author_mail__ = "l.stickell@yahoo.it"
 
     LINK_PATTERN = r"<a href='(http://data\.hu/get/.+)' target='_blank'>\1</a>"
-    TITLE_PATTERN = ur'<title>(?P<title>.+) Let\xf6lt\xe9se</title>'
+    TITLE_PATTERN = ur'<title>(.+) Let\xf6lt\xe9se</title>'
 
 
     def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py
index be85a3798..2a261e709 100644
--- a/module/plugins/crypter/EasybytezComFolder.py
+++ b/module/plugins/crypter/EasybytezComFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class EasybytezComFolder(SimpleCrypter):
     __name__ = "EasybytezComFolder"
     __type__ = "crypter"
-    __version__ = "0.07"
+    __version__ = "0.08"
 
     __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P<ID>\d+/\d+)'
 
@@ -18,6 +18,6 @@ class EasybytezComFolder(SimpleCrypter):
     URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g<ID>?per_page=10000")]
 
     LINK_PATTERN = r'<td><a href="(http://www\.easybytez\.com/\w+)" target="_blank">.+(?:</a>)?</td>'
-    TITLE_PATTERN = r'<Title>Files of \d+: (?P<title>.+) folder</Title>'
+    TITLE_PATTERN = r'<Title>Files of \d+: (.+) folder</Title>'
 
     LOGIN_ACCOUNT = True
diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py
index 9ec950061..eb6aaa847 100644
--- a/module/plugins/crypter/FilecloudIoFolder.py
+++ b/module/plugins/crypter/FilecloudIoFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FilecloudIoFolder(SimpleCrypter):
     __name__ = "FilecloudIoFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
 
@@ -15,4 +15,4 @@ class FilecloudIoFolder(SimpleCrypter):
     __author_mail__ = "vuolter@gmail.com"
 
     LINK_PATTERN = r'href="(http://filecloud.io/\w+)" title'
-    TITLE_PATTERN = r'>(?P<title>.+?) - filecloud.io<'
+    TITLE_PATTERN = r'>(.+?) - filecloud.io<'
diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index b565b4d0b..08978c032 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryComFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FilefactoryComFolder(SimpleCrypter):
     __name__ = "FilefactoryComFolder"
     __type__ = "crypter"
-    __version__ = "0.2"
+    __version__ = "0.3"
 
     __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
 
@@ -15,8 +15,8 @@ class FilefactoryComFolder(SimpleCrypter):
     __author_mail__ = "l.stickell@yahoo.it"
 
     LINK_PATTERN = r'<td><a href="([^"]+)">'
-    TITLE_PATTERN = r'<h1>Files in <span>(?P<title>.+)</span></h1>'
-    PAGES_PATTERN = r'data-paginator-totalPages="(?P<pages>\d+)"'
+    TITLE_PATTERN = r'<h1>Files in <span>(.+)</span></h1>'
+    PAGES_PATTERN = r'data-paginator-totalPages="(\d+)"'
 
     COOKIES = [('.filefactory.com', 'locale', 'en_US.utf8')]
 
diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py
index 9951661b5..0195b8af9 100644
--- a/module/plugins/crypter/FilerNetFolder.py
+++ b/module/plugins/crypter/FilerNetFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FilerNetFolder(SimpleCrypter):
     __name__ = "FilerNetFolder"
     __type__ = "crypter"
-    __version__ = "0.3"
+    __version__ = "0.4"
 
     __pattern__ = r'https?://filer\.net/folder/\w{16}'
 
@@ -15,7 +15,7 @@ class FilerNetFolder(SimpleCrypter):
     __author_mail_ = ("nathan.notwhite@gmail.com", "l.stickell@yahoo.it")
 
     LINK_PATTERN = r'href="(/get/\w{16})">(?!<)'
-    TITLE_PATTERN = r'<h3>(?P<title>.+) - <small'
+    TITLE_PATTERN = r'<h3>(.+?) - <small'
 
 
     def getLinks(self):
diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py
index f0aaaa579..3caee9e62 100644
--- a/module/plugins/crypter/FilestubeCom.py
+++ b/module/plugins/crypter/FilestubeCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FilestubeCom(SimpleCrypter):
     __name__ = "FilestubeCom"
     __type__ = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+'
 
@@ -15,4 +15,4 @@ class FilestubeCom(SimpleCrypter):
     __author_mail__ = "l.stickell@yahoo.it"
 
     LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)'
-    TITLE_PATTERN = r'<h1\s*> (?P<title>.+)  download\s*</h1>'
+    TITLE_PATTERN = r'<h1\s*> (.+)  download\s*</h1>'
diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py
index 7052955cf..6125914ff 100644
--- a/module/plugins/crypter/FiletramCom.py
+++ b/module/plugins/crypter/FiletramCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FiletramCom(SimpleCrypter):
     __name__ = "FiletramCom"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?filetram.com/[^/]+/.+'
 
@@ -15,4 +15,4 @@ class FiletramCom(SimpleCrypter):
     __author_mail__ = ("igelkun@myopera.com", "l.stickell@yahoo.it")
 
     LINK_PATTERN = r'\s+(http://.+)'
-    TITLE_PATTERN = r'<title>(?P<title>[^<]+) - Free Download[^<]*</title>'
+    TITLE_PATTERN = r'<title>(.+?) - Free Download'
diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py
index a94d0847f..4831101cc 100644
--- a/module/plugins/crypter/FiredriveComFolder.py
+++ b/module/plugins/crypter/FiredriveComFolder.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FiredriveComFolder(SimpleCrypter):
     __name__ = "FiredriveComFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
 
@@ -17,7 +17,7 @@ class FiredriveComFolder(SimpleCrypter):
     __author_mail__ = "vuolter@gmail.com"
 
     LINK_PATTERN = r'<div class="pf_item pf_(file|folder).+?public=\'(.+?)\''
-    TITLE_PATTERN = r'>Shared Folder "(?P<title>.+)" | Firedrive<'
+    TITLE_PATTERN = r'>Shared Folder "(.+)" | Firedrive<'
     OFFLINE_PATTERN = r'class="sad_face_image"|>No such page here.<'
     TEMP_OFFLINE_PATTERN = r'>(File Temporarily Unavailable|Server Error. Try again later)'
 
diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py
index 2a6877891..5036a8842 100644
--- a/module/plugins/crypter/FreakhareComFolder.py
+++ b/module/plugins/crypter/FreakhareComFolder.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class FreakhareComFolder(SimpleCrypter):
     __name__ = "FreakhareComFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+'
 
@@ -17,8 +17,8 @@ class FreakhareComFolder(SimpleCrypter):
     __author_mail__ = "l.stickell@yahoo.it"
 
     LINK_PATTERN = r'<a href="(http://freakshare.com/files/[^"]+)" target="_blank">'
-    TITLE_PATTERN = r'Folder:</b> (?P<title>.+)'
-    PAGES_PATTERN = r'Pages: +(?P<pages>\d+)'
+    TITLE_PATTERN = r'Folder:</b> (.+)'
+    PAGES_PATTERN = r'Pages: +(\d+)'
 
 
     def loadPage(self, page_n):
diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py
index eb1f4441a..72674a8fb 100644
--- a/module/plugins/crypter/ImgurComAlbum.py
+++ b/module/plugins/crypter/ImgurComAlbum.py
@@ -7,7 +7,7 @@ from module.utils import uniqify
 class ImgurComAlbum(SimpleCrypter):
     __name__ = "ImgurComAlbum"
     __type__ = "crypter"
-    __version__ = "0.4"
+    __version__ = "0.5"
 
     __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}'
 
@@ -15,7 +15,7 @@ class ImgurComAlbum(SimpleCrypter):
     __author_name_ = "nath_schwarz"
     __author_mail_ = "nathan.notwhite@gmail.com"
 
-    TITLE_PATTERN = r'(?P<title>.+) - Imgur'
+    TITLE_PATTERN = r'(.+?) - Imgur'
     LINK_PATTERN = r'i\.imgur\.com/\w{7}s?\.(?:jpeg|jpg|png|gif|apng)'
 
 
diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py
index ffeaa6f04..cd0ec33ad 100644
--- a/module/plugins/crypter/MultiUpOrg.py
+++ b/module/plugins/crypter/MultiUpOrg.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class MultiUpOrg(SimpleCrypter):
     __name__ = "MultiUpOrg"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
 
@@ -17,7 +17,7 @@ class MultiUpOrg(SimpleCrypter):
     __author_name__ = "Walter Purcaro"
     __author_mail__ = "vuolter@gmail.com"
 
-    TITLE_PATTERN = r'<title>.*(Project|Projet|ownload|élécharger) (?P<title>.+?) (\(|- )'
+    TITLE_PATTERN = r'<title>.*(?:Project|Projet|ownload|élécharger) (.+?) (?:\(|- )'
 
 
     def getLinks(self):
diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py
index 1c337391c..7baffb25e 100644
--- a/module/plugins/crypter/NetfolderIn.py
+++ b/module/plugins/crypter/NetfolderIn.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class NetfolderIn(SimpleCrypter):
     __name__ = "NetfolderIn"
     __type__ = "crypter"
-    __version__ = "0.6"
+    __version__ = "0.7"
 
     __pattern__ = r'http://(?:www\.)?netfolder.in/((?P<id1>\w+)/\w+|folder.php\?folder_id=(?P<id2>\w+))'
 
@@ -16,7 +16,7 @@ class NetfolderIn(SimpleCrypter):
     __author_name__ = ("RaNaN", "fragonib")
     __author_mail__ = ("RaNaN@pyload.org", "fragonib[AT]yahoo[DOT]es")
 
-    TITLE_PATTERN = r'<div class="Text">Inhalt des Ordners <span(.*)>(?P<title>.+)</span></div>'
+    TITLE_PATTERN = r'<div class="Text">Inhalt des Ordners <span.*>(.+)</span></div>'
 
 
     def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py
index a3bb11b16..ce8e2b372 100644
--- a/module/plugins/crypter/NosvideoCom.py
+++ b/module/plugins/crypter/NosvideoCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class NosvideoCom(SimpleCrypter):
     __name__ = "NosvideoCom"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+'
 
@@ -15,4 +15,4 @@ class NosvideoCom(SimpleCrypter):
     __author_mail__ = "igelkun@myopera.com"
 
     LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload.com/\?d=\w+)"'
-    TITLE_PATTERN = r'<[tT]itle>Watch (?P<title>.+)</[tT]itle>'
+    TITLE_PATTERN = r'<[tT]itle>Watch (.+?)<'
diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py
index 55aa2ee4a..9c114a56b 100644
--- a/module/plugins/crypter/PastebinCom.py
+++ b/module/plugins/crypter/PastebinCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class PastebinCom(SimpleCrypter):
     __name__ = "PastebinCom"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+'
 
@@ -15,4 +15,4 @@ class PastebinCom(SimpleCrypter):
     __author_mail__ = "l.stickell@yahoo.it"
 
     LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>'
-    TITLE_PATTERN = r'<div class="paste_box_line1" title="(?P<title>[^"]+)">'
+    TITLE_PATTERN = r'<div class="paste_box_line1" title="([^"]+)">'
diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py
index 3ae2c5ed2..e0b92ae22 100644
--- a/module/plugins/crypter/TnyCz.py
+++ b/module/plugins/crypter/TnyCz.py
@@ -8,7 +8,7 @@ import re
 class TnyCz(SimpleCrypter):
     __name__ = "TnyCz"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?tny\.cz/\w+'
 
@@ -16,7 +16,7 @@ class TnyCz(SimpleCrypter):
     __author_name__ = "Walter Purcaro"
     __author_mail__ = "vuolter@gmail.com"
 
-    TITLE_PATTERN = r'<title>(?P<title>.+) - .+</title>'
+    TITLE_PATTERN = r'<title>(.+) - .+</title>'
 
 
     def getLinks(self):
diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py
index 0810e0ed1..ec0fd157d 100644
--- a/module/plugins/crypter/TurbobitNetFolder.py
+++ b/module/plugins/crypter/TurbobitNetFolder.py
@@ -9,7 +9,7 @@ from module.common.json_layer import json_loads
 class TurbobitNetFolder(SimpleCrypter):
     __name__ = "TurbobitNetFolder"
     __type__ = "crypter"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
 
@@ -17,7 +17,7 @@ class TurbobitNetFolder(SimpleCrypter):
     __author_name__ = ("stickell", "Walter Purcaro")
     __author_mail__ = ("l.stickell@yahoo.it", "vuolter@gmail.com")
 
-    TITLE_PATTERN = r"src='/js/lib/grid/icon/folder.png'> <span>(?P<title>.+?)</span>"
+    TITLE_PATTERN = r"src='/js/lib/grid/icon/folder.png'> <span>(.+?)</span>"
 
 
     def _getLinks(self, id, page=1):
diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index f51c2b715..7ce636d2d 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class TusfilesNetFolder(SimpleCrypter):
     __name__ = "TusfilesNetFolder"
     __type__ = "crypter"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)/?'
 
@@ -19,8 +19,8 @@ class TusfilesNetFolder(SimpleCrypter):
     __author_mail__ = ("vuolter@gmail.com", "l.stickell@yahoo.it")
 
     LINK_PATTERN = r'<TD align=left><a href="(.*?)">'
-    TITLE_PATTERN = r'<Title>.*?\: (?P<title>.+) folder</Title>'
-    PAGES_PATTERN = r'>\((?P<pages>\d+) \w+\)<'
+    TITLE_PATTERN = r'<Title>.*?\: (.+) folder</Title>'
+    PAGES_PATTERN = r'>\((\d+) \w+\)<'
 
     URL_REPLACEMENTS = [(__pattern__, r'https://www.tusfiles.net/go/\g<ID>/')]
 
diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py
index b76076531..867a699c2 100644
--- a/module/plugins/crypter/UploadableChFolder.py
+++ b/module/plugins/crypter/UploadableChFolder.py
@@ -6,7 +6,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class UploadableChFolder(SimpleCrypter):
     __name__ = "UploadableChFolder"
     __type__ = "crypter"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+'
 
@@ -16,6 +16,6 @@ class UploadableChFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'"(.+?)" class="icon_zipfile">'
-    TITLE_PATTERN = r'<div class="folder"><span>&nbsp;</span>(?P<title>.+?)</div>'
+    TITLE_PATTERN = r'<div class="folder"><span>&nbsp;</span>(.+?)</div>'
     OFFLINE_PATTERN = r'We are sorry... The URL you entered cannot be found on the server.'
     TEMP_OFFLINE_PATTERN = r'<div class="icon_err">'
diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py
index 20eb553a9..d33dc91a0 100644
--- a/module/plugins/crypter/UploadedToFolder.py
+++ b/module/plugins/crypter/UploadedToFolder.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleCrypter import SimpleCrypter
 class UploadedToFolder(SimpleCrypter):
     __name__ = "UploadedToFolder"
     __type__ = "crypter"
-    __version__ = "0.3"
+    __version__ = "0.4"
 
     __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)'
 
@@ -17,7 +17,7 @@ class UploadedToFolder(SimpleCrypter):
     __author_mail__ = "l.stickell@yahoo.it"
 
     PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick='
-    TITLE_PATTERN = r'<title>(?P<title>[^<]+)</title>'
+    TITLE_PATTERN = r'<title>(.+?)<'
 
 
     def decrypt(self, pyfile):