Merge pull request #1 from pyload/stable

Merge

1 files changed, 13 insertions, 27 deletions

diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py
index 6e5ffac30..317a49caf 100644
--- a/module/plugins/hoster/HundredEightyUploadCom.py
+++ b/module/plugins/hoster/HundredEightyUploadCom.py
@@ -1,38 +1,24 @@
 # -*- 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/>.    #
-############################################################################
-
-# Test links (random.bin):
+#
+# Test links:
 # http://180upload.com/js9qdm6kjnrs
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 
 
-class HundredEightyUploadCom(XFileSharingPro):
-    __name__ = "HundredEightyUploadCom"
-    __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?180upload\.com/(\w+).*'
-    __version__ = "0.01"
+class HundredEightyUploadCom(XFSHoster):
+    __name__    = "HundredEightyUploadCom"
+    __type__    = "hoster"
+    __version__ = "0.04"
+
+    __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}'
+
     __description__ = """180upload.com hoster plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __license__     = "GPLv3"
+    __authors__     = [("stickell", "l.stickell@yahoo.it")]
 
-    HOSTER_NAME = "180upload.com"
 
-    FILE_NAME_PATTERN = r'Filename:</b></td><td nowrap>(?P<N>.+)</td></tr>-->'
-    FILE_SIZE_PATTERN = r'Size:</b></td><td>(?P<S>[\d.]+) (?P<U>[A-Z]+)\s*<small>'
+    HOSTER_DOMAIN = "180upload.com"
 
 
 getInfo = create_getInfo(HundredEightyUploadCom)