Check-in [3dde6b82b2]
Overview
Comment: | Jamendo browser disabled, only shows fixed list of radio stations now. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
3dde6b82b2979cf303ffdc68419d17d5 |
User & Date: | mario on 2014-04-28 00:42:25 |
Other Links: | manifest | tags |
Context
2014-04-28
| ||
00:42 | include bundle/* in src package check-in: 53a3607d70 user: mario tags: trunk | |
00:42 | Jamendo browser disabled, only shows fixed list of radio stations now. check-in: 3dde6b82b2 user: mario tags: trunk | |
00:19 | Adapted DMOZ retrieval to changed HTML check-in: a44d5a6e74 user: mario tags: trunk | |
Changes
Modified channels/jamendo.py from [9d3d3ac039] to [e56bcf3be6].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | # api: streamtuner2 # title: jamendo browser # # For now this is really just a browser, doesn't utilizt the jamendo API yet. # Requires more rework of streamtuner2 list display to show album covers. # import re import ahttp as http from config import conf from channels import * from xml.sax.saxutils import unescape | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | # api: streamtuner2 # title: jamendo browser # # For now this is really just a browser, doesn't utilizt the jamendo API yet. # Requires more rework of streamtuner2 list display to show album covers. # # Recently required an API key as well. Thus probably will remain a stub. # # import re import ahttp as http from config import conf from channels import * from xml.sax.saxutils import unescape |
︙ | ︙ | |||
61 62 63 64 65 66 67 | #-- categories tags = [] for uu in rx_current.findall(html): (href, title) = uu tags.append(title) self.categories = [ | < | > > > > > > > > > > > > > > > > > > > | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | #-- categories tags = [] for uu in rx_current.findall(html): (href, title) = uu tags.append(title) self.categories = [ "radios", # "tags", tags ] # download links from dmoz listing def update_streams(self, cat, force=0): entries = [] # return a static list for now if cat == "radios": entries = [ {"title": "Pop", "url": "http://streaming.radionomy.com/JamPop", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Rock", "url": "http://streaming.radionomy.com/JamRock", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Lounge", "url": "http://streaming.radionomy.com/JamLounge", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Electro", "url": "http://streaming.radionomy.com/JamElectro", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "HipHop", "url": "http://streaming.radionomy.com/JamHipHop", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "World", "url": "http://streaming.radionomy.com/JamWorld", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Jazz", "url": "http://streaming.radionomy.com/JamJazz", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Metal", "url": "http://streaming.radionomy.com/JamMetal", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Soundtrack", "url": "http://streaming.radionomy.com/JamSoundtrack", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Relaxation", "url": "http://streaming.radionomy.com/JamRelaxation", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, {"title": "Classical", "url": "http://streaming.radionomy.com/JamClassical", "playing": "", "format": "audio/mpeg", "homepage": "http://www.jamendo.com/en/radios"}, ] return entries # top list if cat == "top" or cat == "top 100": html = http.get(self.base + "top") rx_top = re.compile(""" <img[^>]+src="(http://imgjam.com/albums/[\w\d]+/\d+/covers/1.\d+.jpg)" |
︙ | ︙ | |||
95 96 97 98 99 100 101 | "homepage": track, "url": self.track_url(track_id, conf.jamendo_stream_format), "favicon": self.cover(cover), "format": self.stream_mime(), }) | < < < < < < < < < < < < < | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | "homepage": track, "url": self.track_url(track_id, conf.jamendo_stream_format), "favicon": self.cover(cover), "format": self.stream_mime(), }) # genre list else: html = http.get(self.base + "tag/" + cat) rx_tag = re.compile(""" <a\s+title="([^"]+)\s*-\s*([^"]+)" \s+href="(http://www.jamendo.com/\w+/album/(\d+))"\s*> |
︙ | ︙ |