search: Set market parameter to user's country. Fixes #97

mopidy · Feb 3, 2017 · 84f63ea · 84f63ea
1 parent 5b39827
commit 84f63ea
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/mopidy_spotify/search.py b/mopidy_spotify/search.py
@@ -59,6 +59,7 @@ def search(config, session, requests_session,
         response = requests_session.get(_API_BASE_URI, params={
             'q': sp_query,
             'limit': search_count,
+            'market': session.user_country,
             'type': ','.join(types)})
     except requests.RequestException as exc:
         logger.debug('Fetching %s failed: %s', uri, exc)

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -354,6 +354,7 @@ def session_mock():
     sp_session_mock = mock.Mock(spec=spotify.Session)
     sp_session_mock.connection.state = spotify.ConnectionState.LOGGED_IN
     sp_session_mock.playlist_container = []
+    sp_session_mock.user_country = 'GB'
     return sp_session_mock
 
 

diff --git a/tests/test_search.py b/tests/test_search.py
@@ -91,6 +91,7 @@ def test_search_returns_albums_and_artists_and_tracks(
     assert (uri_parts == [
         'https://api.spotify.com/v1/search',
         'limit=50',
+        'market=GB',
         'q=%22ABBA%22',
         'type=album%2Cartist%2Ctrack'])
 
@@ -149,6 +150,7 @@ def test_sets_api_limit_to_album_count_when_max(
     assert (uri_parts == [
         'https://api.spotify.com/v1/search',
         'limit=6',
+        'market=GB',
         'q=%22ABBA%22',
         'type=album%2Cartist%2Ctrack'])
 
@@ -174,6 +176,7 @@ def test_sets_api_limit_to_artist_count_when_max(
     assert (uri_parts == [
         'https://api.spotify.com/v1/search',
         'limit=6',
+        'market=GB',
         'q=%22ABBA%22',
         'type=album%2Cartist%2Ctrack'])
 
@@ -199,6 +202,7 @@ def test_sets_api_limit_to_track_count_when_max(
     assert (uri_parts == [
         'https://api.spotify.com/v1/search',
         'limit=6',
+        'market=GB',
         'q=%22ABBA%22',
         'type=album%2Cartist%2Ctrack'])
 
@@ -222,10 +226,31 @@ def test_sets_types_parameter(
     assert (uri_parts == [
         'https://api.spotify.com/v1/search',
         'limit=50',
+        'market=GB',
         'q=%22ABBA%22',
         'type=album%2Cartist'])
 
 
+@responses.activate
+def test_sets_market_parameter(
+        web_search_mock_large, provider):
+    responses.add(
+        responses.GET, 'https://api.spotify.com/v1/search',
+        body=json.dumps(web_search_mock_large))
+
+    provider.search({'any': ['ABBA']})
+
+    assert len(responses.calls) == 1
+
+    uri_parts = sorted(re.split('[?&]', responses.calls[0].request.url))
+    assert (uri_parts == [
+        'https://api.spotify.com/v1/search',
+        'limit=50',
+        'market=GB',
+        'q=%22ABBA%22',
+        'type=album%2Cartist%2Ctrack'])
+
+
 @responses.activate
 def test_handles_empty_response(
         web_search_mock_large, provider):