summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Stefano <l.stickell@yahoo.it> 2014-01-16 13:58:32 +0100
committerGravatar Stefano <l.stickell@yahoo.it> 2014-04-21 16:54:52 +0200
commit70ab0c48d20d5555f4a8cbd9dd6626f48ff53f94 (patch)
tree598d3effe8467d7e5da262ff4820f7678bf01df9
parentFilefactory: added PREMIUM_ONLY_PATTERN (diff)
downloadpyload-70ab0c48d20d5555f4a8cbd9dd6626f48ff53f94.tar.xz
UploadingCom: updated patterns
Fixes #462 (cherry picked from commit 56d728540dcfa8b7f74622731b34675a4e99e0ee)
-rw-r--r--pyload/plugins/hoster/UploadingCom.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/pyload/plugins/hoster/UploadingCom.py b/pyload/plugins/hoster/UploadingCom.py
index 1da571460..c8ca2169c 100644
--- a/pyload/plugins/hoster/UploadingCom.py
+++ b/pyload/plugins/hoster/UploadingCom.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
# -*- 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
@@ -19,6 +19,7 @@
import re
from pycurl import HTTPHEADER
+
from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, timestamp
from module.common.json_layer import json_loads
@@ -27,14 +28,14 @@ class UploadingCom(SimpleHoster):
__name__ = "UploadingCom"
__type__ = "hoster"
__pattern__ = r"http://(?:www\.)?uploading\.com/files/(?:get/)?(?P<ID>[\w\d]+)"
- __version__ = "0.33"
+ __version__ = "0.34"
__description__ = """Uploading.Com File Download Hoster"""
__author_name__ = ("jeix", "mkaay", "zoidberg")
__author_mail__ = ("jeix@hasnomail.de", "mkaay@mkaay.de", "zoidberg@mujmail.cz")
- FILE_NAME_PATTERN = r'<title>Download (?P<N>.*?) for free on uploading.com</title>'
- FILE_SIZE_PATTERN = r'<span>File size: (?P<S>.*?)</span>'
- FILE_OFFLINE_PATTERN = r'<h2.*?>The requested file is not found</h2>'
+ FILE_NAME_PATTERN = r'id="file_title">(?P<N>.+)</'
+ FILE_SIZE_PATTERN = r'size tip_container">(?P<S>[\d.]+) (?P<U>\w+)<'
+ FILE_OFFLINE_PATTERN = r'Page not found!'
def process(self, pyfile):
# set lang to english