Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 0 insertions, 106 deletions

diff --git a/pyload/plugin/crypter/DailymotionBatch.py b/pyload/plugin/crypter/DailymotionBatch.py
deleted file mode 100644
index f8af4f3d8..000000000
--- a/pyload/plugin/crypter/DailymotionBatch.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-
-from urlparse import urljoin
-
-from pyload.utils import json_loads
-from pyload.plugin.Crypter import Crypter
-from pyload.utils import fs_join
-
-
-class DailymotionBatch(Crypter):
-    __name__    = "DailymotionBatch"
-    __type__    = "crypter"
-    __version__ = "0.01"
-
-    __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
-
-    __description__ = """Dailymotion.com channel & playlist decrypter"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    def api_response(self, ref, req=None):
-        url  = urljoin("https://api.dailymotion.com/", ref)
-        html = self.load(url, get=req)
-        return json_loads(html)
-
-
-    def getPlaylistInfo(self, id):
-        ref = "playlist/" + id
-        req = {"fields": "name,owner.screenname"}
-        playlist = self.api_response(ref, req)
-
-        if "error" in playlist:
-            return
-
-        name = playlist['name']
-        owner = playlist['owner.screenname']
-        return name, owner
-
-
-    def _getPlaylists(self, user_id, page=1):
-        ref = "user/%s/playlists" % user_id
-        req = {"fields": "id", "page": page, "limit": 100}
-        user = self.api_response(ref, req)
-
-        if "error" in user:
-            return
-
-        for playlist in user['list']:
-            yield playlist['id']
-
-        if user['has_more']:
-            for item in self._getPlaylists(user_id, page + 1):
-                yield item
-
-
-    def getPlaylists(self, user_id):
-        return [(id,) + self.getPlaylistInfo(id) for id in self._getPlaylists(user_id)]
-
-
-    def _getVideos(self, id, page=1):
-        ref = "playlist/%s/videos" % id
-        req = {"fields": "url", "page": page, "limit": 100}
-        playlist = self.api_response(ref, req)
-
-        if "error" in playlist:
-            return
-
-        for video in playlist['list']:
-            yield video['url']
-
-        if playlist['has_more']:
-            for item in self._getVideos(id, page + 1):
-                yield item
-
-
-    def getVideos(self, playlist_id):
-        return list(self._getVideos(playlist_id))[::-1]
-
-
-    def decrypt(self, pyfile):
-        m = re.match(self.__pattern__, pyfile.url)
-        m_id = m.group('ID')
-        m_type = m.group('TYPE')
-
-        if m_type == "playlist":
-            self.logDebug("Url recognized as Playlist")
-            p_info = self.getPlaylistInfo(m_id)
-            playlists = [(m_id,) + p_info] if p_info else None
-        else:
-            self.logDebug("Url recognized as Channel")
-            playlists = self.getPlaylists(m_id)
-            self.logDebug("%s playlist\s found on channel \"%s\"" % (len(playlists), m_id))
-
-        if not playlists:
-            self.fail(_("No playlist available"))
-
-        for p_id, p_name, p_owner in playlists:
-            p_videos = self.getVideos(p_id)
-            p_folder = fs_join(self.config['general']['download_folder'], p_owner, p_name)
-            self.logDebug("%s video\s found on playlist \"%s\"" % (len(p_videos), p_name))
-            self.packages.append((p_name, p_videos, p_folder))  #: folder is NOT recognized by pyload 0.4.9!