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, 8 insertions, 155 deletions

diff --git a/pyload/plugins/crypter/Movie2kTo.py b/pyload/plugins/crypter/Movie2kTo.py
index 92ec7211a..c9c3f8f2d 100644
--- a/pyload/plugins/crypter/Movie2kTo.py
+++ b/pyload/plugins/crypter/Movie2kTo.py
@@ -1,160 +1,13 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import re
-from collections import defaultdict
+from module.plugins.internal.DeadCrypter import DeadCrypter
 
-from module.plugins.Crypter import Crypter
 
-
-class Movie2kTo(Crypter):
-    __name__ = 'Movie2kTo'
-    __type__ = 'container'
-    __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html'
-    __version__ = '0.5'
-    __config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '),
-                  ('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'),
-                  ('whole_season', 'bool', 'Download whole season', 'False'),
-                  ('everything', 'bool', 'Download everything', 'False'),
-                  ('firstN', 'int',
-                   'Download the first N files for each episode (the first file is probably all you will need)', '1')]
+class Movie2kTo(DeadCrypter):
+    __name__ = "Movie2kTo"
+    __type__ = "container"
+    __pattern__ = r"http://(?:www\.)?movie2k\.to/(.*)\.html"
+    __version__ = "0.51"
     __description__ = """Movie2k.to Container Plugin"""
-    __author_name__ = ('4Christopher')
-    __author_mail__ = ('4Christopher@gmx.de')
-    BASE_URL_PATTERN = r'http://(?:www\.)?movie2k\.to/'
-    TVSHOW_URL_PATH_PATTERN = r'tvshows-(?P<id>\d+?)-(?P<name>.+)'
-    FILM_URL_PATH_PATTERN = r'(?P<name>.+?)-(?:online-film|watch-movie)-(?P<id>\d+)'
-    SEASON_PATTERN = r'<div id="episodediv(\d+?)" style="display:(inline|none)">(.*?)</div>'
-    EP_PATTERN = r'<option value="(.+?)"( selected)?>Episode\s*?(\d+?)</option>'
-    BASE_URL = 'http://www.movie2k.to'
-
-    def decrypt(self, pyfile):
-        self.package = pyfile.package()
-        self.folder = self.package.folder
-        self.qStatReset()
-        whole_season = self.getConfig('whole_season')
-        everything = self.getConfig('everything')
-        self.getInfo(pyfile.url)
-
-        if (whole_season or everything) and self.format == 'tvshow':
-            self.logDebug('Downloading the whole season')
-            for season, season_sel, html in re.findall(self.SEASON_PATTERN, self.html, re.DOTALL | re.I):
-                if (season_sel == 'inline') or everything:
-                    season_links = []
-                    for url_path, ep_sel, ep in re.findall(self.EP_PATTERN, html, re.I):
-                        season_name = self.name_tvshow(season, ep)
-                        self.logDebug('%s: %s' % (season_name, url_path))
-                        if ep_sel and (season_sel == 'inline'):
-                            self.logDebug('%s selected (in the start URL: %s)' % (season_name, pyfile.url))
-                            season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path))
-                        elif (whole_season and (season_sel == 'inline')) or everything:
-                            season_links += self.getInfoAndLinks('%s/%s' % (self.BASE_URL, url_path))
-
-                    self.logDebug(season_links)
-                    folder = '%s: Season %s' % (self.name, season)
-                    name = '%s%s' % (folder, self.qStat())
-                    self.packages.append((name, season_links, folder))
-                    self.qStatReset()
-        else:
-            links = self.getLinks()
-            name = '%s%s' % (self.package.name, self.qStat())
-            self.packages.append((name, links, self.package.folder))
-
-    def qStat(self):
-        if len(self.q) == 0:
-            return ''
-        if not self.getConfig('dir_quality'):
-            return ''
-        if len(self.q) == 1:
-            return ' (Quality: %d, max (all hosters): %d)' % (self.q[0], self.max_q)
-        return (' (Average quality: %d, min: %d, max: %d, %s, max (all hosters): %d)'
-                % (sum(self.q) / float(len(self.q)), min(self.q), max(self.q), self.q, self.max_q))
-
-    def qStatReset(self):
-        self.q = []  # to calculate the average, min and max of the quality
-        self.max_q = None  # maximum quality of all hosters
-
-    def tvshow_number(self, number):
-        if int(number) < 10:
-            return '0%s' % number
-        else:
-            return number
-
-    def name_tvshow(self, season, ep):
-        return '%s S%sE%s' % (self.name, self.tvshow_number(season), self.tvshow_number(ep))
-
-    def getInfo(self, url):
-        self.html = self.load(url)
-        self.url_path = re.match(self.__pattern__, url).group(1)
-        self.format = pattern_re = None
-        if re.match(r'tvshows', self.url_path):
-            self.format = 'tvshow'
-            pattern_re = re.search(self.TVSHOW_URL_PATH_PATTERN, self.url_path)
-        elif re.search(self.FILM_URL_PATH_PATTERN, self.url_path):
-            self.format = 'film'
-            pattern_re = re.search(self.FILM_URL_PATH_PATTERN, self.url_path)
-        self.name = pattern_re.group('name')
-        self.id = pattern_re.group('id')
-        self.logDebug('URL Path: %s (ID: %s, Name: %s, Format: %s)'
-                      % (self.url_path, self.id, self.name, self.format))
-
-    def getInfoAndLinks(self, url):
-        self.getInfo(url)
-        return self.getLinks()
-
-    ## This function returns the links for one episode as list
-    def getLinks(self):
-        accepted_hosters = re.findall(r'\b(\w+?)\b', self.getConfig('accepted_hosters'))
-        firstN = self.getConfig('firstN')
-        links = []
-        re_quality = re.compile(r'.+?Quality:.+?smileys/(\d)\.gif')
-        ## The quality is one digit. 0 is the worst and 5 is the best.
-        ## Is not always there …
-        re_hoster_id_js = re.compile(r'links\[(\d+?)\].+&nbsp;(.+?)</a>(.+?)</tr>')
-        re_hoster_id_html = re.compile(
-            r'(?:<td height|<tr id).+?<a href=".*?(\d{7}).*?".+?&nbsp;([^<>]+?)</a>(.+?)</tr>')
-        ## I assume that the ID is 7 digits longs
-        count = defaultdict(int)
-        matches = re_hoster_id_html.findall(self.html)
-        matches += re_hoster_id_js.findall(self.html)
-        # self.logDebug(matches)
-        ## h_id: hoster_id of a possible hoster
-        for h_id, hoster, q_html in matches:
-            match_q = re_quality.search(q_html)
-            if match_q:
-                quality = int(match_q.group(1))
-                if self.max_q == None:
-                    self.max_q = quality
-                else:
-                    if self.max_q < quality:
-                        self.max_q = quality
-                q_s = ', Quality: %d' % quality
-            else:
-                q_s = ', unknown quality'
-            if hoster in accepted_hosters:
-                self.logDebug('Accepted: %s, ID: %s%s' % (hoster, h_id, q_s))
-                count[hoster] += 1
-                if count[hoster] <= firstN:
-                    if match_q: self.q.append(quality)
-                    if h_id != self.id:
-                        self.html = self.load('%s/tvshows-%s-%s.html' % (self.BASE_URL, h_id, self.name))
-                    else:
-                        self.logDebug('This is already the right ID')
-                    # The iframe tag must continue with a width. There where
-                    # two iframes in the site and I try to make sure that it
-                    # matches the right one. This is not (yet) nessesary
-                    # because the right iframe happens to be the first iframe.
-                    for pattern in (r'<a target="_blank" href="(http://[^"]*?)"',
-                                    r'<iframe src="(http://[^"]*?)" width'):
-                        try:
-                            url = re.search(pattern, self.html).group(1)
-                        except:
-                            self.logDebug('Failed to find the URL (pattern %s)' % pattern)
-                        else:
-                            self.logDebug('id: %s, %s: %s' % (h_id, hoster, url))
-                            links.append(url)
-                            break
-            else:
-                self.logDebug('Not accepted: %s, ID: %s%s' % (hoster, h_id, q_s))
-        # self.logDebug(links)
-        return links
+    __author_name__ = ("4Christopher")
+    __author_mail__ = ("4Christopher@gmx.de")