From f1c6479f99d199c6269cdd2b9e505756a0bb0f26 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sun, 18 Dec 2016 11:32:03 +1300
Subject: [PATCH] GIF to css-loader; If PyPi down, don't break get_version;
 Playing icon in tracklist

---
 mopidy_iris/frontend.py         |  14 ++++++++------
 src/assets/icons/playing.gif    | Bin 0 -> 56360 bytes
 src/js/components/Track.js      |   1 +
 src/scss/components/_lists.scss |  21 +++++++++++++++++++++
 webpack.config.js               |   2 +-
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100755 src/assets/icons/playing.gif

diff --git a/mopidy_iris/frontend.py b/mopidy_iris/frontend.py
index 55e15439..defaa01d 100755
--- a/mopidy_iris/frontend.py
+++ b/mopidy_iris/frontend.py
@@ -170,19 +170,21 @@ class IrisFrontend(pykka.ThreadingActor, CoreListener):
     ##
     def get_version( self ):
         
-        url = 'https://pypi.python.org/pypi/Mopidy-Spotmop/json'
+        url = 'https://pypi.python.org/pypi/Mopidy-Iris/json'
         req = urllib2.Request(url)
         
         try:
             response = urllib2.urlopen(req, timeout=30).read()
             response = json.loads(response)
             latest_version = response['info']['version']
+            
+            # compare our versions, and convert result to boolean
+            upgrade_available = cmp( parse_version( latest_version ), parse_version( self.version ) )
+            upgrade_available = ( upgrade_available == 1 )
+
         except urllib2.HTTPError as e:
-            latest_version = False
-        
-        # compare our versions, and convert result to boolean
-        upgrade_available = cmp( parse_version( latest_version ), parse_version( self.version ) )
-        upgrade_available = ( upgrade_available == 1 )
+            latest_version = '0.0.0'
+            upgrade_available = False
         
         # prepare our response
         data = {
diff --git a/src/assets/icons/playing.gif b/src/assets/icons/playing.gif
new file mode 100755
index 0000000000000000000000000000000000000000..6c3d0a852feeb63290d8a7c6d684c25c899a67d9
GIT binary patch
literal 56360
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
W3*ZIt0(b$u0A2tufEV~{U*NyOLs6*!

literal 0
HcmV?d00001

diff --git a/src/js/components/Track.js b/src/js/components/Track.js
index 856f327a..10823f87 100755
--- a/src/js/components/Track.js
+++ b/src/js/components/Track.js
@@ -59,6 +59,7 @@ export default class Track extends React.Component{
 				onDoubleClick={ e => this.props.handleDoubleClick(e) }
 				onContextMenu={ e => this.handleContextMenu(e) }>
 					{ this.props.track.selected ? <FontAwesome name="check" className="select-state" fixedWidth /> : null }
+					{ this.props.track.playing ? <FontAwesome name="play" className="play-state" fixedWidth /> : null }
 					<span className="col name">
 						{ track.name ? track.name : <span className="grey-text">{track.uri}</span> }
 					</span>
diff --git a/src/scss/components/_lists.scss b/src/scss/components/_lists.scss
index 74d4815a..967af891 100755
--- a/src/scss/components/_lists.scss
+++ b/src/scss/components/_lists.scss
@@ -57,8 +57,29 @@
 			font-size: 10px;
 		}
 
+		.play-state {
+			display: none;
+			position: absolute;
+			top: 13px;
+			left: 15px;
+			font-size: 10px;
+		}
+
 		&.playing {
 			font-weight: 600;
+			.play-state {
+				display: block;
+				opacity: 1;
+			}
+		}
+
+		&.playing.selected {
+			.select-state {
+				left: 23px;
+			}
+			.play-state {
+				left: 10px;
+			}
 		}
 
 		:root .dragging &:hover {
diff --git a/webpack.config.js b/webpack.config.js
index b7410e78..b28eeff7 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -43,7 +43,7 @@ var config = {
 			},
 			{
 				// load external resources (ie Google fonts)
-				test: /.(png|woff(2)?|eot|ttf|svg)(\?[a-z0-9=\.]+)?$/,
+				test: /.(gif|png|woff(2)?|eot|ttf|svg)(\?[a-z0-9=\.]+)?$/,
 				loader: 'url-loader?limit=100000'
 			}
 		]