An error occurred in the application and your page could not be served. Please try again in a few moments.
-
diff --git a/img/favicon.png b/img/favicon.png
index 217cb72..b097f07 100644
Binary files a/img/favicon.png and b/img/favicon.png differ
diff --git a/img/logo.png b/img/logo.png
index c31d06c..a5f2054 100644
Binary files a/img/logo.png and b/img/logo.png differ
diff --git a/img/logo_250.png b/img/logo_250.png
index a83aed0..fd3a030 100644
Binary files a/img/logo_250.png and b/img/logo_250.png differ
diff --git a/img/logo_60.png b/img/logo_60.png
index 338185e..9a60f0a 100644
Binary files a/img/logo_60.png and b/img/logo_60.png differ
diff --git a/img/logo_90.png b/img/logo_90.png
index a6b9a86..7964b7c 100644
Binary files a/img/logo_90.png and b/img/logo_90.png differ
diff --git a/img/logo_app.png b/img/logo_app.png
index 7ca733e..6fc6f37 100644
Binary files a/img/logo_app.png and b/img/logo_app.png differ
diff --git a/img/logocompatiblemask.png b/img/logocompatiblemask.png
index 85078f6..40de155 100644
Binary files a/img/logocompatiblemask.png and b/img/logocompatiblemask.png differ
diff --git a/img/mp3hover.png b/img/mp3hover.png
index c79fa6c..402cdfc 100644
Binary files a/img/mp3hover.png and b/img/mp3hover.png differ
diff --git a/img/screenshot.png b/img/screenshot.png
index 261ca65..c75201a 100644
Binary files a/img/screenshot.png and b/img/screenshot.png differ
diff --git a/img/twitter.png b/img/twitter.png
index f9cae65..c997081 100644
Binary files a/img/twitter.png and b/img/twitter.png differ
diff --git a/index.php b/index.php
index 181ffa0..e9cee6f 100644
--- a/index.php
+++ b/index.php
@@ -14,35 +14,47 @@
* */
require_once __DIR__.'/vendor/autoload.php';
use Alltube\VideoDownload;
+use Alltube\Controller\FrontController;
+
+if (strpos($_SERVER['REQUEST_URI'], '/index.php') !== false) {
+ header('Location: '.str_ireplace('/index.php', '/', $_SERVER['REQUEST_URI']));
+ die;
+}
+
+$app = new \Slim\App();
+$container = $app->getContainer();
+$container['view'] = function ($c) {
+ $view = new \Slim\Views\Smarty(__DIR__.'/templates/');
+
+ $view->addSlimPlugins($c['router'], $c['request']->getUri());
+ $view->registerPlugin('modifier', 'noscheme', 'Smarty_Modifier_noscheme');
+
+
+ return $view;
+};
+
+$controller = new FrontController($container);
+
+$container['errorHandler'] = array($controller, 'error');
-$app = new \Slim\Slim(
- array(
- 'view' => new \Slim\Views\Smarty()
- )
-);
-$view = $app->view();
-$view->parserExtensions = array(
- __DIR__.'/vendor/slim/views/SmartyPlugins',
- __DIR__.'/vendor/rudloff/smarty-plugin-noscheme/'
-);
$app->get(
'/',
- array('Alltube\Controller\FrontController', 'index')
-);
+ array($controller, 'index')
+)->setName('index');
$app->get(
'/extractors',
- array('Alltube\Controller\FrontController', 'extractors')
-)->name('extractors');
+ array($controller, 'extractors')
+)->setName('extractors');
$app->get(
'/video',
- array('Alltube\Controller\FrontController', 'video')
-)->name('video');
+ array($controller, 'video')
+)->setName('video');
$app->get(
'/redirect',
- array('Alltube\Controller\FrontController', 'redirect')
-);
+ array($controller, 'redirect')
+)->setName('redirect');
$app->get(
'/json',
- array('Alltube\Controller\FrontController', 'json')
+ array($controller, 'json')
);
$app->run();
diff --git a/js/cast.js b/js/cast.js
index 57261fe..0cc0bd3 100644
--- a/js/cast.js
+++ b/js/cast.js
@@ -1,97 +1,106 @@
/*global chrome*/
-/*jslint devel: true, browser: true */
-var launchBtn, disabledBtn, stopBtn;
-var session, currentMedia;
-
-function receiverListener(e) {
+/*jslint browser: true, nomen: true */
+var castModule = (function () {
'use strict';
- console.log('receiverListener', e);
-}
+ var launchBtn, disabledBtn, stopBtn, session;
-function onMediaDiscovered(how, media) {
- 'use strict';
- console.log('onMediaDiscovered', how);
- currentMedia = media;
- if (launchBtn) {
- stopBtn.classList.remove('cast_hidden');
- launchBtn.classList.add('cast_hidden');
+ function receiverListener(e) {
+ return (e === chrome.cast.ReceiverAvailability.AVAILABLE);
}
-}
-function sessionListener(e) {
- 'use strict';
- session = e;
- session.addMediaListener(onMediaDiscovered.bind(this, 'addMediaListener'));
- if (session.media.length !== 0) {
- onMediaDiscovered('onRequestSessionSuccess', session.media[0]);
+ function onMediaDiscovered() {
+ if (launchBtn) {
+ stopBtn.classList.remove('cast_hidden');
+ launchBtn.classList.add('cast_hidden');
+ }
}
-}
-function onStopCast() {
- 'use strict';
- stopBtn.classList.add('cast_hidden');
- launchBtn.classList.remove('cast_hidden');
-}
-
-function stopCast() {
- 'use strict';
- session.stop(onStopCast);
-}
-
-function onMediaError() {
- 'use strict';
- console.log('onMediaError');
- stopCast();
-}
-
-function onRequestSessionSuccess(e) {
- 'use strict';
- 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);
- session.loadMedia(request, onMediaDiscovered.bind(this, 'loadMedia'), onMediaError);
-}
-
-function onLaunchError(e) {
- 'use strict';
- console.log('onLaunchError', e.description);
-}
-
-function launchCast() {
- 'use strict';
- chrome.cast.requestSession(onRequestSessionSuccess, onLaunchError);
-}
-
-function onInitSuccess() {
- 'use strict';
- launchBtn = document.getElementById('cast_btn_launch');
- disabledBtn = document.getElementById('cast_disabled');
- stopBtn = document.getElementById('cast_btn_stop');
- if (launchBtn) {
- disabledBtn.classList.add('cast_hidden');
+ function onStopCast() {
+ stopBtn.classList.add('cast_hidden');
launchBtn.classList.remove('cast_hidden');
- launchBtn.addEventListener('click', launchCast, false);
- stopBtn.addEventListener('click', stopCast, false);
}
-}
-function onError() {
- 'use strict';
- console.log('onError');
-}
-
-function initializeCastApi() {
- 'use strict';
- var sessionRequest = new chrome.cast.SessionRequest(chrome.cast.media.DEFAULT_MEDIA_RECEIVER_APP_ID), apiConfig = new chrome.cast.ApiConfig(sessionRequest, sessionListener, receiverListener, chrome.cast.AutoJoinPolicy.ORIGIN_SCOPED);
- chrome.cast.initialize(apiConfig, onInitSuccess, onError);
-}
-
-function loadCastApi(loaded, errorInfo) {
- 'use strict';
- if (loaded) {
- initializeCastApi();
- } else {
- console.log(errorInfo);
+ function onStopCastError(e) {
+ onStopCast();
+ throw e.description;
}
-}
-window['__onGCastApiAvailable'] = loadCastApi;
+ function updateListener() {
+ if (session.status !== chrome.cast.SessionStatus.CONNECTED) {
+ onStopCast();
+ }
+ }
+
+ function sessionListener(e) {
+ session = e;
+ session.addMediaListener(onMediaDiscovered.bind(this, 'addMediaListener'));
+ session.addUpdateListener(updateListener.bind(this));
+ if (session.media.length !== 0) {
+ onMediaDiscovered('onRequestSessionSuccess', session.media[0]);
+ }
+ }
+
+ function stopCast() {
+ session.stop(onStopCast, onStopCastError);
+ }
+
+ function onMediaError(e) {
+ stopCast();
+ throw e.description;
+ }
+
+ 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);
+ session.loadMedia(request, onMediaDiscovered.bind(this, 'loadMedia'), onMediaError);
+ }
+
+ function onLaunchError(e) {
+ throw e.description;
+ }
+
+ function launchCast() {
+ chrome.cast.requestSession(onRequestSessionSuccess, onLaunchError);
+ }
+
+ function onInitSuccess() {
+ launchBtn = document.getElementById('cast_btn_launch');
+ disabledBtn = document.getElementById('cast_disabled');
+ stopBtn = document.getElementById('cast_btn_stop');
+ if (launchBtn) {
+ disabledBtn.classList.add('cast_hidden');
+ launchBtn.classList.remove('cast_hidden');
+ launchBtn.addEventListener('click', launchCast, false);
+ stopBtn.addEventListener('click', stopCast, false);
+ }
+ }
+
+ function onError(e) {
+ throw e.code;
+ }
+
+ function initializeCastApi() {
+ var sessionRequest = new chrome.cast.SessionRequest(chrome.cast.media.DEFAULT_MEDIA_RECEIVER_APP_ID), apiConfig = new chrome.cast.ApiConfig(sessionRequest, sessionListener, receiverListener, chrome.cast.AutoJoinPolicy.ORIGIN_SCOPED);
+ chrome.cast.initialize(apiConfig, onInitSuccess, onError);
+ }
+
+ function loadCastApi(loaded, errorInfo) {
+ if (loaded) {
+ initializeCastApi();
+ } else {
+ throw errorInfo;
+ }
+ }
+
+ return {
+ init: function () {
+ var intro = document.getElementById('download_intro');
+ if (intro) {
+ intro.insertAdjacentHTML('beforeend', '
');
+ window.__onGCastApiAvailable = loadCastApi;
+ }
+ }
+ };
+}());
+
+window.addEventListener('load', castModule.init, false);
diff --git a/maintenance.html b/maintenance.html
index f7ba7a5..cae4766 100644
--- a/maintenance.html
+++ b/maintenance.html
@@ -1,5 +1,5 @@
-
+
@@ -9,7 +9,7 @@
-
diff --git a/manifest.json b/manifest.json
index 57256cf..9f08114 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,8 @@
{
"short_name": "AllTube",
"name": "AllTube Download",
- "display": "minimal-ui",
+ "description": "Easily download videos from Youtube, Dailymotion, Vimeo and other websites",
+ "display": "standalone",
"icons": [{
"src": "img/favicon.png",
"sizes": "32x32",
@@ -24,6 +25,7 @@
"type": "image/png"
}],
"lang": "en",
- "start_url": "./index.php",
- "theme_color": "#4F4F4F"
+ "start_url": "./",
+ "theme_color": "#4F4F4F",
+ "orientation": "portrait"
}
diff --git a/package.json b/package.json
index 5aafc35..2620eab 100644
--- a/package.json
+++ b/package.json
@@ -1,23 +1,25 @@
{
"name": "alltube",
- "version": "0.4.5",
+ "version": "0.5.0",
"license": "GPL-3.0",
"dependencies": {
- "grunt": "~0.4.5",
- "grunt-cli": "~0.1.13",
+ "grunt": "~1.0.1",
+ "grunt-cli": "~1.2.0",
"grunt-contrib-cssmin": "~1.0.0",
"grunt-contrib-uglify": "~1.0.0",
- "grunt-contrib-watch": "~0.6.1",
+ "grunt-contrib-watch": "~1.0.0",
"grunt-phpcs": "~0.4.0",
"grunt-phpunit": "~0.3.6",
- "grunt-contrib-compress": "~1.1.1",
- "bower": "~1.7.1"
+ "grunt-contrib-compress": "~1.3.0",
+ "bower": "~1.7.1",
+ "grunt-githash": "~0.1.3",
+ "grunt-jslint": "~1.1.14"
},
"repository": {
"type": "git",
"url": "https://github.com/Rudloff/alltube.git"
},
"scripts": {
- "postinstall": "./node_modules/bower/bin/bower install; ./node_modules/grunt-cli/bin/grunt"
+ "postinstall": "node node_modules/bower/bin/bower install && node node_modules/grunt-cli/bin/grunt"
}
}
diff --git a/templates/error.tpl b/templates/error.tpl
index 6756cf2..d000ab3 100644
--- a/templates/error.tpl
+++ b/templates/error.tpl
@@ -10,4 +10,3 @@
{/foreach}
This application is undergoing maintenance right now. Please check back later.