Changes On Branch 85313637a3e4505d
Changes In Branch action-mapfmts Through [85313637a3] Excluding Merge-Ins
This is equivalent to a diff from ea628d6426 to 85313637a3
2015-04-09
| ||
14:52 | Update notes on python-requests >= 2.0.0 required now (streams=True). And fix reference to `icon.png` now. check-in: 45c45d5755 user: mario tags: trunk | |
02:51 | Use ordered list for playlist content probing. Fix listfmt() mime to abbr conversion. Allow non-http URLs for raw() extraction. check-in: babd818a96 user: mario tags: action-mapfmts | |
2015-04-08
| ||
23:32 | Consolidate listformat types to just "pls", "m3u" and "srv". Probe for direct ICY server contact in action.playlist_convert(), unify extraction methods. check-in: 85313637a3 user: mario tags: action-mapfmts | |
17:59 | Remove extraneous class wrapper action.action. Start to regroup listformat mapping (pls-url โ m3u-fn rewrites). Will need some heuristics, as depending just on the channel.listformat assumption won't work in practice (some .pls servers actually host direct server links, or occasionally .m3u references even). Currently does nothing, just returns the pls/etc URL. check-in: ea628d6426 user: mario tags: trunk | |
17:57 | Create new branch named "action-mapfmts" check-in: 320e271864 user: mario tags: action-mapfmts | |
2015-04-07
| ||
22:19 | Added some notes about "Export all" plugin. List streams#actions as topic in index.page check-in: 97bb4bbfe9 user: mario tags: trunk | |
Modified action.py from [693e44deeb] to [2ff7501bb2].
︙ | ︙ | |||
16 17 18 19 20 21 22 | # # As fallback there is a regex which just looks for URLs in the # given resource (works for m3u/pls/xspf/asx/...). import re import os | | < | | | | | | | > > | | > | < | < | | | | > | | < > > > > | > > > > > > > > > > > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 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 | # # As fallback there is a regex which just looks for URLs in the # given resource (works for m3u/pls/xspf/asx/...). import re import os from ahttp import fix_url as http_fix_url, session from config import conf, __print__ as debug, dbg import platform # Coupling to main window # main = None # Streamlink/listformat mapping listfmt_t = { "audio/x-scpls": "pls", "audio/x-mpegurl": "m3u", "video/x-ms-asf": "asx", "application/xspf+xml": "xspf", "*/*": "href", "url/direct": "srv", "url/youtube": "href", "url/http": "href", "audio/x-pn-realaudio": "ram", "application/smil": "smil", "application/vnd.ms-wpl":"smil", "x-urn/st2-script": "script", # unused } # Audio type MIME map mediafmt_t = { "audio/mpeg": "mp3", "audio/ogg": "ogg", "audio/aac" : "aac", "audio/aacp" : "aac", "audio/midi": "midi", "audio/mod": "mod", "audio/it+zip": "mod", "audio/s3+zip": "mod", "audio/xm+zip": "mod", } # Player command placeholders for playlist formats placeholder_map = dict( pls = "%url | %pls | %u | %l | %r", m3u = "%m3u | %f | %g | %m", srv = "%srv | %d | %s", ) # Playlist format content probing (assert type) playlist_content_map = { "pls": r""" (?i)\[playlist\].*numberofentries""", "xspf": r""" <\?xml .* <playlist .* http://xspf\.org/ns/0/""", "m3u": r""" #M3U""", "asx" : r""" <ASX\b""", "smil": r""" <smil[^>]*> .* <seq>""", "wpl": r""" <\?wpl \s+ version="1\.0" \s* \?>""", "jspf": r""" \{ \s* "playlist": \s* \{ """, "json": r""" "url": \s* "\w+:// """, "href": r""" .* """, } # Exec wrapper # def run(cmd): if cmd: debug(dbg.PROC, "Exec:", cmd) |
︙ | ︙ | |||
100 101 102 103 104 105 106 | cmd = mime_app(audioformat, conf.record) cmd = interpol(cmd, url, listformat, row) run(cmd) # OS shell command escaping # | | > | > > | | | > | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | cmd = mime_app(audioformat, conf.record) cmd = interpol(cmd, url, listformat, row) run(cmd) # OS shell command escaping # def quote(ins): if type(ins) is str: return "%r" % str(ins) else: return " ".join(["%r" % str(s) for s in ins]) # Convert e.g. "text/x-scpls" MIME types to just "pls" monikers # def listfmt(t = "pls"): if t in listfmt_t.values(): for short,mime in listfmt_t.items(): if mime == t: return short return t # "pls" # Convert MIME type into list of ["audio/xyz", "audio/*", "*/*"] # for comparison against configured record/play association. def mime_app(fmt, cmd_list): major = fmt[:fmt.find("/")] for match in [ fmt, major + "/*", "*/*" ]: if cmd_list.get(match): return cmd_list[match] # Replaces instances of %m3u, %pls, %srv in a command string. # ยท Also understands short aliases %l, %f, %d. |
︙ | ︙ | |||
143 144 145 146 147 148 149 | if cmd.find("%") < 0: cmd = cmd + " %m3u" # standard placeholders for dest, rx in placeholder_map.items(): if re.search(rx, cmd, re.X): # from .pls to .m3u | | | > | > > > | | | > > | > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | if cmd.find("%") < 0: cmd = cmd + " %m3u" # standard placeholders for dest, rx in placeholder_map.items(): if re.search(rx, cmd, re.X): # from .pls to .m3u urls = convert_playlist(url, listfmt(source), listfmt(dest)) # insert quoted URL/filepath return re.sub(rx, cmd, quote(urls), 2, re.X) return "false" # Substitute .pls URL with local .m3u, # or direct srv address, or leave as-is. # def convert_playlist(url, source, dest): urls = [] print(dbg.PROC, "convert_playlist(", url, source, dest, ")") # Leave alone is_url = re.search("\w+://", url) if source == dest or source in ("srv", "href") or not is_url: return [url] # Retrieve from URL (mime, cnt) = http_probe_get(url) # Leave streaming server as is if mime == "srv": cnt = "" return [url] # Test URL path "extension" for ".pls" / ".m3u" etc. ext = re.findall("\.(\w)$|($)", url)[0] # Probe MIME type and content per regex probe = None for probe,rx in playlist_content_map.items(): if re.search(rx, cnt, re.X|re.S): break # with `probe` set # Check ambiguity (except pseudo extension) if len(set([source, mime, probe])) > 1: print(dbg.ERR, "Possible playlist format mismatch:", (source, mime, probe, ext)) # Extract URLs from content for fmt,extractor in [ ("pls",extract_playlist.pls), ("asx",extract_playlist.asx), ("raw",extract_playlist.raw) ]: if not urls and fmt in (source, mime, probe, ext): urls = extractor(cnt) # Return asis for srv targets if dest in ("srv", "href", "any"): return urls print urls # Otherwise convert to local file fn = tmp_fn(cnt) save(urls[0], fn, dest) return [fn] # Tries to fetch a resource, aborts on ICY responses. # def http_probe_get(url): # possible streaming request r = session.get(url, stream=True) if not len(r.headers): return ("srv", r) # extract payload mime = r.headers.get("content-type", "any") if mediafmt_t.get(mime): mime = mediafmt_t.get(mime) content = "".join(r.iter_lines()) return (mime, content) # Extract URLs from playlist formats: # class extract_playlist(object): @staticmethod def pls(text): return re.findall("\s*File\d*\s*=\s*(\w+://[^\s]+)", text, re.I) @staticmethod def asx(text): return re.findall("<Ref\s+href=\"(http://.+?)\"", text) @staticmethod def raw(text): print(dbg.WARN, "Raw playlist extraction") return re.findall("(https?://[^\s]+)", content, re.I) # Save row(s) in one of the export formats, # depending on file extension: # # ยท m3u # ยท pls |
︙ | ︙ | |||
241 242 243 244 245 246 247 | # unknown else: return # write if txt: | | | < < < < < < < < < < < < < < < < > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | # unknown else: return # write if txt: with open(fn, "wb") as f: f.write(txt) pass # generate filename for temporary .m3u, if possible with unique id def tmp_fn(pls): # use shoutcast unique stream id if available stream_id = re.search("http://.+?/.*?(\d+)", pls, re.M) stream_id = stream_id and stream_id.group(1) or "XXXXXX" try: channelname = main.current_channel except: channelname = "unknown" return (str(conf.tmp) + os.sep + "streamtuner2."+channelname+"."+stream_id+".m3u", len(stream_id) > 3 and stream_id != "XXXXXX") # check if there are any urls in a given file def has_urls(tmp_fn): if os.path.exists(tmp_fn): return open(tmp_fn, "r").read().find("http://") > 0 |
Modified channels/__init__.py from [ae8e7ee1ba] to [f28fdd4cc1].
︙ | ︙ | |||
56 57 58 59 60 61 62 | # generic channel module --------------------------------------- class GenericChannel(object): # desc meta = { "config": [] } homepage = "http://fossil.include-once.org/streamtuner2/" base_url = "" | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | # generic channel module --------------------------------------- class GenericChannel(object): # desc meta = { "config": [] } homepage = "http://fossil.include-once.org/streamtuner2/" base_url = "" listformat = "pls" audioformat = "audio/mpeg" # fallback value config = [] has_search = False # categories categories = ["empty", ] catmap = {} |
︙ | ︙ |
Modified channels/bookmarks.py from [2e6c240bb2] to [7e6a019f1a].
︙ | ︙ | |||
36 37 38 39 40 41 42 | # class bookmarks(GenericChannel): # desc module = "bookmarks" title = "bookmarks" base_url = "file:.config/streamtuner2/bookmarks.json" | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | # class bookmarks(GenericChannel): # desc module = "bookmarks" title = "bookmarks" base_url = "file:.config/streamtuner2/bookmarks.json" listformat = "any" # content categories = ["favourite", ] # timer, links, search, and links show up as needed current = "favourite" default = "favourite" finder_song = { "genre": "Youtube ", "format": "video/youtube", "playing": "current_", "title": "The Finder song", "url": "http://youtube.com/v/omyZy4H8y9M", "homepage": "http://youtu.be/omyZy4H8y9M" } streams = {"favourite":[finder_song], "search":[], "scripts":[], "timer":[], "history":[], } |
︙ | ︙ |
Modified channels/icast.py from [9166297ac1] to [202f901cdd].
︙ | ︙ | |||
40 41 42 43 44 45 46 | # Surfmusik sharing site class icast (ChannelPlugin): # description homepage = "http://www.icast.io/" has_search = True | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | # Surfmusik sharing site class icast (ChannelPlugin): # description homepage = "http://www.icast.io/" has_search = True listformat = "pls" titles = dict(listeners=False, bitrate=False, playing=False) categories = [] base = "http://api.icast.io/1/" |
︙ | ︙ |
Modified channels/internet_radio.py from [2353be4e7b] to [c485fff9cd].
︙ | ︙ | |||
39 40 41 42 43 44 45 | class internet_radio (ChannelPlugin): # description title = "InternetRadio" module = "internet_radio" homepage = "http://www.internet-radio.org.uk/" | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | class internet_radio (ChannelPlugin): # description title = "InternetRadio" module = "internet_radio" homepage = "http://www.internet-radio.org.uk/" listformat = "pls" # category map categories = [] current = "" default = "" |
︙ | ︙ |
Modified channels/itunes.py from [fe2beb6695] to [53ab5aa446].
︙ | ︙ | |||
42 43 44 45 46 47 48 | # description title = "iTunes RS" module = "itunes" #module = "rs_playlist" homepage = "http://www.itunes.com?" has_search = False | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | # description title = "iTunes RS" module = "itunes" #module = "rs_playlist" homepage = "http://www.itunes.com?" has_search = False listformat = "pls" titles = dict(listeners=False, bitrate=False, playing=False) categories = [ "Adult Contemporary", "Alternative Rock", "Ambient", "Blues", |
︙ | ︙ |
Modified channels/jamendo.py from [00f47620eb] to [833b488235].
︙ | ︙ | |||
58 59 60 61 62 63 64 | title = "Jamendo" module = "jamendo" homepage = "http://www.jamendo.com/" version = 0.3 has_search = True base = "http://www.jamendo.com/en/" | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | title = "Jamendo" module = "jamendo" homepage = "http://www.jamendo.com/" version = 0.3 has_search = True base = "http://www.jamendo.com/en/" listformat = "srv" api_base = "http://api.jamendo.com/v3.0/" cid = "49daa4f5" categories = [] titles = dict( title="Title", playing="Album/Artist/User", bitrate=False, listeners=False ) |
︙ | ︙ |
Modified channels/live365.py from [d247abf501] to [e2484ab83b].
︙ | ︙ | |||
55 56 57 58 59 60 61 | # desc module = "live365" title = "Live365" homepage = "http://www.live365.com/" base_url = "http://www.live365.com/" has_search = True | | | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | # desc module = "live365" title = "Live365" homepage = "http://www.live365.com/" base_url = "http://www.live365.com/" has_search = True listformat = "pls" mediatype = "audio/mpeg" has_search = False # content categories = ['Alternative', 'Blues', 'Classical', 'Country', 'Easy Listening', 'Electronic/Dance', 'Folk', 'Freeform', 'Hip-Hop/Rap', 'Inspirational', 'International', 'Jazz', 'Latin', 'Metal', 'New Age', 'Oldies', 'Pop', 'R&B/Urban', 'Reggae', 'Rock', 'Seasonal/Holiday', 'Soundtracks', 'Talk'] current = "Alternative" default = "Pop" |
︙ | ︙ |
Modified channels/modarchive.py from [34fcb77755] to [499e517889].
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 | class modarchive (ChannelPlugin): # description title = "modarchive" module = "modarchive" homepage = "http://www.modarchive.org/" base = "http://modarchive.org/" titles = dict(genre="Genre", title="Song", playing="File", listeners="Rating", bitrate=0) # keeps category titles->urls catmap = {"Chiptune": "54", "Electronic - Ambient": "2", "Electronic - Other": "100", "Rock (general)": "13", "Trance - Hard": "64", "Swing": "75", "Rock - Soft": "15", "R & B": "26", "Big Band": "74", "Ska": "24", "Electronic - Rave": "65", "Electronic - Progressive": "11", "Piano": "59", "Comedy": "45", "Christmas": "72", "Chillout": "106", "Reggae": "27", "Electronic - Industrial": "34", "Grunge": "103", "Medieval": "28", "Demo Style": "55", "Orchestral": "50", "Soundtrack": "43", "Electronic - Jungle": "60", "Fusion": "102", "Electronic - IDM": "99", "Ballad": "56", "Country": "18", "World": "42", "Jazz - Modern": "31", "Video Game": "8", "Funk": "32", "Electronic - Drum & Bass": "6", "Alternative": "48", "Electronic - Minimal": "101", "Electronic - Gabber": "40", "Vocal Montage": "76", "Metal (general)": "36", "Electronic - Breakbeat": "9", "Soul": "25", "Electronic (general)": "1", "Punk": "35", "Pop - Synth": "61", "Electronic - Dance": "3", "Pop (general)": "12", "Trance - Progressive": "85", "Trance (general)": "71", "Disco": "58", "Electronic - House": "10", "Experimental": "46", "Trance - Goa": "66", "Rock - Hard": "14", "Trance - Dream": "67", "Spiritual": "47", "Metal - Extreme": "37", "Jazz (general)": "29", "Trance - Tribal": "70", "Classical": "20", "Hip-Hop": "22", "Bluegrass": "105", "Halloween": "82", "Jazz - Acid": "30", "Easy Listening": "107", "New Age": "44", "Fantasy": "52", "Blues": "19", "Other": "41", "Trance - Acid": "63", "Gothic": "38", "Electronic - Hardcore": "39", "One Hour Compo": "53", "Pop - Soft": "62", "Electronic - Techno": "7", "Religious": "49", "Folk": "21"} categories = [] | > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | class modarchive (ChannelPlugin): # description title = "modarchive" module = "modarchive" homepage = "http://www.modarchive.org/" base = "http://modarchive.org/" listformat = "href" titles = dict(genre="Genre", title="Song", playing="File", listeners="Rating", bitrate=0) # keeps category titles->urls catmap = {"Chiptune": "54", "Electronic - Ambient": "2", "Electronic - Other": "100", "Rock (general)": "13", "Trance - Hard": "64", "Swing": "75", "Rock - Soft": "15", "R & B": "26", "Big Band": "74", "Ska": "24", "Electronic - Rave": "65", "Electronic - Progressive": "11", "Piano": "59", "Comedy": "45", "Christmas": "72", "Chillout": "106", "Reggae": "27", "Electronic - Industrial": "34", "Grunge": "103", "Medieval": "28", "Demo Style": "55", "Orchestral": "50", "Soundtrack": "43", "Electronic - Jungle": "60", "Fusion": "102", "Electronic - IDM": "99", "Ballad": "56", "Country": "18", "World": "42", "Jazz - Modern": "31", "Video Game": "8", "Funk": "32", "Electronic - Drum & Bass": "6", "Alternative": "48", "Electronic - Minimal": "101", "Electronic - Gabber": "40", "Vocal Montage": "76", "Metal (general)": "36", "Electronic - Breakbeat": "9", "Soul": "25", "Electronic (general)": "1", "Punk": "35", "Pop - Synth": "61", "Electronic - Dance": "3", "Pop (general)": "12", "Trance - Progressive": "85", "Trance (general)": "71", "Disco": "58", "Electronic - House": "10", "Experimental": "46", "Trance - Goa": "66", "Rock - Hard": "14", "Trance - Dream": "67", "Spiritual": "47", "Metal - Extreme": "37", "Jazz (general)": "29", "Trance - Tribal": "70", "Classical": "20", "Hip-Hop": "22", "Bluegrass": "105", "Halloween": "82", "Jazz - Acid": "30", "Easy Listening": "107", "New Age": "44", "Fantasy": "52", "Blues": "19", "Other": "41", "Trance - Acid": "63", "Gothic": "38", "Electronic - Hardcore": "39", "One Hour Compo": "53", "Pop - Soft": "62", "Electronic - Techno": "7", "Religious": "49", "Folk": "21"} categories = [] |
︙ | ︙ |
Modified channels/myoggradio.py from [acc966f357] to [172a61f6a0].
︙ | ︙ | |||
43 44 45 46 47 48 49 | # open source radio sharing stie class myoggradio(ChannelPlugin): # settings title ="MOR" #module = "myoggradio" api = "http://www.myoggradio.org/" | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | # open source radio sharing stie class myoggradio(ChannelPlugin): # settings title ="MOR" #module = "myoggradio" api = "http://www.myoggradio.org/" listformat = "srv" # hide unused columns titles = dict(playing=False, listeners=False, bitrate=False) # category map categories = ['common', 'personal'] default = 'common' |
︙ | ︙ |
Modified channels/punkcast.py from [5c675df85e] to [eea2622232].
︙ | ︙ | |||
86 87 88 89 90 91 92 | rx_sound = re.compile("""(http://[^"<>]+[.](mp3|ogg|m3u|pls|ram))""") html = http.get(row["homepage"]) # look up ANY audio url for uu in rx_sound.findall(html): __print__( dbg.DATA, uu ) (url, fmt) = uu | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 | rx_sound = re.compile("""(http://[^"<>]+[.](mp3|ogg|m3u|pls|ram))""") html = http.get(row["homepage"]) # look up ANY audio url for uu in rx_sound.findall(html): __print__( dbg.DATA, uu ) (url, fmt) = uu action.play(url, self.mime_fmt(fmt), "srv") return # or just open webpage action.browser(row["homepage"]) |
Modified channels/radiobrowser.py from [776df88d1e] to [efa310538d].
︙ | ︙ | |||
57 58 59 60 61 62 63 | # "votes":4,"negativevotes":10}, # class radiobrowser (ChannelPlugin): # description homepage = "http://www.radio-browser.info/" has_search = True | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | # "votes":4,"negativevotes":10}, # class radiobrowser (ChannelPlugin): # description homepage = "http://www.radio-browser.info/" has_search = True listformat = "pls" titles = dict(listeners="Votes+", bitrate="Votes-", playing="Country") categories = [] pricat = ("topvote", "topclick") catmap = { "tags": "bytag", "countries": "bycountry", "languages": "bylanguage" } base = "http://www.radio-browser.info/webservice/json/" |
︙ | ︙ |
Modified channels/shoutcast.py from [05b00913ff] to [e812eed775].
︙ | ︙ | |||
50 51 52 53 54 55 56 | # class shoutcast(channels.ChannelPlugin): # desc module = "shoutcast" title = "SHOUTcast" base_url = "http://shoutcast.com/" | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | # class shoutcast(channels.ChannelPlugin): # desc module = "shoutcast" title = "SHOUTcast" base_url = "http://shoutcast.com/" listformat = "pls" # categories categories = [] catmap = {"Choral": 35, "Winter": 275, "JROCK": 306, "Motown": 237, "Political": 290, "Tango": 192, "Ska": 22, "Comedy": 283, "Decades": 212, "European": 143, "Reggaeton": 189, "Islamic": 307, "Freestyle": 114, "French": 145, "Western": 53, "Dancepunk": 6, "News": 287, "Xtreme": 23, "Bollywood": 138, "Celtic": 141, "Kids": 278, "Filipino": 144, "Hanukkah": 270, "Greek": 146, "Punk": 21, "Spiritual": 211, "Industrial": 14, "Baroque": 33, "Talk": 282, "JPOP": 227, "Scanner": 291, "Mediterranean": 154, "Swing": 174, "Themes": 89, "IDM": 75, "40s": 214, "Funk": 236, "Rap": 110, "House": 74, "Educational": 285, "Caribbean": 140, "Misc": 295, "30s": 213, "Anniversary": 266, "Sports": 293, "International": 134, "Tribute": 107, "Piano": 41, "Romantic": 42, "90s": 219, "Latin": 177, "Grunge": 10, "Dubstep": 312, "Government": 286, "Country": 44, "Salsa": 191, "Hardcore": 11, "Afrikaans": 309, "Downtempo": 69, "Merengue": 187, "Psychedelic": 260, "Female": 95, "Bop": 167, "Tribal": 80, "Metal": 195, "70s": 217, "Tejano": 193, "Exotica": 55, "Anime": 277, "BlogTalk": 296, "African": 135, "Patriotic": 101, "Blues": 24, "Turntablism": 119, "Chinese": 142, "Garage": 72, "Dance": 66, "Valentine": 273, "Barbershop": 222, "Alternative": 1, "Technology": 294, "Folk": 82, "Klezmer": 152, "Samba": 315, "Turkish": 305, "Trance": 79, "Dub": 245, "Rock": 250, "Polka": 59, "Modern": 39, "Lounge": 57, "Indian": 149, "Hindi": 148, "Brazilian": 139, "Eclectic": 93, "Korean": 153, "Creole": 316, "Dancehall": 244, "Surf": 264, "Reggae": 242, "Goth": 9, "Oldies": 226, "Zouk": 162, "Environmental": 207, "Techno": 78, "Adult": 90, "Rockabilly": 262, "Wedding": 274, "Russian": 157, "Sexy": 104, "Chill": 92, "Opera": 40, "Emo": 8, "Experimental": 94, "Showtunes": 280, "Breakbeat": 65, "Jungle": 76, "Soundtracks": 276, "LoFi": 15, "Metalcore": 202, "Bachata": 178, "Kwanzaa": 272, "Banda": 179, "Americana": 46, "Classical": 32, "German": 302, "Tamil": 160, "Bluegrass": 47, "Halloween": 269, "College": 300, "Ambient": 63, "Birthday": 267, "Meditation": 210, "Electronic": 61, "50s": 215, "Chamber": 34, "Heartache": 96, "Britpop": 3, "Soca": 158, "Grindcore": 199, "Reality": 103, "00s": 303, "Symphony": 43, "Pop": 220, "Ranchera": 188, "Electro": 71, "Christmas": 268, "Christian": 123, "Progressive": 77, "Jazz": 163, "Trippy": 108, "Instrumental": 97, "Tropicalia": 194, "Fusion": 170, "Healing": 209, "Glam": 255, "80s": 218, "KPOP": 308, "Worldbeat": 161, "Mixtapes": 117, "60s": 216, "Mariachi": 186, "Soul": 240, "Cumbia": 181, "Inspirational": 122, "Impressionist": 38, "Gospel": 129, "Disco": 68, "Arabic": 136, "Idols": 225, "Ragga": 247, "Demo": 67, "LGBT": 98, "Honeymoon": 271, "Japanese": 150, "Community": 284, "Weather": 317, "Asian": 137, "Hebrew": 151, "Flamenco": 314, "Shuffle": 105} current = "" default = "Alternative" empty = "" |
︙ | ︙ |
Modified channels/surfmusik.py from [48d1f40b6c] to [4040006a47].
︙ | ︙ | |||
42 43 44 45 46 47 48 | # Surfmusik sharing site class surfmusik (ChannelPlugin): # description title = "SurfMusik" module = "surfmusik" homepage = "http://www.surfmusik.de/" | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | # Surfmusik sharing site class surfmusik (ChannelPlugin): # description title = "SurfMusik" module = "surfmusik" homepage = "http://www.surfmusik.de/" listformat = "pls" lang = "DE" # last configured categories base = { "DE": ("http://www.surfmusik.de/", "genre/", "land/"), "EN": ("http://www.surfmusic.de/", "format/", "country/"), } |
︙ | ︙ |
Modified channels/timer.py from [e2f164442a] to [0abfc97e9b].
︙ | ︙ | |||
93 94 95 96 97 98 99 | # close dialog,get data def add_timer(self, *w): self.parent.timer_dialog.hide() row = self.parent.row() row = copy.copy(row) # add data | | | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | # close dialog,get data def add_timer(self, *w): self.parent.timer_dialog.hide() row = self.parent.row() row = copy.copy(row) # add data row["listformat"] = "href" #self.parent.channel().listformat if row.get(self.timefield): row["title"] = row["title"] + " -- " + row[self.timefield] row[self.timefield] = self.parent.timer_value.get_text() # store self.save_timer(row) |
︙ | ︙ | |||
168 169 170 171 172 173 174 | return 0 # no limit # action wrapper def play(self, row, *args, **kwargs): action.play( url = row["url"], audioformat = row.get("format","audio/mpeg"), | | | | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | return 0 # no limit # action wrapper def play(self, row, *args, **kwargs): action.play( url = row["url"], audioformat = row.get("format","audio/mpeg"), listformat = row.get("listformat","href"), ) # action wrapper def record(self, row, *args, **kwargs): #print("TIMED RECORD") # extra params duration = self.duration(row.get(self.timefield)) if duration: append = " -a %S.%d.%q -l "+str(duration*60) # make streamripper record a whole broadcast else: append = "" # start recording action.record( url = row["url"], audioformat = row.get("format","audio/mpeg"), listformat = row.get("listformat","href"), append = append, ) def test(self, row, *args, **kwargs): print("TEST KRONOS", row) |
Modified channels/tunein.py from [becae358dd] to [6f7da7eac6].
︙ | ︙ | |||
36 37 38 39 40 41 42 | class tunein (ChannelPlugin): # description title = "TuneIn" module = "tunein" homepage = "http://tunein.com/" has_search = False | | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | class tunein (ChannelPlugin): # description title = "TuneIn" module = "tunein" homepage = "http://tunein.com/" has_search = False listformat = "pls" titles = dict(listeners=False) base = "http://opml.radiotime.com/" categories = ["local", "60's", "70's", "80's", "90's", "Adult Contemporary", "Alternative Rock", "Ambient", "Bluegrass", "Blues", "Bollywood", "Children's Music", "Christmas", "Classic Hits", "Classic Rock", "Classical", "College Radio", "Country", "Decades", "Disco", "Easy Listening", "Eclectic", "Electronic", "Folk", "Hip Hop", "Indie", "Internet Only", "Jazz", "Live Music", "Oldies", "Polka", "Reggae", "Reggaeton", "Religious", "Rock", "Salsa", "Soul and R&B", "Spanish Music", "Specialty", "Tango", "Top 40/Pop", "World"] catmap = {"60's": "g407", "Live Music": "g2778", "Children's Music": "c530749", "Polka": "g84", "Tango": "g3149", "Top 40/Pop": "c57943", "90's": "g2677", "Eclectic": "g78", "Decades": "c481372", "Christmas": "g375", "Reggae": "g85", "Reggaeton": "g2771", "Oldies": "c57947", "Jazz": "c57944", "Specialty": "c418831", "Hip Hop": "c57942", "College Radio": "c100000047", "Salsa": "g124", "Bollywood": "g2762", "70's": "g92", "Country": "c57940", "Classic Hits": "g2755", "Internet Only": "c417833", "Disco": "g385", "Rock": "c57951", "Soul and R&B": "c1367173", "Blues": "g106", "Classic Rock": "g54", "Alternative Rock": "c57936", "Adult Contemporary": "c57935", "Classical": "c57939", "World": "c57954", "Indie": "g2748", "Religious": "c57950", "Bluegrass": "g63", "Spanish Music": "c57945", "Easy Listening": "c10635888", "Ambient": "g2804", "80's": "g42", "Electronic": "c57941", "Folk": "g79"} groupmap = { "music": "Browse.ashx?c=music", |
︙ | ︙ |
Modified channels/xiph.py from [747e142e4c] to [87b6bef7f2].
︙ | ︙ | |||
58 59 60 61 62 63 64 | # desc module = "xiph" title = "Xiph.org" homepage = "http://dir.xiph.org/" #xml_url = "http://dir.xiph.org/yp.xml" json_url = "http://api.include-once.org/xiph/cache.php" | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | # desc module = "xiph" title = "Xiph.org" homepage = "http://dir.xiph.org/" #xml_url = "http://dir.xiph.org/yp.xml" json_url = "http://api.include-once.org/xiph/cache.php" listformat = "srv" has_search = True # content categories = [ "pop", "top40" ] current = "" default = "pop" empty = None |
︙ | ︙ |