From b1c48147f3145183bbc1cd07a36e97cd7af7374c Mon Sep 17 00:00:00 2001 From: Joris Date: Fri, 11 Oct 2013 13:37:32 +0200 Subject: MovreelCom changed to use XFileSharingPro --- module/plugins/hoster/MovReelCom.py | 106 ++++-------------------------------- 1 file changed, 11 insertions(+), 95 deletions(-) (limited to 'module') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index 2fbff66a6..a300d0482 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -1,110 +1,26 @@ # -*- coding: utf-8 -*- -import re -from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo -from module.utils import html_unescape -from module.network.RequestFactory import getURL +#import re +from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo +#from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME - -class MovReelCom(SimpleHoster): +class MovReelCom(XFileSharingPro): __name__ = "MovReelCom" __type__ = "hoster" __pattern__ = r"http://movreel.com/.*" - __version__ = "1.00" + __version__ = "1.10" __description__ = """MovReel.com hoster plugin""" __author_name__ = ("JorisV83") __author_mail__ = ("jorisv83-pyload@yahoo.com") + #FILE_NAME_PATTERN = r'Filename:(?P.*?)
' + #FILE_SIZE_PATTERN = r'Size:(?P.*?)
' FILE_INFO_PATTERN = r'You have requested http://movreel.com/.*/(?P.+?).*\((?P[\d.]+) (?P..)\)' FILE_OFFLINE_PATTERN = r'File Not Found' - - def setup(self): - self.resumeDownload = True - self.multiDL = False - - def handleFree(self): - - # Define search patterns - op_pattern = '' - id_pattern = '' - fn_pattern = '' - re_pattern = '' - ul_pattern = '' - rand_pattern = '' - link_pattern = "var file_link = '(.*)';" - downlimit_pattern = '

You have reached the download-limit: .*

' - - # Get HTML source - self.logDebug("Getting first HTML source") - html = self.load(self.pyfile.url) - self.logDebug(" > Done") - - op_val = re.search(op_pattern, html).group(1) - id_val = re.search(id_pattern, html).group(1) - fn_val = re.search(fn_pattern, html).group(1) - re_val = re.search(re_pattern, html).group(1) - ul_val = re.search(ul_pattern, html).group(1) - - # Debug values - self.logDebug(" > Op " + op_val) - self.logDebug(" > Id " + id_val) - self.logDebug(" > Fname " + fn_val) - self.logDebug(" > Referer " + re_val) - self.logDebug(" > User Login " + ul_val) - - # Create post data - post_data = {"op": op_val, "usr_login": ul_val, "id": id_val, "fname": fn_val, "referer": re_val, + DIRECT_LINK_PATTERN = "var file_link = '(.*)';" + #OVR_DOWNLOAD_LINK_PATTERN = "var file_link = '(.*)';" + HOSTER_NAME = "movreel.com" "method_free": "+Free+Download"} - - # Post and get new HTML source - self.logDebug("Getting second HTML source") - html = self.load(self.pyfile.url, post=post_data, decode=True) - self.logDebug(" > Done") - - # Check download limit - if re.search(downlimit_pattern, html) is not None: - self.retry(3, 7200, "Download limit reached, wait 2h") - - # Retrieve data - if re.search(op_pattern, html) is not None: - op_val = re.search(op_pattern, html).group(1) - else: - self.retry(3, 10, "Second html: no op found!!") - - if re.search(id_pattern, html) is not None: - id_val = re.search(id_pattern, html).group(1) - else: - self.retry(3, 10, "Second html: no id found!!") - - if re.search(rand_pattern, html) is not None: - rand_val = re.search(rand_pattern, html).group(1) - else: - self.retry(3, 10, "Second html: no rand found!!") - - re_val = self.pyfile.url - - # Debug values - self.logDebug(" > Op " + op_val) - self.logDebug(" > Id " + id_val) - self.logDebug(" > Rand " + rand_val) - self.logDebug(" > Referer " + re_val) - - # Create post data - post_data = {"op": op_val, "id": id_val, "rand": rand_val, "referer": re_val, "method_free": "+Free+Download", "method_premium": "", "down_direct": "1"} - - # Post and get new HTML source - self.logDebug("Getting third HTML source") - html = self.load(self.pyfile.url, post=post_data, decode=True) - self.logDebug(" > Done") - - # Get link value - if re.search(link_pattern, html) is not None: - link_val = re.search(link_pattern, html).group(1) - self.logDebug(" > Link " + link_val) - self.download(link_val) - else: - self.logDebug("No link found!!") - self.retry(3, 10, "No link found!!") - + getInfo = create_getInfo(MovReelCom) -- cgit v1.2.3 From 5283039bee5a380228929df72096d19f1547566c Mon Sep 17 00:00:00 2001 From: Joris Date: Sat, 2 Nov 2013 18:58:50 +0100 Subject: Fixed MovReelCom. Now uses XFileSharingPro and adapted to new site. --- module/plugins/hoster/MovReelCom.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'module') diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py index a300d0482..5d8754ee7 100644 --- a/module/plugins/hoster/MovReelCom.py +++ b/module/plugins/hoster/MovReelCom.py @@ -7,20 +7,17 @@ class MovReelCom(XFileSharingPro): __name__ = "MovReelCom" __type__ = "hoster" __pattern__ = r"http://movreel.com/.*" - __version__ = "1.10" + __version__ = "1.20" __description__ = """MovReel.com hoster plugin""" __author_name__ = ("JorisV83") __author_mail__ = ("jorisv83-pyload@yahoo.com") #FILE_NAME_PATTERN = r'Filename:(?P.*?)
' #FILE_SIZE_PATTERN = r'Size:(?P.*?)
' - FILE_INFO_PATTERN = r'You have requested http://movreel.com/.*/(?P.+?).*\((?P[\d.]+) (?P..)\)' - FILE_OFFLINE_PATTERN = r'File Not Found' - DIRECT_LINK_PATTERN = "var file_link = '(.*)';" + FILE_INFO_PATTERN = r'

(?P.+?) (?P[\d.]+) (?P..)

' + FILE_OFFLINE_PATTERN = r'File Not Found

' + DIRECT_LINK_PATTERN = r'Download Link' #OVR_DOWNLOAD_LINK_PATTERN = "var file_link = '(.*)';" HOSTER_NAME = "movreel.com" - "method_free": "+Free+Download"} - "method_premium": "", "down_direct": "1"} - getInfo = create_getInfo(MovReelCom) -- cgit v1.2.3