Merge pull request #1 from pyload/stable

Merge

1 files changed, 16 insertions, 33 deletions

diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py
index 9fda2353c..2b6fd34db 100644
--- a/module/plugins/hoster/FileomCom.py
+++ b/module/plugins/hoster/FileomCom.py
@@ -1,52 +1,35 @@
 # -*- coding: utf-8 -*-
-###############################################################################
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU Affero General Public License as
-#  published by the Free Software Foundation, either version 3 of the
-#  License, or (at your option) any later version.
 #
-#  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 Affero General Public License for more details.
-#
-#  You should have received a copy of the GNU Affero General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#  @author: Walter Purcaro
-###############################################################################
-
-# Test links (random.bin):
+# Test links:
 # http://fileom.com/gycaytyzdw3g/random.bin.html
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
+
 
+class FileomCom(XFSHoster):
+    __name__    = "FileomCom"
+    __type__    = "hoster"
+    __version__ = "0.05"
+
+    __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}'
 
-class FileomCom(XFileSharingPro):
-    __name__ = "FileomCom"
-    __type__ = "hoster"
-    __pattern__ = r'https?://(?:www\.)?fileom\.com/\w+'
-    __version__ = "0.01"
     __description__ = """Fileom.com hoster plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
-    HOSTER_NAME = "fileom.com"
 
-    FILE_URL_REPLACEMENTS = [(r'/$', "")]
-    SH_COOKIES = [(".fileom.com", "lang", "english")]
+    HOSTER_DOMAIN = "fileom.com"
 
-    FILE_NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<'
-    FILE_SIZE_PATTERN = r'File Size: <span class="size">(?P<S>[\d\.]+) (?P<U>\w+)'
+    NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<'
+    SIZE_PATTERN = r'File Size: <span class="size">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
-    ERROR_PATTERN = r'class=["\']err["\'][^>]*>(.*?)(?:\'|</)'
+    LINK_PATTERN = r'var url2 = \'(.+?)\';'
 
-    DIRECT_LINK_PATTERN = r"var url2 = '(.+?)';"
 
     def setup(self):
-        self.resumeDownload = self.premium
         self.multiDL = True
         self.chunkLimit = 1
+        self.resumeDownload = self.premium
 
 
 getInfo = create_getInfo(FileomCom)