Merge branch 'master' into master

LEGAL

@@ -0,0 +1,2 @@
+# Legal information
+My lawyer tells me I am allowed to smack anyone saying this program is illegal with a flyswatter.

README.md

@@ -19,9 +19,10 @@ It's also focusing more on audio. Imagine Spotify which you don't have to pay fo
 ## Pre-alpha release
 The current version is a pre-alpha early access. Some of it is usable, some of it isn't. If there are things that don't work as expected or are counterintuitive, please open an issue so I can prioritize working on them.
 
-## Rewritten from scratch
+## What if I am religiously opposed to using Electron for any and all purposes?
+Then you are not the target audience of this program. See mps-youtube (link above) for a similar program that will not taint your machine with a library you happen to dislike.
 
-This version of Nuclear has been rewritten from scratch and released in version 0.4.0. The code is completely new, much more maintainable and extensible.
+On an unrelated note, highly polarized opinions about languages and frameworks are characteristic of people who lack real-world programming experience and are more interested in building an identity than creating computer programs.
 
 ## Features
 

app/components/SearchResults/AllResults/index.js

@@ -24,27 +24,24 @@ class AllResults extends React.Component {
   }
 
   renderLastFmResults(collection) {
-    if (collection !== undefined) {
-      let addToQueue = this.props.addToQueue
-      return collection.slice(0, 5).map((el, i) => {
-        return (
-          <Card
-            small
-            header={el.name + ' - ' + el.artist}
-            image={el.image[2]['#text']}
-            onClick={() => {
-              addToQueue(this.props.musicSources, {
-                artist: el.name,
-                name: el.name,
-                thumbnail: el.image[1]['#text']
-              })
-            }}
-            key={i}
-          />
-        )
-      })
-    }
-    return 'No result'
+    let addToQueue = this.props.addToQueue;
+    return (collection || []).slice(0, 5).map((el, i) => {
+      return (
+        <Card
+          small
+          header={el.name + ' - ' + el.artist}
+          image={el.image[2]['#text']}
+          onClick={() => {
+            addToQueue(this.props.musicSources, {
+              artist: el.name,
+              name: el.name,
+              thumbnail: el.image[1]['#text'],
+            });
+          }}
+          key={i}
+        />
+      );
+    });
   }
 
   render() {

app/constants/settings.js

@@ -41,4 +41,18 @@ module.exports = [
     prettyName: 'Use compact style for queue bar',
     default: false,
   },
+  {
+    name: 'mpd.host',
+    category: 'MPD',
+    type: 'string',
+    prettyName: 'MPD host address',
+    default: 'localhost:6600'
+  },
+  {
+    name: 'mpd.httpstream',
+    category: 'MPD',
+    type: 'string',
+    prettyName: 'MPD HTTP stream address',
+    default: 'localhost:8888'
+  }
 ];

app/containers/SoundContainer/index.js

@@ -134,10 +134,10 @@ class SoundContainer extends React.Component {
 
     if (queue.queueItems.length > 0) {
       let currentSong = queue.queueItems[queue.currentSong];
-      streamUrl = getSelectedStream(
+      streamUrl = (getSelectedStream(
         currentSong.streams,
         plugins.defaultMusicSource
-      ).stream;
+      ) || {}).stream;
     }
 
     return (