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 00000000..6c3d0a85 Binary files /dev/null and b/src/assets/icons/playing.gif differ 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 ? : null } + { this.props.track.playing ? : null } { track.name ? track.name : {track.uri} } 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' } ]