From c46ffb8338ebb2d8272e965b2fcee6b21523c425 Mon Sep 17 00:00:00 2001 From: zoidberg10 Date: Mon, 17 Oct 2011 22:07:14 +0200 Subject: new hoster: uploadking.com, uploadhere.com --- module/plugins/hoster/FilejungleCom.py | 6 +-- module/plugins/hoster/FilepostCom.py | 6 +-- module/plugins/hoster/UploadhereCom.py | 30 ++++++++++++++ module/plugins/hoster/UploadkingCom.py | 76 ++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 module/plugins/hoster/UploadhereCom.py create mode 100644 module/plugins/hoster/UploadkingCom.py (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/FilejungleCom.py b/module/plugins/hoster/FilejungleCom.py index a471cb983..53681d350 100644 --- a/module/plugins/hoster/FilejungleCom.py +++ b/module/plugins/hoster/FilejungleCom.py @@ -20,7 +20,6 @@ import re from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.plugins.ReCaptcha import ReCaptcha -from json import loads as json_loads def getInfo(urls): result = [] @@ -44,8 +43,8 @@ def getInfo(urls): class FilejungleCom(Hoster): __name__ = "FilejungleCom" __type__ = "hoster" - __pattern__ = r"http://(?:\www\.)?filejungle\.com/f/([^/]+).*" - __version__ = "0.1" + __pattern__ = r"http://(?:www\.)?filejungle\.com/f/([^/]+).*" + __version__ = "0.2" __description__ = """Filejungle.com plugin - free only""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") @@ -59,7 +58,6 @@ class FilejungleCom(Hoster): self.multiDL = False def process(self, pyfile): - self.req.cj.setCookie('.filejungle.com', 'PHPSESSID', '0seumptd3qhfpth0kgsu7eda27') self.html = self.load(pyfile.url) self.getFileInfo(pyfile) self.handleFree(pyfile) diff --git a/module/plugins/hoster/FilepostCom.py b/module/plugins/hoster/FilepostCom.py index 81cfd253a..319d85214 100644 --- a/module/plugins/hoster/FilepostCom.py +++ b/module/plugins/hoster/FilepostCom.py @@ -20,7 +20,7 @@ import re from module.plugins.Hoster import Hoster from module.network.RequestFactory import getURL from module.plugins.ReCaptcha import ReCaptcha -from json import loads as json_loads +from module.common.json_layer import json_loads from time import time def getInfo(urls): @@ -45,8 +45,8 @@ def getInfo(urls): class FilepostCom(Hoster): __name__ = "FilepostCom" __type__ = "hoster" - __pattern__ = r"https?://(?:\www\.)?filepost\.com/files/([^/]+).*" - __version__ = "0.1" + __pattern__ = r"https?://(?:www\.)?filepost\.com/files/([^/]+).*" + __version__ = "0.2" __description__ = """Filepost.com plugin - free only""" __author_name__ = ("zoidberg") __author_mail__ = ("zoidberg@mujmail.cz") diff --git a/module/plugins/hoster/UploadhereCom.py b/module/plugins/hoster/UploadhereCom.py new file mode 100644 index 000000000..35ddf25c8 --- /dev/null +++ b/module/plugins/hoster/UploadhereCom.py @@ -0,0 +1,30 @@ +# -*- 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. + + 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 . + + @author: zoidberg +""" + +from UploadkingCom import UploadkingCom, getInfo + +class UploadhereCom(UploadkingCom): + __name__ = "UploadhereCom" + __type__ = "hoster" + __pattern__ = r"http://(?:www\.)?uploadhere\.com/\w{10}" + __version__ = "0.1" + __description__ = """Uploadhere.com plugin - free only""" + __author_name__ = ("zoidberg") + __author_mail__ = ("zoidberg@mujmail.cz") + + # shares code with UploadkingCom \ No newline at end of file diff --git a/module/plugins/hoster/UploadkingCom.py b/module/plugins/hoster/UploadkingCom.py new file mode 100644 index 000000000..d29a06e48 --- /dev/null +++ b/module/plugins/hoster/UploadkingCom.py @@ -0,0 +1,76 @@ +# -*- 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. + + 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 . + + @author: zoidberg +""" + +import re +from module.plugins.Hoster import Hoster +from module.network.RequestFactory import getURL + +def getInfo(urls): + result = [] + + for url in urls: + html = getURL(url, decode=True) + if re.search(UploadkingCom.FILE_OFFLINE_PATTERN, html): + # File offline + result.append((url, 0, 1, url)) + else: + # Get file info + name, size = url, 0 + + found = re.search(UploadkingCom.FILE_INFO_PATTERN, html) + if found is not None: + name, size, units = found.groups() + size = float(size) * 1024 ** {'KB': 1, 'MB': 2, 'GB': 3}[units] + result.append((name, size, 2, url)) + yield result + +class UploadkingCom(Hoster): + __name__ = "UploadkingCom" + __type__ = "hoster" + __pattern__ = r"http://(?:www\.)?uploadking\.com/\w{10}" + __version__ = "0.1" + __description__ = """UploadKing.com plugin - free only""" + __author_name__ = ("zoidberg") + __author_mail__ = ("zoidberg@mujmail.cz") + + FILE_INFO_PATTERN = r'File(?:name)?:\s*<(?:b|/font>]*)>([^<]+)(?:)?]*>(?:Files|S)ize:\s*<(?:b|/font>]*)>([0-9.]+) (KB|MB|GB)' + FILE_OFFLINE_PATTERN = r'
]*>Unfortunately, this file is unavailable
' + FILE_URL_PATTERN = r'id="dlbutton">