Index: contrib/delicast.py ================================================================== --- contrib/delicast.py +++ contrib/delicast.py @@ -1,11 +1,11 @@ # encoding: UTF-8 # api: streamtuner2 # title: Delicast # description: directory of streaming media # url: http://delicast.com/ -# version: 0.1 +# version: 0.2 # type: channel # category: radio # config: - # png: # iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAA @@ -37,11 +37,18 @@ has_search = False listformat = "srv" audioformat = "mp3" titles = dict(listeners=False, bitrate=False, playing="Location") base = "http://delicast.com/" - categories = ["60s", "70s", "80s", "90s", "Alternative", "Blues", "Chillout", "Christian", "Classical", "Community", "Country", "Culture", "Dance", "Disco", "Easy listening", "Electronic", "Folk", "Funk", "Gospel", "Hiphop", "House Indie", "Information", "Jazz", "Latin", "Lounge", "Love", "Metal", "Oldies", "Pop", "R n b", "Reggae", "Rock", "Romantic", "Soul", "Sports", "Student", "Talk", "Techno", "Trance", "Urban", "World music"] + + categories = ["60s", "70s", "80s", "90s", "Alternative", "Blues", + "Chillout", "Christian", "Classical", "Community", "Country", "Culture", + "Dance", "Disco", "Easy listening", "Electronic", "Folk", "Funk", + "Gospel", "Hiphop", "House Indie", "Information", "Jazz", "Latin", + "Lounge", "Love", "Metal", "Oldies", "Pop", "R n b", "Reggae", "Rock", + "Romantic", "Soul", "Sports", "Student", "Talk", "Techno", "Trance", + "Urban", "World music"] # static def update_categories(self): pass @@ -73,14 +80,14 @@ # genre = unhtml(tags), )) return r - # Update `url` + # Update `url` on station data access (incurs a delay for playing or recording) def row(self): r = ChannelPlugin.row(self) if r.get("url") == "urn:delicast": html = ahttp.get(r["homepage"]) ls = re.findall("^var url = \"(.+)\";", html, re.M) r["url"] = ls[0] return r Index: contrib/di.py ================================================================== --- contrib/di.py +++ contrib/di.py @@ -34,10 +34,11 @@ # control flags has_search = False listformat = "pls" audioformat = "audio/aac" titles = dict(listeners=False, bitrate=False, playing=False) + categories = ["di.fm", "sky.fm", "jazzradio.com"] # sky.fm is an alias of "radiotunes.com" # static def update_categories(self): Index: contrib/publicradiofan.py ================================================================== --- contrib/publicradiofan.py +++ contrib/publicradiofan.py @@ -38,11 +38,16 @@ # control attributes has_search = False format = "mp3" listformat = "href" titles = dict(listeners=False, bitrate=False, playing="Description") - categories = ["adult alternative", "adult contemporary", "blues", "business", "classical", "community", "contemporary", "country", "easy", "education", "ethnic", "folk", "free-form", "full service", "government", "international", "jazz", "military", "news", "nostalgia", "oldies", "reading", "regional", "religious", "rock", "seasonal", "sports", "student", "talk", "traffic", "urban", "variety", "world", "youth"] + + categories = ["adult alternative", "adult contemporary", "blues", "business", "classical", + "community", "contemporary", "country", "easy", "education", "ethnic", "folk", "free-form", + "full service", "government", "international", "jazz", "military", "news", "nostalgia", + "oldies", "reading", "regional", "religious", "rock", "seasonal", "sports", "student", + "talk", "traffic", "urban", "variety", "world", "youth"] # static def update_categories(self): pass Index: contrib/windowsmedia.py ================================================================== --- contrib/windowsmedia.py +++ contrib/windowsmedia.py @@ -44,13 +44,16 @@ # control flags has_search = False listformat = "wax" audioformat = "audio/mpeg" titles = dict(listeners=False, bitrate=False, playing="Location") + _web = "http://www.windowsmedia.com/RadioUI/Home.aspx?g={}&culture=en-gb" base = "http://www.windowsmedia.com/RadioUI/getstationsforgenre.aspx?g={}&offset=0&culture={}" - _url = "http://www.windowsmedia.com/RadioTunerAPI/Service.asmx/playStation?stationID={}&dialupDetected=true&useHighBandwidth=false&locale={}" + _url = "http://www.windowsmedia.com/RadioTunerAPI/Service.asmx/playStation?"\ + + "stationID={}&dialupDetected=false&useHighBandwidth=true&locale={}" + # reversed default true and false for connection speed categories = ["80s", "Adult Hits", "Adult Rock", "Alternative Rock", "Americana + Roots", "Big Band", "Blues", "Christian Hits", "Classic R&B", "Classic Rock", "Classical", "Comedy", "Country", "Dance + Electronica", "Holiday", "Indie", "International", "Jazz", "Latin", "Metal", "Miscellaneous",