Fix #43: Use Mopidy v1.1 httpclient.

mopidy_internetarchive/backend.py

@@ -2,7 +2,7 @@
 
 import logging
 
-from mopidy import backend
+from mopidy import backend, httpclient
 
 import pykka
 
@@ -25,5 +25,9 @@ def __init__(self, config, audio):
             retries=config[Extension.ext_name]['retries'],
             timeout=config[Extension.ext_name]['timeout']
         )
+        proxy = httpclient.format_proxy(config['proxy'])
+        self.client.proxies.update({'http': proxy, 'https': proxy})
+        agent = '%s/%s' % (Extension.dist_name, Extension.version)
+        self.client.useragent = httpclient.format_user_agent(agent)
         self.library = InternetArchiveLibraryProvider(config, self)
         self.playback = InternetArchivePlaybackProvider(audio, self)

mopidy_internetarchive/client.py

@@ -22,6 +22,18 @@ def __init__(self, base_url=BASE_URL, retries=0, timeout=None):
         self.timeout = timeout
         self.session = requests.Session()
 
+    @property
+    def proxies(self):
+        return self.session.proxies
+
+    @property
+    def useragent(self):
+        return self.session.headers.get('User-Agent')
+
+    @useragent.setter
+    def useragent(self, value):
+        self.session.headers['User-Agent'] = value
+
     def search(self, query, fields=None, sort=None, rows=None, start=None):
         response = self._get('/advancedsearch.php', params={
             'q': query,

setup.py

@@ -24,11 +24,11 @@ def get_version(filename):
     include_package_data=True,
     install_requires=[
         'setuptools',
-        'Mopidy >= 0.19',
-        'Pykka >= 1.1.0',
-        'requests >= 2.0.0',
-        'cachetools >= 1.0.0',
-        'uritools >= 0.11.0'
+        'Mopidy >= 1.1',
+        'Pykka >= 1.1',
+        'requests >= 2.0',
+        'cachetools >= 1.0',
+        'uritools >= 1.0'
     ],
     test_suite='nose.collector',
     tests_require=[

tests/test_client.py

@@ -0,0 +1,22 @@
+from __future__ import unicode_literals
+
+import unittest
+
+from mopidy_internetarchive.client import InternetArchiveClient
+
+
+class ClientTest(unittest.TestCase):
+
+    def test_useragent(self):
+        client = InternetArchiveClient()
+        self.assertIsNotNone(client.useragent)
+        client.useragent = 'foobar/1.0'
+        self.assertEqual(client.useragent, 'foobar/1.0')
+
+    def test_proxies(self):
+        client = InternetArchiveClient()
+        self.assertIsNotNone(client.proxies)
+        client.proxies['http'] = 'foo.bar:3128'
+        self.assertEqual(client.proxies['http'], 'foo.bar:3128')
+        client.proxies['https'] = 'foo.bar:4012'
+        self.assertEqual(client.proxies['https'], 'foo.bar:4012')

tests/test_library.py

@@ -31,6 +31,8 @@ class LibraryTest(unittest.TestCase):
             'cache_ttl': None,
             'retries': 0,
             'timeout': None
+        },
+        'proxy': {
         }
     }