Merge branch 'develop'

IRIS_VERSION

@@ -1 +1 @@
-3.54.1
+3.54.2

mopidy_iris/__init__.py

@@ -3,7 +3,7 @@
 
 from mopidy import config, ext
 
-__version__ = "3.54.1"
+__version__ = "3.54.2"
 
 logger = logging.getLogger(__name__)
 

mopidy_iris/static/index.html

@@ -106,8 +106,8 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1605168871";
-	var version = "3.54.1";
+	var build = "1605864468";
+	var version = "3.54.2";
 
 	// Construct the script tag
 	var js = document.createElement("script");

mopidy_iris/static/manifest.json

@@ -1,5 +1,5 @@
 {
-  "manifest_version": "3.54.1",
+  "manifest_version": "3.54.2",
   "short_name": "Iris",
   "name": "Iris",
   "icons": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.54.1",
+  "version": "3.54.2",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <[email protected]>",

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Mopidy-Iris
-version = 3.54.1
+version = 3.54.2
 url = https://github.com/jaedb/iris
 author = James Barnsley
 author_email = [email protected]

src/js/components/Loader.js

@@ -113,18 +113,9 @@ export default memo((props) => {
     <div className={classNameString}>
       <LoaderRing
         stroke={mini ? 2 : 3}
-        radius={mini ? 11 : 60}
+        radius={mini ? 12 : 60}
         progress={progress}
       />
     </div>
   );
-
-  return (
-    <div className={classNameString}>
-      <div className="loader__spinner">
-        <div className="loader__spinner__background" />
-        <div className="loader__spinner__foreground" />
-      </div>
-    </div>
-  );
 });

src/js/components/PlaybackControls.js

@@ -25,15 +25,17 @@ class PlaybackControls extends React.Component {
     this.state = {
       expanded: false,
       current_track: null,
+      stream_title: null,
       transition_track: null,
       transition_direction: null,
     };
   }
 
-  static getDerivedStateFromProps({ current_track }, state) {
+  static getDerivedStateFromProps({ current_track, stream_title }, state) {
     return {
       ...state,
       current_track,
+      stream_title,
     };
   }
 
@@ -211,6 +213,7 @@ class PlaybackControls extends React.Component {
     const {
       current_track,
       expanded,
+      stream_title,
       transition_track,
       transition_direction,
     } = this.state;
@@ -254,10 +257,17 @@ class PlaybackControls extends React.Component {
               </Link>
               <div className="text">
                 <div className="title">
-                  {current_track ? current_track.name : <span>-</span>}
+                  {stream_title && <span>{stream_title}</span>}
+                  {!stream_title && current_track && <span>{current_track.name}</span>}
+                  {!stream_title && !current_track && <span>-</span>}
                 </div>
                 <div className="artist">
-                  {current_track ? <LinksSentence items={current_track.artists} /> : <LinksSentence />}
+                  {
+                    (current_track && current_track.artists
+                        && <LinksSentence items={current_track.artists} />)
+                    || (stream_title && <span className="links-sentence">{stream_title}</span>)
+                    || <LinksSentence />
+                  }
                 </div>
               </div>
             </div>
@@ -338,11 +348,13 @@ const mapStateToProps = (state) => {
     items,
     next_track_uri,
     current_track,
+    stream_title,
   } = state.core;
 
   return {
     snapcast_enabled: state.pusher.config.snapcast_enabled,
     current_track: current_track ? items[current_track.uri] || current_track : null,
+    stream_title,
     next_track: items[next_track_uri],
     radio_enabled: (!!(state.ui.radio && state.ui.radio.enabled)),
     play_state: state.mopidy.play_state,

src/js/components/Track.js

@@ -293,6 +293,7 @@ export default class Track extends React.Component {
     const {
       track,
       track_context,
+      stream_title,
       play_state,
       selected,
       can_sort,
@@ -314,6 +315,12 @@ export default class Track extends React.Component {
           {track.artists ? <LinksSentence items={track.artists} /> : '-'}
         </li>,
       );
+    } else if (track.playing && stream_title) {
+      track_details.push(
+        <li className="details__item details__item--artists" key="stream_title">
+          <span className="links-sentence">{stream_title}</span>
+        </li>,
+      );
     }
 
     if (track.album) {

src/js/components/TrackList.js

@@ -452,6 +452,7 @@ const mapStateToProps = (state) => ({
   dragger: state.ui.dragger,
   current_track: state.core.current_track,
   context_menu: state.ui.context_menu,
+  stream_title: state.core.stream_title,
 });
 
 const mapDispatchToProps = (dispatch) => ({