Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 18 insertions, 0 deletions

diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py
new file mode 100644
index 000000000..517df8561
--- /dev/null
+++ b/module/plugins/hoster/TusfilesNet.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+
+class TusfilesNet(XFileSharingPro):
+    __name__ = "TusfilesNet"
+    __type__ = "hoster"
+    __pattern__ = r"http://(www\.)?tusfiles\.net/\w{12}"
+    __version__ = "0.01"
+    __description__ = """Tusfiles.net hoster plugin"""
+    __author_name__ = ("stickell")
+    __author_mail__ = ("l.stickell@yahoo.it")
+
+    FILE_INFO_PATTERN = r'<li>(?P<N>[^<]+)</li>\s+<li><b>Size:</b> <small>(?P<S>[\d.]+) (?P<U>\w+)</small></li>'
+    FILE_OFFLINE_PATTERN = r'The file you were looking for could not be found'
+
+    HOSTER_NAME = "tusfiles.net"
+
+getInfo = create_getInfo(TusfilesNet)