From 61b5e198f7962cdfa855e64ff43aaec23d620e56 Mon Sep 17 00:00:00 2001 From: blackberrymamba Date: Sat, 23 Dec 2017 14:55:18 +0100 Subject: [PATCH] PEP8 Small bug fixes --- mopidy_radionet/__init__.py | 3 +-- mopidy_radionet/backend.py | 7 ++++++- mopidy_radionet/library.py | 25 +++++++++++++------------ mopidy_radionet/radionet.py | 31 +++++++++++++++++-------------- setup.py | 4 ++-- tests/test_extension.py | 3 +-- tests/test_radionet.py | 10 ++++------ 7 files changed, 44 insertions(+), 39 deletions(-) diff --git a/mopidy_radionet/__init__.py b/mopidy_radionet/__init__.py index 51b620c..0453409 100644 --- a/mopidy_radionet/__init__.py +++ b/mopidy_radionet/__init__.py @@ -6,7 +6,7 @@ import os from mopidy import config, ext -__version__ = '0.1.0' +__version__ = '0.1.1' logger = logging.getLogger(__name__) @@ -33,4 +33,3 @@ class Extension(ext.Extension): def setup(self, registry): from .backend import RadioNetBackend registry.add('backend', RadioNetBackend) - diff --git a/mopidy_radionet/backend.py b/mopidy_radionet/backend.py index 72e769f..eb2b845 100644 --- a/mopidy_radionet/backend.py +++ b/mopidy_radionet/backend.py @@ -1,8 +1,13 @@ -import pykka +from __future__ import unicode_literals + import time from mopidy import backend + +import pykka + import mopidy_radionet + from .library import RadioNetLibraryProvider from .radionet import RadioNetClient diff --git a/mopidy_radionet/library.py b/mopidy_radionet/library.py index 425a73e..9393085 100644 --- a/mopidy_radionet/library.py +++ b/mopidy_radionet/library.py @@ -1,8 +1,10 @@ -import pykka +from __future__ import unicode_literals + import logging import re + from mopidy import backend -from mopidy.models import Album, Artist, Ref, Track, SearchResult +from mopidy.models import Album, Artist, Ref, SearchResult, Track logger = logging.getLogger(__name__) @@ -26,9 +28,8 @@ class RadioNetLibraryProvider(backend.LibraryProvider): album = Album( artists=[artist], images=[radio_data.image], - name=radio_data.description + " / " + radio_data.continent + - " / " + - radio_data.country + " - " + radio_data.city, + name=radio_data.description + ' / ' + radio_data.continent + + ' / ' + radio_data.country + ' - ' + radio_data.city, uri='radionet:station:%s' % (identifier)) track = Track( @@ -54,17 +55,17 @@ class RadioNetLibraryProvider(backend.LibraryProvider): directories.append( self.ref_directory( "radionet:category:favstations", "My stations") - ) + ) if self.backend.radionet.local_stations: directories.append( self.ref_directory( "radionet:category:localstations", "Local stations") - ) + ) if self.backend.radionet.top_stations: directories.append( self.ref_directory( "radionet:category:top100", "Top 100") - ) + ) elif variant == 'category' and identifier: if identifier == "favstations": for station in self.backend.radionet.fav_stations: @@ -93,14 +94,14 @@ class RadioNetLibraryProvider(backend.LibraryProvider): result.append(self.station_to_track(station)) return SearchResult( - tracks=result - ) + tracks=result + ) def station_to_ref(self, station): return Ref.track( uri='radionet:station:%s' % (station.id), name=station.name, - ) + ) def station_to_track(self, station): ref = self.station_to_ref(station) @@ -113,4 +114,4 @@ class RadioNetLibraryProvider(backend.LibraryProvider): result = re.findall(r'^radionet:([a-z]+):?([a-z0-9]+|\d+)?$', uri) if result: return result[0] - return None, None \ No newline at end of file + return None, None diff --git a/mopidy_radionet/radionet.py b/mopidy_radionet/radionet.py index ca98836..327d3f5 100644 --- a/mopidy_radionet/radionet.py +++ b/mopidy_radionet/radionet.py @@ -1,15 +1,15 @@ #!/usr/bin/env python2 # -*- coding: utf-8 -*- - from __future__ import unicode_literals import logging -import requests import re import time from mopidy import httpclient +import requests + logger = logging.getLogger(__name__) @@ -90,7 +90,7 @@ class RadioNetClient(object): logger.debug('Radio.net: Check auth.') api_sufix = 'user/account' response = self.session.post(self.api_base_url + api_sufix, - params=url_params) + params=url_params) if response.status_code is not 200: logger.error('Radio.net: Auth error.') @@ -123,7 +123,7 @@ class RadioNetClient(object): 'password': password, } response = self.session.post(self.api_base_url + api_sufix, - params=url_params, data=payload) + params=url_params, data=payload) if response.status_code is not 200: logger.error('Radio.net: Login error. ' + response.text) @@ -141,7 +141,7 @@ class RadioNetClient(object): } api_sufix = 'user/logout' response = self.session.post(self.api_base_url + api_sufix, - params=url_params) + params=url_params) if response.status_code is not 200: logger.error('Radio.net: Error logout.') @@ -165,7 +165,7 @@ class RadioNetClient(object): api_sufix = 'user/bookmarks' response = self.session.post(self.api_base_url + api_sufix, - params=url_params) + params=url_params) if response.status_code is not 200: logger.error('Radio.net: ' + response.text) @@ -179,7 +179,7 @@ class RadioNetClient(object): for stream in stream_json: if int(stream['bitRate']) >= bitrate and \ - stream['streamStatus'] == 'VALID': + stream['streamStatus'] == 'VALID': stream_url = stream['streamUrl'] break @@ -208,10 +208,10 @@ class RadioNetClient(object): 'station': station_id, } response = self.session.post(self.api_base_url + api_sufix, - params=url_params) + params=url_params) if response.status_code is not 200: logger.error('Radio.net: Error on get station by id ' + - str(station_id) + ". Error: " + response.text) + str(station_id) + ". Error: " + response.text) return False else: logger.debug('Radio.net: Done get top stations list') @@ -234,6 +234,8 @@ class RadioNetClient(object): return tmpStation def get_local_stations(self): + self.local_stations = [] + api_sufix = 'search/localstations' url_params = { @@ -244,11 +246,11 @@ class RadioNetClient(object): } response = self.session.post(self.api_base_url + api_sufix, - params=url_params) + params=url_params) if response.status_code is not 200: logger.error('Radio.net: Get local stations error. ' + - response.text) + response.text) else: logger.debug('Radio.net: Done get local stations list') json = response.json() @@ -262,6 +264,7 @@ class RadioNetClient(object): ' local stations.') def get_top_stations(self): + self.top_stations = [] api_sufix = 'search/topstations' url_params = { @@ -272,7 +275,7 @@ class RadioNetClient(object): } response = self.session.post(self.api_base_url + api_sufix, - params=url_params) + params=url_params) if response.status_code is not 200: logger.error('Radio.net: Get top stations error. ' + response.text) @@ -300,7 +303,7 @@ class RadioNetClient(object): 'pageindex': page_index, } response = self.session.post(self.api_base_url + api_sufix, - params=url_params) + params=url_params) if response.status_code is not 200: logger.error('Radio.net: Search error ' + response.text) @@ -317,4 +320,4 @@ class RadioNetClient(object): self.do_search(query_string, page_index + 1) else: logger.info('Radio.net: Found ' + - str(len(self.search_results)) + ' stations.') \ No newline at end of file + str(len(self.search_results)) + ' stations.') diff --git a/setup.py b/setup.py index 717a3f4..73e0dcd 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,9 @@ def get_version(filename): setup( name='Mopidy-RadioNet', version=get_version('mopidy_radionet/__init__.py'), - url='https://github.com/blakberrymamba/mopidy-radionet', + url='https://github.com/blackberrymamba/mopidy-radionet', license='Apache License, Version 2.0', - author='blakberrymamba', + author='blackberrymamba', author_email='mariusz@typedef.pl', description='Mopidy extension for radio.net', long_description=open('README.rst').read(), diff --git a/tests/test_extension.py b/tests/test_extension.py index 0b54acb..354750f 100644 --- a/tests/test_extension.py +++ b/tests/test_extension.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals + from mopidy_radionet import Extension @@ -20,5 +21,3 @@ def test_get_config_schema(): assert 'password' in schema assert 'language' in schema assert 'min_bitrate' in schema - - diff --git a/tests/test_radionet.py b/tests/test_radionet.py index 74189e6..7c5ae7f 100644 --- a/tests/test_radionet.py +++ b/tests/test_radionet.py @@ -16,8 +16,8 @@ class RadioNetClientTest(unittest.TestCase): def test_login(self): radionet = RadioNetClient() - radionet.login(self.username,self.password) - self.assertEqual(radionet.user_login,self.username) + radionet.login(self.username, self.password) + self.assertEqual(radionet.user_login, self.username) def test_get_bookmarks(self): radionet = RadioNetClient() @@ -50,8 +50,6 @@ class RadioNetClientTest(unittest.TestCase): radionet.do_search("radio ram") self.assertGreater(len(radionet.search_results), 0) + if __name__ == "__main__": - - unittest.main() - - + unittest.main()