Index: contrib/radiolist.py ================================================================== --- contrib/radiolist.py +++ contrib/radiolist.py @@ -79,19 +79,16 @@ rx_title = re.compile(']+)"[^>]+target="_blank"[^>]*>(.+?)', re.I) rx_urls = re.compile(']+)">(\d+)(?: Kbps)*', re.I) rx_genre = re.compile(']+>(\w*[^<>]*)\s*]+>(\w+[^<>]+)\s*$', re.I) entries = [] html = ahttp.get("http://radiolist.net/" + self.catmap[cat]) - log.DATA(html) for block in re.findall("(.+?)", html, re.S): - log.BLOCK(block) ut = re.findall(rx_title, block) # homepage+title uu = re.findall(rx_urls, block) # urls+bitrates lg = re.findall(rx_genre, block) # location+genre #print ut, uu, lg if ut and uu and lg: - log.D(ut,uu,lg) url, br = self.best_url(uu) entries.append(dict( homepage = ut[0][0], title = unhtml(ut[0][1]), url = url,