Merge branch 'streamproviders'

#331
#336

src/app/components/link/DocumentationLinkComponent.js

@@ -1,33 +1,38 @@
 import {
 	get,
-	computed
+	computed,
+	inject
 } from "Ember";
-import { livestreamer } from "config";
+import { streamprovider } from "config";
 import ExternalLinkComponent from "components/link/ExternalLinkComponent";
 import layout from "templates/components/link/DocumentationLinkComponent.hbs";
 
 
-const { "docs-url": livestreamerDocsUrl } = livestreamer;
+const { service } = inject;
+const {
+	providers,
+	"docs-url": docsUrl
+} = streamprovider;
 
 
 export default ExternalLinkComponent.extend({
 	layout,
 
-	// default baseUrl is the livestreamer docs url
-	baseUrl: livestreamerDocsUrl,
+	settings: service(),
+
+	// default baseUrl
+	baseUrl: computed( "settings.streamprovider", function() {
+		let streamprovider = get( this, "settings.streamprovider" );
+		let type = providers[ streamprovider ].type;
+
+		return docsUrl[ type ];
+	}),
 
 	tagName: "span",
 	classNameBindings: [ ":documentation-link-component", "url:with-url" ],
 	attributeBindings: [ "title" ],
 
-	title: computed( "baseUrl", "url", function() {
-		return get( this, "url" )
-			// keep default behavior
-			? get( this, "baseUrl" ) === livestreamerDocsUrl
-				? "Read the documentation of this livestreamer parameter"
-				: "Read the documentation in your web browser"
-			: "";
-	}),
+	title: "Read the documentation in your web browser",
 
 	url: computed( "baseUrl", "item", function() {
 		var baseUrl = get( this, "baseUrl" );

src/app/components/modal/ModalLivestreamerComponent.js

@@ -5,7 +5,7 @@ import {
 	inject,
 	run
 } from "Ember";
-import { livestreamer } from "config";
+import { streamprovider } from "config";
 import ModalDialogComponent from "components/modal/ModalDialogComponent";
 import qualities from "models/LivestreamerQualities";
 import openBrowser from "nwjs/openBrowser";
@@ -16,13 +16,15 @@ const { readOnly } = computed;
 const { service } = inject;
 const { schedule } = run;
 const {
-	"download-url": livestreamerDownloadUrl,
+	providers,
+	"download-url": downloadUrl,
 	"version-min": versionMin
-} = livestreamer;
+} = streamprovider;
 
 
 export default ModalDialogComponent.extend({
 	livestreamer: service(),
+	settings: service(),
 
 	layout,
 
@@ -32,13 +34,27 @@ export default ModalDialogComponent.extend({
 	active: readOnly( "livestreamer.active" ),
 
 	qualities,
-	versionMin,
+	versionMin: computed( "settings.streamprovider", function() {
+		let streamprovider = get( this, "settings.streamprovider" );
+		let type = providers[ streamprovider ][ "type" ];
+
+		return versionMin[ type ];
+	}),
+
+	providername: computed( "settings.streamprovider", function() {
+		let streamprovider = get( this, "settings.streamprovider" );
+
+		return providers[ streamprovider ][ "name" ];
+	}),
 
 
 	actions: {
 		download( success ) {
-			if ( livestreamerDownloadUrl ) {
-				openBrowser( livestreamerDownloadUrl );
+			let streamprovider = get( this, "settings.streamprovider" );
+			let provider = providers[ streamprovider ][ "type" ];
+
+			if ( downloadUrl[ provider ] ) {
+				openBrowser( downloadUrl[ provider ] );
 				if ( success instanceof Function ) {
 					success();
 				}

src/app/config.js

@@ -5,7 +5,7 @@ import vars from "root/config/vars.json";
 import update from "root/config/update.json";
 import themes from "root/config/themes.json";
 import langs from "root/config/langs.json";
-import livestreamer from "root/config/livestreamer.json";
+import streamprovider from "root/config/streamprovider.json";
 import players from "root/config/players.json";
 import twitch from "root/config/twitch.json";
 import notification from "root/config/notification.json";
@@ -20,7 +20,7 @@ export {
 	update,
 	themes,
 	langs,
-	livestreamer,
+	streamprovider,
 	players,
 	twitch,
 	notification,

src/app/controllers/SettingsController.js

@@ -7,6 +7,7 @@ import {
 	Controller
 } from "Ember";
 import {
+	streamprovider,
 	players,
 	langs,
 	themes
@@ -21,6 +22,7 @@ import { delimiter } from "path";
 
 const { alias, equal } = computed;
 const { service } = inject;
+const { providers } = streamprovider;
 const { themes: themesList } = themes;
 
 const kPlayers = Object.keys( players );
@@ -61,6 +63,21 @@ export default Controller.extend( RetryTransitionMixin, {
 	retryOpenMin    : settingsAttrMeta( "retry_open", "min" ),
 	retryOpenMax    : settingsAttrMeta( "retry_open", "max" ),
 
+	streamproviders: providers,
+	streamprovidersDropDown: computed(function() {
+		return Object.keys( providers )
+			.filter(function( key ) {
+				// exclude unsupported providers
+				return providers[ key ][ "exec" ][ platform.platform ];
+			})
+			.map(function( key ) {
+				return {
+					id: key,
+					label: providers[ key ][ "label" ]
+				};
+			});
+	}),
+
 	players,
 	playerPresets: computed(function() {
 		let presetList = kPlayers

src/app/initializers/localstorage.js

@@ -42,6 +42,11 @@ function upgradeSettings() {
 		settings.gui_homepage = "/user/followedStreams";
 	}
 
+	// translate old livestreamer data into the executable format
+	if ( typeof settings.livestreamer === "string" ) {
+		delete settings[ "livestreamer" ];
+	}
+
 	// translate old player data into the player presets format
 	if ( typeof settings.player === "string" ) {
 		settings.player = {

src/app/models/localstorage/Settings.js

@@ -7,17 +7,56 @@ import {
 	Model
 } from "EmberData";
 import {
+	streamprovider,
 	players,
 	langs
 } from "config";
 import qualities from "models/LivestreamerQualities";
-import { isWin } from "utils/node/platform";
+import {
+	platform as platformName,
+	isWin
+} from "utils/node/platform";
 
 
+const {
+	providers,
+	"default-provider": defaultProvider,
+} = streamprovider;
 const langCodes = Object.keys( langs );
 
 
 
+function defaultStreamprovider() {
+	let supported = Object.keys( providers )
+		.filter(function( provider ) {
+			return providers[ provider ][ "exec" ][ platformName ];
+		});
+
+	let indexDefault = supported.indexOf( defaultProvider );
+	if ( indexDefault !== -1 ) {
+		return supported[ indexDefault ];
+	}
+
+	return supported[0] || defaultProvider;
+}
+
+function defaultStreamproviders() {
+	return Object.keys( providers )
+		.reduce(function( obj, provider ) {
+			let execObj = providers[ provider ];
+
+			let item = {};
+			item.exec = "";
+			if ( execObj[ "python" ] ) {
+				item.pythonscript = "";
+			}
+
+			obj[ provider ] = item;
+
+			return obj;
+		}, {} );
+}
+
 function defaultQualityPresets() {
 	return qualities.reduce(function( obj, quality ) {
 		obj[ quality.id ] = "";
@@ -68,7 +107,8 @@ function defaultLangFilterValue() {
  */
 export default Model.extend({
 	advanced            : attr( "boolean", { defaultValue: false } ),
-	livestreamer        : attr( "string",  { defaultValue: "" } ),
+	streamprovider      : attr( "string",  { defaultValue: defaultStreamprovider } ),
+	streamproviders     : attr( "",        { defaultValue: defaultStreamproviders } ),
 	livestreamer_params : attr( "string",  { defaultValue: "" } ),
 	livestreamer_oauth  : attr( "boolean", { defaultValue: true } ),
 	quality             : attr( "string",  { defaultValue: "source" } ),