andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature/glib-loop

Browse Source
This commit is contained in:
Thomas Adamcik 2011-07-04 20:52:03 +02:00
commit c3d7b3c77f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/frontends/lastfm.py
View File

@ -74,14 +74,14 @@ class LastfmFrontend(ThreadingActor, BackendListener):
pylast.MalformedResponseError, pylast.WSError) as e:
logger.warning(u'Error submitting playing track to Last.fm: %s', e)
def stopped_playing(self, track, stop_position):
def stopped_playing(self, track, time_position):
artists = ', '.join([a.name for a in track.artists])
duration = track.length and track.length // 1000 or 0
stop_position = stop_position // 1000
time_position = time_position // 1000
if duration < 30:
logger.debug(u'Track too short to scrobble. (30s)')
return
if stop_position < duration // 2 and stop_position < 240:
if time_position < duration // 2 and time_position < 240:
logger.debug(
u'Track not played long enough to scrobble. (50% or 240s)')
return

2
tests/backends/local/playback_test.py
View File

@ -37,7 +37,7 @@ class LocalPlaybackControllerTest(PlaybackControllerTest, unittest.TestCase):
self.backend.current_playlist.add(track)
def test_uri_scheme(self):
self.assertIn('file', self.backend.uri_schemes)
self.assert_('file' in self.backend.uri_schemes)
def test_play_mp3(self):
self.add_track('blank.mp3')