Merge pull request #1 from pyload/stable

Merge

1 files changed, 12 insertions, 32 deletions

diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index 0ea9b186f..cd54bdc70 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -1,46 +1,26 @@
 # -*- coding: utf-8 -*-
 
-"""
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License,
-    or (at your option) any later version.
+from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-    See the GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, see <http://www.gnu.org/licenses/>.
+class EasybytezCom(XFSHoster):
+    __name__    = "EasybytezCom"
+    __type__    = "hoster"
+    __version__ = "0.23"
 
-    @author: zoidberg
-"""
+    __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}'
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
-
-
-class EasybytezCom(XFileSharingPro):
-    __name__ = "EasybytezCom"
-    __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?easybytez.com/(\w+).*'
-    __version__ = "0.17"
     __description__ = """Easybytez.com hoster plugin"""
-    __author_name__ = ("zoidberg", "stickell")
-    __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz"),
+                       ("stickell", "l.stickell@yahoo.it")]
 
-    HOSTER_NAME = "easybytez.com"
 
-    FILE_INFO_PATTERN = r'<span class="name">(?P<N>.+)</span><br>\s*<span class="size">(?P<S>[^<]+)</span>'
-    FILE_OFFLINE_PATTERN = r'<h1>File not available</h1>'
+    HOSTER_DOMAIN = "easybytez.com"
 
-    DIRECT_LINK_PATTERN = r'(http://(\w+\.(easyload|easybytez|zingload)\.(com|to)|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/[^"<]+)'
-    OVR_DOWNLOAD_LINK_PATTERN = r'<h2>Download Link</h2>\s*<textarea[^>]*>([^<]+)'
-    OVR_KILL_LINK_PATTERN = r'<h2>Delete Link</h2>\s*<textarea[^>]*>([^<]+)'
-    ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<Center><b>)(.*?)</'
+    OFFLINE_PATTERN = r'>File not available'
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = self.premium
+    LINK_PATTERN = r'(http://(\w+\.(easybytez|easyload|ezbytez|zingload)\.(com|to)|\d+\.\d+\.\d+\.\d+)/files/\d+/\w+/.+?)["\'<]'
 
 
 getInfo = create_getInfo(EasybytezCom)