';
html += '';
- html += '
';
+ html += '
';
html += '![]()
';
html += '
+
+
+
+
+
+ multi-download
+
+
+
+
+
+
+
+
+
diff --git a/dashboard-ui/bower_components/multi-download/index.js b/dashboard-ui/bower_components/multi-download/index.js
new file mode 100644
index 0000000000..fe6a245528
--- /dev/null
+++ b/dashboard-ui/bower_components/multi-download/index.js
@@ -0,0 +1,69 @@
+'use strict';
+
+function fallback(urls) {
+ var i = 0;
+
+ (function createIframe() {
+ var frame = document.createElement('iframe');
+ frame.style.display = 'none';
+ frame.src = urls[i++];
+ document.documentElement.appendChild(frame);
+
+ // the download init has to be sequential otherwise IE only use the first
+ var interval = setInterval(function () {
+ if (frame.contentWindow.document.readyState === 'complete') {
+ clearInterval(interval);
+
+ // Safari needs a timeout
+ setTimeout(function () {
+ frame.parentNode.removeChild(frame);
+ }, 1000);
+
+ if (i < urls.length) {
+ createIframe();
+ }
+ }
+ }, 100);
+ })();
+}
+
+function isFirefox() {
+ // sad panda :(
+ return /Firefox\//i.test(navigator.userAgent);
+}
+
+function sameDomain(url) {
+ var a = document.createElement('a');
+ a.href = url;
+
+ return location.hostname === a.hostname && location.protocol === a.protocol;
+}
+
+function download(url) {
+ var a = document.createElement('a');
+ a.download = '';
+ a.href = url;
+ // firefox doesn't support `a.click()`...
+ a.dispatchEvent(new MouseEvent('click'));
+}
+
+module.exports = function (urls) {
+ if (!urls) {
+ throw new Error('`urls` required');
+ }
+
+ if (typeof document.createElement('a').download === 'undefined') {
+ return fallback(urls);
+ }
+
+ var delay = 0;
+
+ urls.forEach(function (url) {
+ // the download init has to be sequential for firefox if the urls are not on the same domain
+ if (isFirefox() && !sameDomain(url)) {
+ return setTimeout(download.bind(null, url), 100 * ++delay);
+ }
+
+ download(url);
+ });
+}
diff --git a/dashboard-ui/bower_components/multi-download/license b/dashboard-ui/bower_components/multi-download/license
new file mode 100644
index 0000000000..654d0bfe94
--- /dev/null
+++ b/dashboard-ui/bower_components/multi-download/license
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/dashboard-ui/bower_components/multi-download/package.json b/dashboard-ui/bower_components/multi-download/package.json
new file mode 100644
index 0000000000..eac49088bd
--- /dev/null
+++ b/dashboard-ui/bower_components/multi-download/package.json
@@ -0,0 +1,28 @@
+{
+ "name": "multi-download",
+ "version": "2.0.0",
+ "description": "Download multiple files at once",
+ "license": "MIT",
+ "repository": "sindresorhus/multi-download",
+ "author": {
+ "name": "Sindre Sorhus",
+ "email": "sindresorhus@gmail.com",
+ "url": "sindresorhus.com"
+ },
+ "scripts": {
+ "build": "a=$npm_package_name; browserify -r ./index:$a -s $a index.js -o browser.js"
+ },
+ "files": [
+ "index.js"
+ ],
+ "keywords": [
+ "browser",
+ "download",
+ "multiple",
+ "parallel",
+ "files"
+ ],
+ "devDependencies": {
+ "browserify": "^10.0.0"
+ }
+}
diff --git a/dashboard-ui/bower_components/multi-download/readme.md b/dashboard-ui/bower_components/multi-download/readme.md
new file mode 100644
index 0000000000..474fe3b1c1
--- /dev/null
+++ b/dashboard-ui/bower_components/multi-download/readme.md
@@ -0,0 +1,62 @@
+# multi-download
+
+> Download multiple files at once
+
+
+
+It works by abusing the `a`-tag [`download` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-download) and falling back to iframes on older browsers.
+
+
+## [Demo](http://sindresorhus.com/multi-download)
+
+
+## Install
+
+```
+$ npm install --save multi-download
+```
+
+
+## Usage
+
+```html
+
+```
+
+```js
+document.querySelector('#download-btn').addEventListener('click', function (e) {
+ var files = e.target.dataset.files.split(' ');
+ multiDownload(files);
+});
+```
+
+```js
+// with jQuery
+$('#download-btn').on('click', function () {
+ var files = $(this).data('files').split(' ');
+ multiDownload(files);
+});
+```
+
+
+## API
+
+### multiDownload(urls)
+
+#### urls
+
+Type: `array`
+
+URLs to files you want to download.
+
+
+## Caveats
+
+Chrome will ask the user before downloading multiple files (once per domain).
+
+For the fallback to work you need to make sure the server sends the correct header for the browser to download the file rather than displaying it. This is usually achieved with the header `Content-Disposition: attachment; filename="" `.
+
+
+## License
+
+MIT © [Sindre Sorhus](http://sindresorhus.com)
diff --git a/dashboard-ui/bower_components/multi-download/screenshot.gif b/dashboard-ui/bower_components/multi-download/screenshot.gif
new file mode 100644
index 0000000000..46576c0b6c
Binary files /dev/null and b/dashboard-ui/bower_components/multi-download/screenshot.gif differ
diff --git a/dashboard-ui/components/apphost.js b/dashboard-ui/components/apphost.js
new file mode 100644
index 0000000000..7118ba4fee
--- /dev/null
+++ b/dashboard-ui/components/apphost.js
@@ -0,0 +1,103 @@
+define(['appStorage', 'browser'], function (appStorage, browser) {
+
+ function getDeviceProfile() {
+
+ // TODO
+ return null;
+ }
+
+ function getCapabilities() {
+
+ var caps = {
+ PlayableMediaTypes: ['Audio', 'Video'],
+
+ SupportsPersistentIdentifier: false,
+ DeviceProfile: getDeviceProfile()
+ };
+
+ return caps;
+ }
+
+ function generateDeviceId() {
+ return new Promise(function (resolve, reject) {
+
+ require(['fingerprintjs2'], function (Fingerprint2) {
+
+ new Fingerprint2().get(function (result, components) {
+ console.log('Generated device id: ' + result); //a hash, representing your device fingerprint
+ resolve(result);
+ });
+ });
+ });
+ }
+
+ return {
+ getWindowState: function () {
+ return document.windowState || 'Normal';
+ },
+ setWindowState: function (state) {
+ alert('setWindowState is not supported and should not be called');
+ },
+ exit: function () {
+ alert('exit is not supported and should not be called');
+ },
+ supports: function (command) {
+
+ var features = [
+ 'filedownload'
+ ];
+
+ return features.indexOf(command.toLowerCase()) != -1;
+ },
+ appName: function () {
+ return 'Emby Mobile';
+ },
+ appVersion: function () {
+ return '2.0.1';
+ },
+ deviceName: function () {
+ var deviceName;
+
+ if (browser.chrome) {
+ deviceName = "Chrome";
+ } else if (browser.edge) {
+ deviceName = "Edge";
+ } else if (browser.firefox) {
+ deviceName = "Firefox";
+ } else if (browser.msie) {
+ deviceName = "Internet Explorer";
+ } else {
+ deviceName = "Web Browser";
+ }
+
+ if (browser.version) {
+ deviceName += " " + browser.version;
+ }
+
+ if (browser.ipad) {
+ deviceName += " Ipad";
+ } else if (browser.iphone) {
+ deviceName += " Iphone";
+ } else if (browser.android) {
+ deviceName += " Android";
+ }
+
+ return deviceName;
+ },
+ deviceId: function () {
+
+ var key = '_deviceId2';
+ var deviceId = appStorage.getItem(key);
+
+ if (deviceId) {
+ return Promise.resolve(deviceId);
+ } else {
+ return generateDeviceId().then(function (deviceId) {
+ appStorage.setItem(key, deviceId);
+ return deviceId;
+ });
+ }
+ },
+ capabilities: getCapabilities
+ };
+});
\ No newline at end of file
diff --git a/dashboard-ui/components/filedownloader.js b/dashboard-ui/components/filedownloader.js
deleted file mode 100644
index 9460a31e61..0000000000
--- a/dashboard-ui/components/filedownloader.js
+++ /dev/null
@@ -1,9 +0,0 @@
-define([], function () {
-
- return function (items) {
-
- items.forEach(function (item) {
- window.location.href = item.url;
- });
- };
-});
\ No newline at end of file
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 9c3d019891..741eca49a4 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -769,7 +769,7 @@
}
if (item.CanDownload) {
- if (AppInfo.supportsDownloading) {
+ if (appHost.supports('filedownload')) {
commands.push('download');
}
}
@@ -987,7 +987,8 @@
api_key: ApiClient.accessToken()
});
- fileDownloader([{
+ fileDownloader.download([
+ {
url: downloadHref,
itemId: itemId
}]);
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 4f64726f15..f73ec1142c 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -1,4 +1,4 @@
-define(['appSettings', 'appStorage', 'libraryBrowser', 'jQuery'], function (appSettings, appStorage, LibraryBrowser, $) {
+define(['appSettings', 'appStorage', 'libraryBrowser', 'apphost', 'jQuery'], function (appSettings, appStorage, LibraryBrowser, appHost, $) {
var showOverlayTimeout;
@@ -270,7 +270,7 @@
});
}
- if (user.Policy.EnableContentDownloading && AppInfo.supportsDownloading) {
+ if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
if (mediaType) {
items.push({
name: Globalize.translate('ButtonDownload'),
@@ -491,7 +491,8 @@
api_key: ApiClient.accessToken()
});
- fileDownloader([{
+ fileDownloader.download([
+ {
url: downloadHref,
itemId: itemId
}]);
@@ -1143,7 +1144,7 @@
});
}
- if (user.Policy.EnableContentDownloading && AppInfo.supportsDownloading) {
+ if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
//items.push({
// name: Globalize.translate('ButtonDownload'),
// id: 'download',
@@ -1214,7 +1215,7 @@
combineVersions($.mobile.activePage, items);
break;
case 'markplayed':
- items.forEach(function(itemId) {
+ items.forEach(function (itemId) {
ApiClient.markPlayed(Dashboard.getCurrentUserId(), itemId);
});
hideSelections();
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index c1d91036d4..907927f207 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1383,8 +1383,6 @@ var AppInfo = {};
// This doesn't perform well on iOS
AppInfo.enableHeadRoom = !isIOS;
- AppInfo.supportsDownloading = !(AppInfo.isNativeApp && isIOS);
-
// This currently isn't working on android, unfortunately
AppInfo.supportsFileInput = !(AppInfo.isNativeApp && isAndroid);
@@ -1696,8 +1694,10 @@ var AppInfo = {};
// hack for an android test before browserInfo is loaded
if (Dashboard.isRunningInCordova() && window.MainActivity) {
paths.appStorage = "cordova/android/appstorage";
+ paths.apphost = "cordova/apphost";
} else {
paths.appStorage = apiClientBowerPath + "/appstorage";
+ paths.apphost = "components/apphost";
}
paths.playlistManager = "scripts/playlistmanager";
@@ -1974,10 +1974,12 @@ var AppInfo = {};
define("loading", [embyWebComponentsBowerPath + "/loading/loading-lite"], returnFirstDependency);
}
+ define("multi-download", [bowerPath + '/multi-download/browser'], returnFirstDependency);
+
if (Dashboard.isRunningInCordova() && browser.android) {
define("fileDownloader", ['cordova/android/filedownloader'], returnFirstDependency);
} else {
- define("fileDownloader", ['components/filedownloader'], returnFirstDependency);
+ define("fileDownloader", [embyWebComponentsBowerPath + '/filedownloader'], returnFirstDependency);
}
}