Commit Graph

259 Commits

Author SHA1 Message Date
jcass
4e63e4280c Merge remote-tracking branch 'upstream/release-1.1' into fix/1378 2016-01-04 00:04:42 +02:00
Jens Luetjen
e56c39ee78 Add unit tests for export/restore core state
Fix issues shown by test code
2016-01-03 18:29:35 +01:00
Stein Magnus Jodal
f2194e9d5e fix: skip uplayable tracks when the next track is selected while in a paused state. 2016-01-02 15:51:17 +02:00
Stein Magnus Jodal
094a874055 core: Make lookup() ignore tracks without URI
Fixes #1340
2016-01-01 23:44:26 +01:00
Stein Magnus Jodal
c47c929440 Merge PR #1356 from jcass77/fix/1352 into release-1.1 2015-12-29 14:37:08 +01:00
Stein Magnus Jodal
4fba994441 Merge pull request #1377 from jcass77/test/pr_1356_resume_unplayable_track
test: Test case for skipping unplayable tracks when paused.
2015-12-29 08:53:12 +01:00
jcass
07a0f8ff3e test: Test case to ensure that unplayable tracks are skipped over in PAUSE state.
Ensures that pause->next->resume handles unplayable tracks just like stop->next->play does.
2015-12-29 07:54:49 +02:00
Thomas Kemmer
ef1468d8d6 core: Add PlaylistsController.get_uri_schemes(). 2015-12-13 19:02:33 +01:00
Stein Magnus Jodal
be5bdb8a85 Fix review comments on PR#1359 2015-12-12 11:01:52 +01:00
jcass
e9eb9d61b4 Test cases for issue #1358 2015-12-11 07:47:07 +02:00
jcass
3cd3b45512 Fix flake8 errors. 2015-12-07 07:56:35 +02:00
jcass
fb7b466bee Result of prepare_change no longer affects whether a track is added to the history.
Update changelog and test cases.
2015-12-07 07:53:34 +02:00
jcass
2b00e83179 Mark track as playing and add to history if changing track while paused. 2015-12-06 19:16:20 +02:00
Thomas Adamcik
9f23757cc3 core: Return pending position during active seek.
This covers over that audio will fail query position while a seek is in
progress. It also means that instead of returning zero we at least return
something which is much closer to the time that we will soon end up playing
from.
2015-12-04 21:10:48 +01:00
Thomas Adamcik
454077afeb core: Make sure certain events are ignored when doing eot-seeks 2015-12-04 21:10:48 +01:00
Thomas Adamcik
aeb881896b core: Trigger position changed from audio events.
Makes sure to only fire when the position changed to our intended seek target.
Otherwise we would also be triggering this when playback starts.
2015-12-04 21:10:48 +01:00
Thomas Adamcik
e74eafb38a core: Switch back to correct track if seek happens before stream changed
Technically the seek still needs to be postponed for this to work right, but
it's a step closer.
2015-12-04 21:10:48 +01:00
Thomas Adamcik
3a57a5792b core: Make sure we always emit state_changed between tracks
Gapless broke this, so this change makes sure that next/prev/play and gapless
track changes all correctly emit events.

Note that this only ensures we get PLAYING -> PLAYING events. Not the old
STOPPED -> PLAYING and then PLAYING -> STOPPED.
2015-11-21 22:43:40 +01:00
Thomas Adamcik
216bd8e412 tests: Reorder listener_mock.send.mock_calls in assertEqual 2015-11-21 14:28:47 +01:00
Thomas Adamcik
da7ec9b202 core: Cleanup track ended event handling
Trigger playback ended on:
- stream changed
- EOS
- stop via stream changed events

Old behavior was to manually trigger on:
- next
- prev
- play with other track and old state != STOPPED
- stop
2015-11-19 22:45:55 +01:00
Stein Magnus Jodal
0c059b85b1 compat: Replace (int, long) with compat.integer_types 2015-10-29 22:21:48 +01:00
Thomas Adamcik
0169ce7cad core: Make sure the about-to-finish callback gets run in the actor.
When about to finish gets called we are running in some GStreamer thread. Our
audio code then calls the shim core callback which is responsible for
transferring our execution to the core actor thread and waiting for the
response. From this point we do normal actor calls to the backend(s) which in
turn call into the audio actor. Since the initial audio code that was called is
outside the actor this should never deadlock due to this loop.
2015-10-06 22:45:06 +02:00
Thomas Adamcik
1ca548ece7 core: Fix typos in comments 2015-10-05 21:41:15 +02:00
Thomas Adamcik
7f4e77f36f core: Update to using _change in play and fix playback ended event 2015-09-16 23:44:36 +02:00
Thomas Adamcik
592b728e32 core: Refactor previous() to use pending_track for state changes 2015-09-04 17:16:39 +02:00
Thomas Adamcik
2cd9903a54 core: Refactor next() to use pending_track for state changes 2015-09-04 16:08:54 +02:00
Thomas Adamcik
e12ea662da Merge branch 'develop' into feature/implement-gapless 2015-09-02 21:03:17 +02:00
Stein Magnus Jodal
c48b6515f9 core: library.refresh() should check if backend has library
...and not playlists.

Fixes #1257
2015-08-23 00:35:54 +02:00
Stein Magnus Jodal
9f08bce6cd core: Update test 2015-08-11 10:06:58 +02:00
Bjørnar Snoksrud
1eb41aca7d tests: fix test breakage due to promotion from int to long
This fixes #1240.

In internals/path.py. there is a snippet of code that multiples mtime
for a file with 1000, and then casting it to `int`, to return the number
of milliseconds since epoch (or whatever). This will, however, not
ensure that the result is an `int`.

>>> type(int(2**32))
<type 'long'>

Instead, fix the tests to look for (int, long), and clarify the
implementation.

This bug found on a 32-bit VM :)
2015-08-05 22:38:21 +02:00
Thomas Adamcik
ee68a0a9da Merge pull request #1238 from dbrgn/feature/996-playlist-delete-event
core: Implemented playlist_deleted event triggering
2015-07-26 12:12:23 +02:00
Danilo Bargen
8975e72b34 Implemented playlist_deleted event 2015-07-26 11:57:17 +02:00
Stein Magnus Jodal
a83d9836f9 core: Update test mock 2015-07-25 14:47:00 +02:00
Thomas Adamcik
3fe9f7b3a7 Merge branch 'develop' into feature/implement-gapless
Conflicts:
	mopidy/commands.py
	mopidy/core/playback.py
	tests/core/test_playback.py
	tests/local/test_playback.py
2015-07-22 20:00:46 +02:00
Stein Magnus Jodal
0ebfeb5a5b core: Normalize negative seek positions
This reverts a change between 1.0 and 1.1, so no changelog.

Fixes #1180
2015-07-22 12:15:38 +02:00
Ronald Zielaznicki
82ed660777 Add core config values to relevent test cases. 2015-07-19 23:05:39 -04:00
Stein Magnus Jodal
749c8baceb Merge branch 'v1.0.x' into develop
Conflicts:
	mopidy/core/library.py
	tests/core/test_playback.py
2015-06-25 23:15:35 +02:00
Thomas Adamcik
1d636ce59e core: Make sure track gets changed while paused 2015-05-20 23:26:55 +02:00
Stein Magnus Jodal
d8bcd7f273 Rename mopidy.utils to mopidy.internal 2015-05-07 23:15:56 +02:00
Thomas Adamcik
af4e7c8a4e Merge branch 'develop' into feature/core-dont-trust-backends
Conflicts:
	docs/changelog.rst
2015-05-07 00:15:33 +02:00
Thomas Adamcik
29c66f7bc8 core: Correct volume/mute return values 2015-05-07 00:13:58 +02:00
Thomas Adamcik
4d608dd431 core: Add get_current_tlid shortcut 2015-05-06 23:00:53 +02:00
Thomas Adamcik
cfd4dcb8dd Merge branch 'develop' into feature/core-dont-trust-backends
Note that this merge also updated core.playlists.create to combine the 1.0.5
fix with these changes.

Conflicts:
	mopidy/core/playlists.py
2015-05-06 22:44:12 +02:00
Thomas Adamcik
c01f8679bc core: Address review comments for do not trust backends PR 2015-05-06 22:34:44 +02:00
Stein Magnus Jodal
6d82cdb611 tests: Cleanup reset_mock() usage 2015-05-06 21:06:30 +02:00
Stein Magnus Jodal
a17c413a70 Merge branch v1.0.x into develop 2015-05-06 20:47:52 +02:00
Thomas Kemmer
636639a201 Fix #1162: Ignore None results and exceptions from PlaylistsProvider.create(). 2015-05-06 14:50:21 +02:00
Thomas Adamcik
4aa984207b tests: Split up core bad backend tests and unify naming 2015-05-06 01:01:12 +02:00
Thomas Adamcik
e7b241e18b core: Update playlists to handle bad data from backends and exceptions 2015-05-06 00:28:58 +02:00
Thomas Adamcik
3426633c78 core: Make sure we handle bad mixer data and exceptions. 2015-05-05 23:41:46 +02:00
Thomas Adamcik
dd4a8f3b78 core: Make sure library can handle bad data from backends
Note that None values are just ignored, while other bad data logs an error
message and is ignored.
2015-05-05 22:55:53 +02:00
Thomas Adamcik
a62293c316 core: Add play(tlid) support 2015-04-22 20:55:51 +02:00
Thomas Adamcik
fba4069cfd core: Make index return current index when missing args 2015-04-19 00:22:52 +02:00
Thomas Adamcik
6a7005be1e core: Add tlid argument to index calls.
Should save clients from having to pass tl_track models around.
2015-04-19 00:22:52 +02:00
Thomas Adamcik
81fd426caf tests: Update tests to not used deprecated kwargs 2015-04-17 00:00:58 +02:00
Thomas Adamcik
efad50c253 cleanup: Stop using deprecated copy() 2015-04-17 00:00:58 +02:00
Thomas Adamcik
2cc91c0a7f core: Fix review comments for PR#1111 2015-04-08 23:13:07 +02:00
Thomas Adamcik
e5f59495fc core: Update refresh test case to fail on multiple calls to same backend 2015-04-08 21:18:18 +02:00
Thomas Adamcik
511cf4e326 core: Catch exceptions when browsing in backends
Also splits browse into to method to better distinguish the two possible code
paths.
2015-04-08 21:17:44 +02:00
Thomas Adamcik
50f68064be core: Update PlaylistsController to catch backend exceptions 2015-04-06 02:13:51 +02:00
Thomas Adamcik
66771dec68 core: Update LibraryController to catch backend exceptions 2015-04-06 02:12:56 +02:00
Thomas Adamcik
11c9aa4ad0 Merge branch 'develop' into feature/implement-gapless
Conflicts:
	mopidy/backend.py
	mopidy/commands.py
	mopidy/core/actor.py
	mopidy/core/playback.py
	tests/audio/test_actor.py
	tests/core/test_playback.py
	tests/local/test_playback.py
2015-04-05 19:24:56 +02:00
Stein Magnus Jodal
c4940cbea2 autopep8: Add space after class signature/docstring 2015-04-03 00:05:26 +02:00
Thomas Adamcik
9ede14f4a1 tests: Convert to using deprecation helpers across the board. 2015-03-30 23:50:54 +02:00
Thomas Adamcik
f4c93619d1 core: Make core tracklist.add(tracks=...) deprecation safe 2015-03-29 23:11:00 +02:00
Thomas Adamcik
d3b275e1a4 core: Mark tracklist.add by URI as deprecated 2015-03-29 23:11:00 +02:00
Thomas Adamcik
49fc9941a1 core: Mark searching via keyword argument based query deprecated 2015-03-29 23:11:00 +02:00
Thomas Adamcik
0ab52a73fa core: Mark library.lookup by uri deprecated
Updates core, mpd and tests to not use deprecated calls or safely catch them
when running with -W error.
2015-03-29 23:11:00 +02:00
Thomas Adamcik
f5f9899db9 tests: Make bases test classes in core 2015-03-29 23:10:58 +02:00
Thomas Adamcik
a54551d985 core: Mark get_playlists and filter as deprecated 2015-03-29 23:10:19 +02:00
Thomas Adamcik
5a3fb64250 core: Emit deprecation warning for library.find_exact 2015-03-29 23:08:03 +02:00
Thomas Adamcik
b31f0c421f tests: Make tests warning safe 2015-03-26 21:58:44 +01:00
Thomas Adamcik
ead725e995 core/backend: Stop supporting old search signatures
All backends are expected to support the exact argument. A friendly log message
will be printed to prompt users to upgrade backends that fail due to this.
2015-03-24 23:54:49 +01:00
Stein Magnus Jodal
a8e6cd26dc core: Warn if backend does not implement as_list()
Fixes #1080
2015-03-24 23:40:50 +01:00
Thomas Adamcik
141c14ad45 core: Add exact to search() and deprecate find_exact()
Backends that still implement find_exact will be called without exact as an
argument to search, and we will continue to use find_exact. Please remove
find_exact from such backends and switch to the new search API.
2015-03-24 09:31:03 +01:00
Thomas Adamcik
24fe242d56 core/backend: Remove find_exact from backends
Functionality has been replaced with an `exact` param in the search method.
Backends that still implement find_exact will continue being called via
the old method for now.
2015-03-23 23:55:03 +01:00
Stein Magnus Jodal
07cf962434 Merge branch 'develop' into feature/new-playlists-api
Conflicts:
	docs/changelog.rst
2015-03-23 21:45:32 +01:00
Thomas Adamcik
6d22c4fd59 core: Remove set_current_tl_track 2015-03-23 00:50:05 +01:00
Thomas Adamcik
07f0453c6e core: Make event triggers internal 2015-03-23 00:50:05 +01:00
Stein Magnus Jodal
bd2e4f7af0 core: Reimplement get_playlists() using new backend API 2015-03-23 00:44:39 +01:00
Stein Magnus Jodal
4f3a0839b3 core: Add playlists.as_list() and playlists.get_items(uri) 2015-03-23 00:44:39 +01:00
Stein Magnus Jodal
9462071e0c Merge pull request #1074 from adamcik/fix/1069-handle-broken-backends
core: Protect against old clients that implement backend.play
2015-03-23 00:05:05 +01:00
Thomas Adamcik
a74bc24bdc core: Protect against old clients that implement backend.play 2015-03-22 23:54:37 +01:00
Thomas Adamcik
7ec2342921 core: Normalize search queries
This is needed as otherwise each and every backend needs to handle the fact
that some "bad" clients might send {'field': 'value'} instead of
{'field': ['value']} Though the real problem isn't the clients but our
organically grown query API.
2015-03-22 23:33:49 +01:00
Thomas Adamcik
28f8a99090 review: Fixed mock use and docstring 2015-03-22 23:14:29 +01:00
Thomas Adamcik
efe9430c7a core: Update playback code to take change track into account.
This change has us checking the return value of change_track when deciding if
the play call was a success or if the track is unplayable. Which ensures that
the following can no longer happen: 1) play stream 2) play stream that fails
change_track 3) stream 1) continues playing. Correct behavior being the next
stream playing instead.
2015-03-22 22:12:51 +01:00
Stein Magnus Jodal
56dca0e931 Merge pull request #1064 from adamcik/fix/1052-break-backend-play
backend: Change playback API (breaking change!)
2015-03-22 09:19:39 +01:00
Thomas Adamcik
31d12c7e1d Merge pull request #1065 from jodal/fix/1060-tracklist-add-uris
core: Add uris kwarg to tracklist.add()
2015-03-21 00:42:22 +01:00
Stein Magnus Jodal
2bc3db0d0e core: Add uris kwarg to tracklist.core()
Fixes #1060
2015-03-21 00:16:24 +01:00
Stein Magnus Jodal
f67e55618c core: Make lookup(uris=...) return dict with all uris
All uris given to lookup should be in the result even if there is no
backend to handle the uri, and the lookup result thus is an empty list.

As a side effect, future.get() is now called in the order of the URIs
in the `uris` list, making it easier to mock out
backend.library.lookup() in core layer tests.
2015-03-21 00:11:15 +01:00
Thomas Adamcik
bbf52eede9 backend: Change playback API (breaking change!)
While trying to remove traces of stop calls in core to get gapless working I
found we had no way to switch to switch tracks without triggering a play. This
change fixes this by changing the backends playback provider API.

- play() now _only_ starts playback and does not take any arguments.
- prepare_change() has been added, this could have been avoided with a kwarg to
  change_track(track), but that would break more backends.
- core has been updated to call prepare_change+change_track+play as needed.
- tests have been updated to handle this change.

Longer term I hope to completely rework the playback API in backends, as 99% of
our backends only use change_track(track) to translate URIs. So we should make
simple case simple, and handle mopidy-spotify / appsrc in some other way.

Cherry picked from the WIP gapless branch.
2015-03-21 00:05:00 +01:00
Stein Magnus Jodal
861f60e6f1 core: Make history.add() private
Instead of changing the signature to add(uri, name) I opted for
renaming it to _add_track(track).

Since it's internal we may change it whenever we like to. Since you need
different logic for extracting an interesting name from a track and from
a ref or a stream title, it makes sense to add another method for adding
refs/stream titles to the history when that time comes.

Fixes #1056
2015-03-20 22:41:56 +01:00
Thomas Adamcik
fdc84c3905 core: Add uris argument to library.lookup (Fixes #1008)
For now this doesn't add any corresponding APIs to backends, or for that matter
tracklist.add(uris). This is just to get the API in for clients in 0.20.
2015-03-17 23:49:21 +01:00
Thomas Adamcik
65f87e89f1 core: Update pending track handling and fix consume / gapless issue
- Pending track should only be triggered by stream_changed if there is one.
- Tracklist changed was incorrectly calling stop breaking tests and gapless
- Tests have been updated to capture and replay audio events. This should avoid
  test deadlocks while still using the audio fakes.
2015-03-16 23:50:08 +01:00
Stein Magnus Jodal
5240b50f8b Merge pull request #1040 from adamcik/fix/only-update-stream-title-for-streams
core: Only emit stream title changed for streams
2015-03-15 21:27:50 +01:00
Thomas Adamcik
28d047e1d2 core: Only emit stream title changed for streams
This is done by checking for the presence of the organization tag typically set
by web streams. This might be a bit to strict and a bad heuristic, but it's
currently better than wrongly emitting stream titles for non streams IMO.
2015-03-15 11:42:01 +01:00
Thomas Adamcik
6adeea6009 core: Correctly handle missing duration in seek.
Seeks will now fail when the duration is None, this is an approximation to if
the track is seekable or not. This check is need as otherwise seeking a radio
stream will trigger the next track.

If the track truly isn't seekable despite having a duration we should still
fail as GStreamer will reject the seek.
2015-03-15 11:29:07 +01:00
Thomas Adamcik
6260ba00be core: Test stream_title_changed listener 2015-03-14 00:30:46 +01:00
Thomas Adamcik
67f9bd73bf Merge branch 'develop' into feature/stream-reference
Conflicts:
	docs/changelog.rst
2015-03-14 00:28:51 +01:00
Thomas Adamcik
ea97047607 flake8: Fix bad import 2015-03-14 00:10:21 +01:00