Index: contrib/radionet.py ================================================================== --- contrib/radionet.py +++ contrib/radionet.py @@ -1,11 +1,11 @@ # encoding: UTF-8 # api: streamtuner2 # title: radio.net # description: Europe's biggest radio platform # url: http://radio.net/ -# version: 0.6 +# version: 0.7 # type: channel # category: radio # png: # iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAt0lEQVR42mNgYGD4r+Ar/F/BDwkD+SBxojBMs1mLPBArgGlFqEEENYMNQNLsukIDYkirAvGu # ABsA1OC6XOP/5f8nwIaYAg0k2gBFsAsgTgcZkvnfDugFEeK9AFKsCPMG0CU6eZJgQ4R1eP8H7LLEivWyFJANQcQCLPBAmkGG4MJohmA6C6QA5gI5OxEUDNII @@ -67,11 +67,11 @@ listformat = "rnjs" titles = dict(listeners=False, playing="Description") # sources apiPrefix = "https://api.radio.net/info/v2" - genre_url = "http://www.radio.net/genre/{}/" + genre_url = "http://www.radio.net/genre/{}" apiKey = None # Retrieve cat list and map def update_categories(self): @@ -88,19 +88,21 @@ html = ahttp.get(self.genre_url.format(cat)) for p in range(2, 4): if html.find('"?p={}">'.format(p)) >= 0: html += ahttp.get(self.genre_url.format(cat) + "?p={}".format(p)) self.set_key(html) + log.HTML(html) r = [] + # split station blocks for row in re.split("""
]+)" .*? + ]+ src="([^<">]+)" .*? ]*>(.*?) .*? ]*>\s*(.*?)\s* .*? """, row, re.X|re.S) # refurbish extracted strings @@ -109,11 +111,11 @@ r.append(dict( name = name, genre = cat, title = unhtml(title), playing = unhtml(desc), - url = self._url(name), + url = "http:{}".format(href), #self._url(name), homepage = "http:{}".format(href), img = img, )); return r