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, 20 insertions, 0 deletions

diff --git a/module/plugins/hoster/IFileWs.py b/module/plugins/hoster/IFileWs.py
new file mode 100644
index 000000000..160fe641c
--- /dev/null
+++ b/module/plugins/hoster/IFileWs.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+
+
+class IFileWs(XFileSharingPro):
+    __name__ = "IFileWs"
+    __type__ = "hoster"
+    __pattern__ = r"http://(www\.)?ifile\.ws/\w+(/.+)?"
+    __version__ = "0.01"
+    __description__ = """Ifile.ws hoster plugin"""
+    __author_name__ = ("z00nx")
+    __author_mail__ = ("z00nx0@gmail.com")
+
+    FILE_INFO_PATTERN = '<h1\s+style="display:inline;">(?P<N>[^<]+)</h1>\s+\[(?P<S>[^]]+)\]'
+    FILE_OFFLINE_PATTERN = 'File Not Found|The file was removed by administrator'
+    HOSTER_NAME = "ifile.ws"
+    LONG_WAIT_PATTERN = "(?P<M>\d(?=\s+minutes)).*(?P<S>\d+(?=\s+seconds))"
+
+
+getInfo = create_getInfo(IFileWs)