Merge branch 'develop' of https://github.com/hukoeth/alltube into feature/playlist

Conflicts:
	templates/video.tpl

classes/VideoDownload.php

@@ -113,7 +113,14 @@ class VideoDownload
      * */
     public function getJSON($url, $format = null, $password = null)
     {
-        return json_decode($this->getProp($url, $format, 'dump-json', $password));
+        $jsonArray = preg_split( "/\r|\n/", $this->getProp($url, $format, 'dump-json', $password), -1,
+                     PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $decodedJson = array();
+        foreach ($jsonArray as $oneJson)
+        {
+            array_push($decodedJson, json_decode($oneJson));
+        }
+        return $decodedJson;
     }
 
     /**

controllers/FrontController.php

@@ -213,7 +213,7 @@ class FrontController
     private function getVideoResponse(Request $request, Response $response, array $params, $password = null)
     {
         try {
-            $video = $this->download->getJSON($params['url'], $this->defaultFormat, $password);
+            $vidarr = $this->download->getJSON($params['url'], $this->defaultFormat, $password);
         } catch (PasswordException $e) {
             return $this->password($request, $response);
         }
@@ -226,10 +226,10 @@ class FrontController
             $response,
             'video.tpl',
             [
-                'video'       => $video,
+                'vidarr'       => $vidarr,
                 'class'       => 'video',
-                'title'       => $video->title,
+                'title'       => $vidarr[0]->title,
-                'description' => 'Download "'.$video->title.'" from '.$video->extractor_key,
+                'description' => 'Download "'.$vidarr[0]->title.'" from '.$vidarr[0]->extractor_key,
                 'protocol'    => $protocol,
                 'config'      => $this->config,
                 'canonical'   => $this->getCanonicalUrl($request),

index.php

@@ -1,5 +1,4 @@
 <?php
-
 require_once __DIR__.'/vendor/autoload.php';
 use Alltube\Config;
 use Alltube\Controller\FrontController;

js/cast.js

@@ -2,7 +2,7 @@
 /*jslint browser: true, nomen: true */
 var castModule = (function () {
     'use strict';
-    var launchBtn, disabledBtn, stopBtn, session;
+    var launchBtn, disabledBtn, stopBtn, session, videoLink;
 
     function receiverListener(e) {
         return (e === chrome.cast.ReceiverAvailability.AVAILABLE);
@@ -51,7 +51,7 @@ var castModule = (function () {
 
     function onRequestSessionSuccess(e) {
         session = e;
-        var videoLink = document.getElementById('video_link'), videoURL = videoLink.dataset.video, mediaInfo = new chrome.cast.media.MediaInfo(videoURL, 'video/' + videoLink.dataset.ext), request = new chrome.cast.media.LoadRequest(mediaInfo);
+        var videoURL = videoLink.dataset.video, mediaInfo = new chrome.cast.media.MediaInfo(videoURL, 'video/' + videoLink.dataset.ext), request = new chrome.cast.media.LoadRequest(mediaInfo);
         session.loadMedia(request, onMediaDiscovered.bind(this, 'loadMedia'), onMediaError);
     }
 
@@ -59,19 +59,23 @@ var castModule = (function () {
         throw e.description;
     }
 
-    function launchCast() {
+    function launchCast(event) {
+        videoLink = event.target || event.srcElement;
         chrome.cast.requestSession(onRequestSessionSuccess, onLaunchError);
     }
 
     function onInitSuccess() {
-        launchBtn = document.getElementById('cast_btn_launch');
+        launchBtn = document.getElementsByClassName('cast_btn_launch');
-        disabledBtn = document.getElementById('cast_disabled');
+        disabledBtn = document.getElementsByClassName('cast_disabled');
-        stopBtn = document.getElementById('cast_btn_stop');
+        stopBtn = document.getElementsByClassName('cast_btn_stop');
-        if (launchBtn) {
+        if (launchBtn.length > 0) {
-            disabledBtn.classList.add('cast_hidden');
+            var i;
-            launchBtn.classList.remove('cast_hidden');
+            for (i = 0; i < launchBtn.length; i++) {
-            launchBtn.addEventListener('click', launchCast, false);
+                disabledBtn[i].classList.add('cast_hidden');
-            stopBtn.addEventListener('click', stopCast, false);
+                launchBtn[i].classList.remove('cast_hidden');
+                launchBtn[i].addEventListener('click', launchCast, false);
+                stopBtn[i].addEventListener('click', stopCast, false);
+            }
         }
     }
 
@@ -94,11 +98,11 @@ var castModule = (function () {
 
     return {
         init: function () {
-            var intro = document.getElementById('download_intro');
+            var intro = document.getElementsByClassName('download_intro'), i;
-            if (intro) {
+            for (i = 0; i < intro.length; i++) {
-                intro.insertAdjacentHTML('beforeend', '<img class="cast_icon" id="cast_disabled" src="img/ic_media_route_disabled_holo_light.png" alt="" title="Google Cast is not supported on this browser." /> <img class="cast_btn cast_hidden cast_icon" id="cast_btn_launch" src="img/ic_media_route_off_holo_light.png" title="Cast to ChromeCast" alt="Google Cast™" /> <img src="img/ic_media_route_on_holo_light.png" alt="Casting to ChromeCast…" title="Stop casting" id="cast_btn_stop" class="cast_btn cast_hidden cast_icon" />');
+                intro[i].insertAdjacentHTML('beforeend', '<img class="cast_disabled cast_icon" id="cast_disabled'+i+'" src="img/ic_media_route_disabled_holo_light.png" alt="" title="Google Cast is not supported on this browser." /> <img class="cast_btn_launch cast_btn cast_hidden cast_icon" id="cast_btn_launch'+i+'" src="img/ic_media_route_off_holo_light.png" title="Cast to ChromeCast" alt="Google Cast™" /> <img src="img/ic_media_route_on_holo_light.png" alt="Casting to ChromeCast…" title="Stop casting" id="cast_btn_stop'+i+'" class="cast_btn_stop cast_btn cast_hidden cast_icon" />');
-                window.__onGCastApiAvailable = loadCastApi;
             }
+            window.__onGCastApiAvailable = loadCastApi;
         }
     };
 }());

templates/video.tpl

@@ -3,8 +3,10 @@
 <div itemscope itemtype="http://schema.org/VideoObject">
 <div class="main">
 {include file="inc/logo.tpl"}
-<p id="download_intro">You are going to download<i itemprop="name">
+{foreach $vidarr as $video}
-    <a itemprop="url" id="video_link"
+    <p id="download_intro{$video@index}" class="download_intro">You are going to download<i itemprop="name">
+        <a itemprop="url" id="video_link{$video@index}"
+            class="video_link"
             data-ext="{$video->ext}"
             data-video="{$video->url|escape}"
             href="{$video->webpage_url}">
@@ -21,13 +23,13 @@
     {/if}
     <br/>
     {if isset($video->formats)}
-    <h3><label for="format">Available formats:</label></h3>
+        <h3><label for="format{$video@index}">Available formats:</label></h3>
         <form action="{path_for name="redirect"}">
             <input type="hidden" name="url" value="{$video->webpage_url}" />
-        {if $uglyUrls}
+            {if uglyUrls}
                 <input type="hidden" name="page" value="redirect" />
             {/if}
-        <select name="format" id="format" class="formats monospace">
+            <select name="format" id="format{$video@index}" class="formats monospace">
                 <optgroup label="Generic formats">
                     <option value="best{$protocol}">
                         {strip}
@@ -86,9 +88,10 @@
         </form>
     {else}
         <input type="hidden" name="format" value="best{$protocol}" />
-    <a class="downloadBtn"
+        <a class="downloadBtn" href="{$video->url|escape}">Download</a><br/>
-        href="{$video->url|escape}">Download</a><br/>
     {/if}
+    <hr />
+{/foreach}
 </div>
 </div>
 {include file="inc/footer.tpl"}