From 772e47ef806d18fd209e910be0535bce7c07dc7b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 2 Nov 2014 22:47:07 +0100
Subject: Update all other plugins

---
 module/plugins/crypter/BitshareComFolder.py       | 4 ++--
 module/plugins/crypter/DataHuFolder.py            | 4 ++--
 module/plugins/crypter/EasybytezComFolder.py      | 8 ++++----
 module/plugins/crypter/FilecloudIoFolder.py       | 4 ++--
 module/plugins/crypter/FilefactoryComFolder.py    | 4 ++--
 module/plugins/crypter/FilerNetFolder.py          | 4 ++--
 module/plugins/crypter/FilestubeCom.py            | 4 ++--
 module/plugins/crypter/FiletramCom.py             | 4 ++--
 module/plugins/crypter/FreakhareComFolder.py      | 4 ++--
 module/plugins/crypter/ImgurComAlbum.py           | 4 ++--
 module/plugins/crypter/JunocloudMeFolder.py       | 8 ++++----
 module/plugins/crypter/MediafireComFolder.py      | 4 ++--
 module/plugins/crypter/MultiUpOrg.py              | 4 ++--
 module/plugins/crypter/NetfolderIn.py             | 4 ++--
 module/plugins/crypter/NosvideoCom.py             | 4 ++--
 module/plugins/crypter/PastebinCom.py             | 4 ++--
 module/plugins/crypter/RapidfileshareNetFolder.py | 8 ++++----
 module/plugins/crypter/TnyCz.py                   | 4 ++--
 module/plugins/crypter/TurbobitNetFolder.py       | 4 ++--
 module/plugins/crypter/TusfilesNetFolder.py       | 8 ++++----
 module/plugins/crypter/UploadableChFolder.py      | 4 ++--
 module/plugins/crypter/UploadedToFolder.py        | 4 ++--
 22 files changed, 52 insertions(+), 52 deletions(-)

(limited to 'module/plugins/crypter')

diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py
index 90829203a..e77870d26 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -18,4 +18,4 @@ class BitshareComFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'<a href="(http://bitshare\.com/files/.+)">.+</a></td>'
-    TITLE_PATTERN = r'View public folder "(.+)"</h1>'
+    NAME_PATTERN = r'View public folder "(.+)"</h1>'
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index 9b52fbdda..39523c05d 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.04"
+    __version__ = "0.05"
 
     __pattern__ = r'http://(?:www\.)?data\.hu/dir/\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -21,7 +21,7 @@ class DataHuFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'<a href=\'(http://data\.hu/get/.+)\' target=\'_blank\'>\1</a>'
-    TITLE_PATTERN = ur'<title>(.+) Let\xf6lt\xe9se</title>'
+    NAME_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 5f8daf55c..f53c8c8b2 100644
--- a/module/plugins/crypter/EasybytezComFolder.py
+++ b/module/plugins/crypter/EasybytezComFolder.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPCrypter import XFSPCrypter
+from module.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class EasybytezComFolder(XFSPCrypter):
+class EasybytezComFolder(XFSCrypter):
     __name__    = "EasybytezComFolder"
     __type__    = "crypter"
-    __version__ = "0.09"
+    __version__ = "0.10"
 
     __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P<ID>\d+/\d+)'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -17,6 +17,6 @@ class EasybytezComFolder(XFSPCrypter):
     __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
 
-    HOSTER_NAME = "easybytez.com"
+    HOSTER_DOMAIN = "easybytez.com"
 
     LOGIN_ACCOUNT = True
diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py
index c78dcb490..cc5c2a160 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -18,4 +18,4 @@ class FilecloudIoFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'href="(http://filecloud\.io/\w+)" title'
-    TITLE_PATTERN = r'>(.+?) - filecloud\.io<'
+    NAME_PATTERN = r'>(.+?) - filecloud\.io<'
diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index 996e24f05..4975ba506 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.3"
+    __version__ = "0.31"
 
     __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -18,7 +18,7 @@ class FilefactoryComFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'<td><a href="([^"]+)">'
-    TITLE_PATTERN = r'<h1>Files in <span>(.+)</span></h1>'
+    NAME_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 2def580a4..37c958e87 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.4"
+    __version__ = "0.41"
 
     __pattern__ = r'https?://filer\.net/folder/\w{16}'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -19,7 +19,7 @@ class FilerNetFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'href="(/get/\w{16})">(?!<)'
-    TITLE_PATTERN = r'<h3>(.+?) - <small'
+    NAME_PATTERN = r'<h3>(.+?) - <small'
 
 
     def getLinks(self):
diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py
index ccbacef8b..ecd6b9fc7 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.04"
+    __version__ = "0.05"
 
     __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -18,4 +18,4 @@ class FilestubeCom(SimpleCrypter):
 
 
     LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)'
-    TITLE_PATTERN = r'<h1\s*> (.+)  download\s*</h1>'
+    NAME_PATTERN = r'<h1\s*> (.+)  download\s*</h1>'
diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py
index f48d56201..50233e903 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?filetram\.com/[^/]+/.+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -19,4 +19,4 @@ class FiletramCom(SimpleCrypter):
 
 
     LINK_PATTERN = r'\s+(http://.+)'
-    TITLE_PATTERN = r'<title>(.+?) - Free Download'
+    NAME_PATTERN = r'<title>(.+?) - Free Download'
diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py
index d7a1387d5..4d9ffca1d 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -20,7 +20,7 @@ class FreakhareComFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'<a href="(http://freakshare\.com/files/[^"]+)" target="_blank">'
-    TITLE_PATTERN = r'Folder:</b> (.+)'
+    NAME_PATTERN = r'Folder:</b> (.+)'
     PAGES_PATTERN = r'Pages: +(\d+)'
 
 
diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py
index cfe887baf..5402ed43f 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.5"
+    __version__ = "0.51"
 
     __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -18,7 +18,7 @@ class ImgurComAlbum(SimpleCrypter):
     __authors__     = [("nath_schwarz", "nathan.notwhite@gmail.com")]
 
 
-    TITLE_PATTERN = r'(.+?) - Imgur'
+    NAME_PATTERN = r'(.+?) - Imgur'
     LINK_PATTERN = r'i\.imgur\.com/\w{7}s?\.(?:jpeg|jpg|png|gif|apng)'
 
 
diff --git a/module/plugins/crypter/JunocloudMeFolder.py b/module/plugins/crypter/JunocloudMeFolder.py
index 1e08fc352..509f1f7ec 100644
--- a/module/plugins/crypter/JunocloudMeFolder.py
+++ b/module/plugins/crypter/JunocloudMeFolder.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPCrypter import XFSPCrypter
+from module.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class JunocloudMeFolder(XFSPCrypter):
+class JunocloudMeFolder(XFSCrypter):
     __name__    = "JunocloudMeFolder"
     __type__    = "crypter"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?junocloud\.me/folders/(?P<ID>\d+/\w+)'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -17,4 +17,4 @@ class JunocloudMeFolder(XFSPCrypter):
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_NAME = "junocloud.me"
+    HOSTER_DOMAIN = "junocloud.me"
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py
index f4858e214..c83de4715 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireComFolder.py
@@ -21,7 +21,7 @@ class MediafireComFolder(Crypter):
 
 
     FOLDER_KEY_PATTERN = r'var afI= \'(\w+)'
-    FILE_URL_PATTERN = r'<meta property="og:url" content="http://www\.mediafire\.com/\?(\w+)"/>'
+    LINK_PATTERN = r'<meta property="og:url" content="http://www\.mediafire\.com/\?(\w+)"/>'
 
 
     def decrypt(self, pyfile):
@@ -31,7 +31,7 @@ class MediafireComFolder(Crypter):
         if result == 0:
             # load and parse html
             html = self.load(pyfile.url)
-            m = re.search(self.FILE_URL_PATTERN, html)
+            m = re.search(self.LINK_PATTERN, html)
             if m:
                 # file page
                 self.urls.append("http://www.mediafire.com/file/%s" % m.group(1))
diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py
index 25575a7f8..717b209ec 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -20,7 +20,7 @@ class MultiUpOrg(SimpleCrypter):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    TITLE_PATTERN = r'<title>.*(?:Project|Projet|ownload|élécharger) (.+?) (?:\(|- )'
+    NAME_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 4309d30a1..d94b88af1 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.7"
+    __version__ = "0.71"
 
     __pattern__ = r'http://(?:www\.)?netfolder\.in/((?P<id1>\w+)/\w+|folder\.php\?folder_id=(?P<id2>\w+))'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -20,7 +20,7 @@ class NetfolderIn(SimpleCrypter):
                        ("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
-    TITLE_PATTERN = r'<div class="Text">Inhalt des Ordners <span.*>(.+)</span></div>'
+    NAME_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 e3335adc7..bc908279f 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -18,4 +18,4 @@ class NosvideoCom(SimpleCrypter):
 
 
     LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload\.com/\?d=\w+)"'
-    TITLE_PATTERN = r'<[tT]itle>Watch (.+?)<'
+    NAME_PATTERN = r'<[tT]itle>Watch (.+?)<'
diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py
index 185de1e47..e0dfa4fd8 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -18,4 +18,4 @@ class PastebinCom(SimpleCrypter):
 
 
     LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>'
-    TITLE_PATTERN = r'<div class="paste_box_line1" title="([^"]+)">'
+    NAME_PATTERN = r'<div class="paste_box_line1" title="([^"]+)">'
diff --git a/module/plugins/crypter/RapidfileshareNetFolder.py b/module/plugins/crypter/RapidfileshareNetFolder.py
index 43a3e34dd..5531d5a90 100644
--- a/module/plugins/crypter/RapidfileshareNetFolder.py
+++ b/module/plugins/crypter/RapidfileshareNetFolder.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.internal.XFSPCrypter import XFSPCrypter
+from module.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class RapidfileshareNetFolder(XFSPCrypter):
+class RapidfileshareNetFolder(XFSCrypter):
     __name__    = "RapidfileshareNetFolder"
     __type__    = "crypter"
-    __version__ = "0.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?rapidfileshare\.net/users/\w+/\d+/\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -17,4 +17,4 @@ class RapidfileshareNetFolder(XFSPCrypter):
     __authors__     = [("guidobelix", "guidobelix@hotmail.it")]
 
 
-    HOSTER_NAME = "rapidfileshare.net"
+    HOSTER_DOMAIN = "rapidfileshare.net"
diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py
index 742b2f7ed..4e29d1032 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?tny\.cz/\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -19,7 +19,7 @@ class TnyCz(SimpleCrypter):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    TITLE_PATTERN = r'<title>(.+) - .+</title>'
+    NAME_PATTERN = r'<title>(.+) - .+</title>'
 
 
     def getLinks(self):
diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py
index a737faf11..79fd7d7e0 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.04"
+    __version__ = "0.05"
 
     __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -21,7 +21,7 @@ class TurbobitNetFolder(SimpleCrypter):
                        ("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    TITLE_PATTERN = r'src=\'/js/lib/grid/icon/folder.png\'> <span>(.+?)</span>'
+    NAME_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 73b8b6a2b..7c1375f93 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -4,13 +4,13 @@ import math
 import re
 from urlparse import urljoin
 
-from module.plugins.internal.XFSPCrypter import XFSPCrypter
+from module.plugins.internal.XFSCrypter import XFSCrypter
 
 
-class TusfilesNetFolder(XFSPCrypter):
+class TusfilesNetFolder(XFSCrypter):
     __name__    = "TusfilesNetFolder"
     __type__    = "crypter"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -22,7 +22,7 @@ class TusfilesNetFolder(XFSPCrypter):
                        ("stickell", "l.stickell@yahoo.it")]
 
 
-    HOSTER_NAME = "tusfiles.net"
+    HOSTER_DOMAIN = "tusfiles.net"
 
     PAGES_PATTERN = r'>\((\d+) \w+\)<'
 
diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py
index 1a2178de4..9653d8891 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -19,6 +19,6 @@ class UploadableChFolder(SimpleCrypter):
 
 
     LINK_PATTERN = r'"(.+?)" class="icon_zipfile">'
-    TITLE_PATTERN = r'<div class="folder"><span>&nbsp;</span>(.+?)</div>'
+    NAME_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 98922d4e2..23e803979 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.4"
+    __version__ = "0.41"
 
     __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)'
     __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
@@ -20,7 +20,7 @@ class UploadedToFolder(SimpleCrypter):
 
 
     PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick='
-    TITLE_PATTERN = r'<title>(.+?)<'
+    NAME_PATTERN = r'<title>(.+?)<'
 
 
     def decrypt(self, pyfile):
-- 
cgit v1.2.3