Permalink
Browse files

Fixed package description typo and incorrect capitalisation in name

  • Loading branch information...
kingosticks committed Feb 24, 2014
1 parent 636cc5d commit 61eafd86ef12e1a3dd1c87f0dc59a9abcb72b0dc
Showing with 30 additions and 30 deletions.
  1. +8 −8 README.rst
  2. +3 −3 mopidy_tunein/__init__.py
  3. +11 −11 mopidy_tunein/actor.py
  4. +7 −7 mopidy_tunein/tunein.py
  5. +1 −1 setup.py
View
@@ -1,13 +1,13 @@
****************************
-Mopidy-Tunein
+Mopidy-TuneIn
****************************
-.. image:: https://pypip.in/v/Mopidy-Tunein/badge.png
- :target: https://pypi.python.org/pypi/Mopidy-Tunein/
+.. image:: https://pypip.in/v/Mopidy-TuneIn/badge.png
+ :target: https://pypi.python.org/pypi/Mopidy-TuneIn/
:alt: Latest PyPI version
-.. image:: https://pypip.in/d/Mopidy-Tunein/badge.png
- :target: https://pypi.python.org/pypi/Mopidy-Tunein/
+.. image:: https://pypip.in/d/Mopidy-TuneIn/badge.png
+ :target: https://pypi.python.org/pypi/Mopidy-TuneIn/
:alt: Number of PyPI downloads
.. image:: https://travis-ci.org/kingosticks/mopidy-tunein.png?branch=master
@@ -30,7 +30,7 @@ Installation
Install by running::
- pip install Mopidy-Tunein
+ pip install Mopidy-TuneIn
.. Or, if available, install the Debian/Ubuntu package from `apt.mopidy.com
.. <http://apt.mopidy.com/>`_.
@@ -40,7 +40,7 @@ Configuration
=============
Before starting Mopidy, you must add configuration for
-Mopidy-Tunein to your Mopidy configuration file::
+Mopidy-TuneIn to your Mopidy configuration file::
[tunein]
timeout = 5000
@@ -51,7 +51,7 @@ Project resources
- `Source code <https://github.com/kingosticks/mopidy-tunein>`_
- `Issue tracker <https://github.com/kingosticks/mopidy-tunein/issues>`_
-- `Download development snapshot <https://github.com/kingosticks/mopidy-tunein/tarball/master#egg=Mopidy-Tunein-dev>`_
+- `Download development snapshot <https://github.com/kingosticks/mopidy-tunein/tarball/master#egg=Mopidy-TuneIn-dev>`_
Changelog
@@ -9,7 +9,7 @@
class Extension(ext.Extension):
- dist_name = 'Mopidy-Tunein'
+ dist_name = 'Mopidy-TuneIn'
ext_name = 'tunein'
version = __version__
@@ -23,5 +23,5 @@ def get_config_schema(self):
return schema
def setup(self, registry):
- from .actor import TuneinBackend
- registry.add('backend', TuneinBackend)
+ from .actor import TuneInBackend
+ registry.add('backend', TuneInBackend)
View
@@ -13,22 +13,22 @@
logger = logging.getLogger(__name__)
-class TuneinBackend(pykka.ThreadingActor, backend.Backend):
+class TuneInBackend(pykka.ThreadingActor, backend.Backend):
uri_schemes = ['tunein']
def __init__(self, config, audio):
- super(TuneinBackend, self).__init__()
- self.tunein = tunein.Tunein(config['tunein']['timeout'])
- self.library = TuneinLibrary(
+ super(TuneInBackend, self).__init__()
+ self.tunein = tunein.TuneIn(config['tunein']['timeout'])
+ self.library = TuneInLibrary(
backend=self, timeout=config['tunein']['timeout'])
- self.playback = TuneinPlayback(audio=audio, backend=self)
+ self.playback = TuneInPlayback(audio=audio, backend=self)
-class TuneinLibrary(backend.LibraryProvider):
- root_directory = Ref.directory(uri='tunein:root', name='Tunein')
+class TuneInLibrary(backend.LibraryProvider):
+ root_directory = Ref.directory(uri='tunein:root', name='TuneIn')
def __init__(self, backend, timeout):
- super(TuneinLibrary, self).__init__(backend)
+ super(TuneInLibrary, self).__init__(backend)
self._scanner = scan.Scanner(min_duration=None, timeout=timeout)
def browse(self, uri):
@@ -101,9 +101,9 @@ def search(self, query=None, uris=None):
return SearchResult(uri='tunein:search', tracks=tracks)
-class TuneinPlayback(backend.PlaybackProvider):
+class TuneInPlayback(backend.PlaybackProvider):
def __init__(self, audio, backend):
- super(TuneinPlayback, self).__init__(audio, backend)
+ super(TuneInPlayback, self).__init__(audio, backend)
self._scanner = scan.Scanner(min_duration=None, timeout=1000)
def change_track(self, track):
@@ -121,4 +121,4 @@ def change_track(self, track):
uris = self.backend.tunein.parse_stream_url(uris[0])
track = track.copy(uri=uris[0])
- return super(TuneinPlayback, self).change_track(track)
+ return super(TuneInPlayback, self).change_track(track)
View
@@ -123,8 +123,8 @@ def find_playlist_parser(extension, content_type):
return parser
-class Tunein(object):
- """Wrapper for the Tunein API."""
+class TuneIn(object):
+ """Wrapper for the TuneIn API."""
def __init__(self, timeout):
self._base_uri = 'http://opml.radiotime.com/%s'
@@ -176,7 +176,7 @@ def categories(self, category=''):
args = '&id=r0' # Annoying special case
elif category == 'language':
args = '&c=lang'
- return [] # Tunein's API is a mess here, cba
+ return [] # TuneIn's API is a mess here, cba
else:
args = '&c=' + category
@@ -242,7 +242,7 @@ def _station_info(self, station_id):
return listings[0]
def parse_stream_url(self, url):
- logger.debug('Using tunein stream url parsing')
+ logger.debug('Using TuneIn stream url parsing')
extension = urlparse.urlparse(url).path[-4:]
if extension in ['.mp3', '.wma']:
return [url] # Catch these easy ones
@@ -297,7 +297,7 @@ def search(self, query):
@cache()
def _tunein(self, variant, args):
uri = (self._base_uri % variant) + '?render=json' + args
- logger.debug('Tunein request: %s', uri)
+ logger.debug('TuneIn request: %s', uri)
try:
response = requests.get(uri, timeout=self._timeout)
response.raise_for_status()
@@ -307,7 +307,7 @@ def _tunein(self, variant, args):
data['head']['fault'])
return data['body']
except Exception as e:
- logger.info('Tunein request failed: %s', e)
+ logger.info('TuneIn request failed: %s', e)
return {}
@cache()
@@ -326,5 +326,5 @@ def _get_playlist(self, uri):
response.close()
return (data, content_type)
except Exception as e:
- logger.info('Tunein playlist request failed: %s', e)
+ logger.info('TuneIn playlist request failed: %s', e)
return (None, None)
View
@@ -17,7 +17,7 @@ def get_version(filename):
license='Apache License, Version 2.0',
author='Nick Steel',
author_email='kingosticks@gmail.com',
- description='Mopidy extension extension for playing music from Tunein.',
+ description='Mopidy extension for playing music from TuneIn.',
long_description=open('README.rst').read(),
packages=find_packages(exclude=['tests', 'tests.*']),
zip_safe=False,

0 comments on commit 61eafd8

Please sign in to comment.