Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/config/default.conf
	module/plugins/accounts/DdlstorageCom.py
	module/plugins/accounts/RealdebridCom.py
	module/plugins/accounts/UploadheroCom.py
	module/plugins/crypter/DownloadVimeoCom.py
	module/plugins/crypter/FilebeerInfoFolder.py
	module/plugins/crypter/Movie2kTo.py
	module/plugins/hooks/AlldebridCom.py
	module/plugins/hooks/DebridItaliaCom.py
	module/plugins/hooks/MultishareCz.py
	module/plugins/hooks/Premium4Me.py
	module/plugins/hooks/PremiumizeMe.py
	module/plugins/hooks/RealdebridCom.py
	module/plugins/hooks/XFileSharingPro.py
	module/plugins/hooks/ZeveraCom.py
	module/plugins/hoster/ChipDe.py
	module/plugins/hoster/DdlstorageCom.py
	module/plugins/hoster/MovReelCom.py
	module/plugins/hoster/RyushareCom.py
	module/plugins/hoster/ShareRapidCom.py
	module/plugins/hoster/SpeedLoadOrg.py
	module/plugins/hoster/ZeveraCom.py
	module/web/media/default/css/default.css
	module/web/media/default/css/window.css
	module/web/templates/default/base.html
	module/web/templates/default/captcha.html
	module/web/templates/default/home.html
	module/web/templates/default/queue.html
	module/web/templates/default/window.html
	pyload/plugins/accounts/AlldebridCom.py
	pyload/plugins/accounts/Http.py
	pyload/plugins/accounts/MultishareCz.py
	pyload/plugins/accounts/Premium4Me.py
	pyload/plugins/accounts/PremiumizeMe.py
	pyload/plugins/accounts/ZeveraCom.py
	pyload/plugins/addons/Captcha9kw.py
	pyload/plugins/addons/CaptchaTrader.py
	pyload/plugins/addons/ClickAndLoad.py
	pyload/plugins/addons/Ev0InFetcher.py
	pyload/plugins/addons/ExternalScripts.py
	pyload/plugins/addons/ExtractArchive.py
	pyload/plugins/addons/HotFolder.py
	pyload/plugins/addons/MergeFiles.py
	pyload/plugins/addons/MultiHome.py
	pyload/plugins/addons/XMPPInterface.py
	pyload/plugins/crypter/C1neonCom.py
	pyload/plugins/crypter/CryptItCom.py
	pyload/plugins/crypter/ILoadTo.py
	pyload/plugins/crypter/LofCc.py
	pyload/plugins/crypter/NCryptIn.py
	pyload/plugins/crypter/OronComFolder.py
	pyload/plugins/crypter/RSLayerCom.py
	pyload/plugins/crypter/SecuredIn.py
	pyload/plugins/crypter/TrailerzoneInfo.py
	pyload/plugins/crypter/WiiReloadedOrg.py
	pyload/plugins/hoster/AlldebridCom.py
	pyload/plugins/hoster/BasePlugin.py
	pyload/plugins/hoster/CzshareCom.py
	pyload/plugins/hoster/DepositfilesCom.py
	pyload/plugins/hoster/EgoFilesCom.py
	pyload/plugins/hoster/FastshareCz.py
	pyload/plugins/hoster/FreakshareCom.py
	pyload/plugins/hoster/MegasharesCom.py
	pyload/plugins/hoster/MultishareCz.py
	pyload/plugins/hoster/MyvideoDe.py
	pyload/plugins/hoster/NetloadIn.py
	pyload/plugins/hoster/NovafileCom.py
	pyload/plugins/hoster/NowDownloadEu.py
	pyload/plugins/hoster/PornhostCom.py
	pyload/plugins/hoster/Premium4Me.py
	pyload/plugins/hoster/PremiumizeMe.py
	pyload/plugins/hoster/PutlockerCom.py
	pyload/plugins/hoster/RapidshareCom.py
	pyload/plugins/hoster/RealdebridCom.py
	pyload/plugins/hoster/ShareplaceCom.py
	pyload/plugins/hoster/TusfilesNet.py
	pyload/plugins/hoster/UnrestrictLi.py
	pyload/plugins/hoster/UploadedTo.py
	pyload/plugins/hoster/WebshareCz.py
	pyload/plugins/hoster/X7To.py
	pyload/plugins/hoster/XHamsterCom.py
	pyload/plugins/hoster/YoupornCom.py
	pyload/plugins/hoster/YourfilesTo.py
	pyload/plugins/hoster/YoutubeCom.py
	pyload/plugins/hoster/ZippyshareCom.py
	pyload/plugins/internal/SimpleCrypter.py
	pyload/plugins/internal/SimpleHoster.py

1 files changed, 13 insertions, 100 deletions

diff --git a/pyload/plugins/hoster/MovReelCom.py b/pyload/plugins/hoster/MovReelCom.py
index 2fbff66a6..5d8754ee7 100644
--- a/pyload/plugins/hoster/MovReelCom.py
+++ b/pyload/plugins/hoster/MovReelCom.py
@@ -1,110 +1,23 @@
 # -*- 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.20"
     __description__ = """MovReel.com hoster plugin"""
     __author_name__ = ("JorisV83")
     __author_mail__ = ("jorisv83-pyload@yahoo.com")
 
-    FILE_INFO_PATTERN = r'You have requested <font color="red">http://movreel.com/.*/(?P<N>.+?)</font>.*\((?P<S>[\d.]+) (?P<U>..)\)</font>'
-    FILE_OFFLINE_PATTERN = r'<b>File Not Found</b>'
-
-    def setup(self):
-        self.resumeDownload = True
-        self.multiDL = False
-
-    def handleFree(self):
-
-        # Define search patterns
-        op_pattern = '<input type="hidden" name="op" value="(.*)">'
-        id_pattern = '<input type="hidden" name="id" value="(.*)">'
-        fn_pattern = '<input type="hidden" name="fname" value="(.*)">'
-        re_pattern = '<input type="hidden" name="referer" value="(.*)">'
-        ul_pattern = '<input type="hidden" name="usr_login" value="(.*)">'
-        rand_pattern = '<input type="hidden" name="rand" value="(.*)">'
-        link_pattern = "var file_link = '(.*)';"
-        downlimit_pattern = '<br><p class="err">You have reached the download-limit: .*</p>'
-
-        # 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,
-                     "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!!")
-
-
+    #FILE_NAME_PATTERN = r'<b>Filename:</b>(?P<N>.*?)<br>'
+    #FILE_SIZE_PATTERN = r'<b>Size:</b>(?P<S>.*?)<br>'
+    FILE_INFO_PATTERN = r'<h3>(?P<N>.+?) <small><sup>(?P<S>[\d.]+) (?P<U>..)</sup> </small></h3>'
+    FILE_OFFLINE_PATTERN = r'<b>File Not Found</b><br><br>'
+    DIRECT_LINK_PATTERN = r'<a href="(http://[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/.*)">Download Link</a>'
+    #OVR_DOWNLOAD_LINK_PATTERN = "var file_link = '(.*)';"
+    HOSTER_NAME = "movreel.com"
+    
 getInfo = create_getInfo(MovReelCom)