Check-in [f18b5c461f]
Overview
Comment: | Major rewrite of playlist_extract handler. Now retains url and titles for playlist types that contain it. Still provides simpler urls() wrapper for old action.play/convert/interpol usage. Move probe_* functions into playlist_extract class as well. Introduce basic playlist_fmt_prio list for supported formats. (Too many regexps to probe for allowed file extensions, etc.) Add support for .url and .desktop files (import only.) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f18b5c461fbd93956b6751eb13a57987 |
User & Date: | mario on 2015-04-21 22:04:00 |
Other Links: | manifest | tags |
Context
2015-04-21
| ||
22:05 | Playlist DND import and conversion has been greatly simplified. (To the detriment of the action module now becoming more complex.) check-in: 705c7d16c2 user: mario tags: trunk | |
22:04 | Major rewrite of playlist_extract handler. Now retains url and titles for playlist types that contain it. Still provides simpler urls() wrapper for old action.play/convert/interpol usage. Move probe_* functions into playlist_extract class as well. Introduce basic playlist_fmt_prio list for supported formats. (Too many regexps to probe for allowed file extensions, etc.) Add support for .url and .desktop files (import only.) check-in: f18b5c461f user: mario tags: trunk | |
22:01 | Alias urllib*.unquote as urldecode() check-in: bd2ee4de96 user: mario tags: trunk | |
Changes
Modified action.py from [b04a438de7] to [29efeecded].
︙ | ︙ | |||
11 12 13 14 15 16 17 | # or web browser (listed as "url/http" association in players). # It maps audio MIME types, and extracts/converts playlist types # (PLS, M3U, XSPF, SMIL, JSPF, ASX, raw urls). # # Each channel plugin has a .listtype which defines the linked # audio playlist format. It's "pls", seldomly "m3u", or "xspf". # Some channels list raw "srv" addresses, while Youtube "href" | | | | | > > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | # or web browser (listed as "url/http" association in players). # It maps audio MIME types, and extracts/converts playlist types # (PLS, M3U, XSPF, SMIL, JSPF, ASX, raw urls). # # Each channel plugin has a .listtype which defines the linked # audio playlist format. It's "pls", seldomly "m3u", or "xspf". # Some channels list raw "srv" addresses, while Youtube "href" # entries point to Flash videos. # # As fallback the playlist URL is retrieved and its MIME type # checked, then its content regexped to guess the list format. # Lastly a playlist format suitable for audio players recreated. # Which is somewhat of a security feature; playlists get cleaned # up this way. The conversion is not strictly necessary for all # players, as basic PLS/M3U is supported by most. # # And finally this module is also used by exporting and (perhaps # in the future) playlist importing features (e.g. in DND hooks). # # Still needs some rewrites to transition off the [url] lists, # and work with full [rows] primarily. (And perhaps it should be # renamed to "playlist" module now). import re import os from ahttp import fix_url as http_fix_url, session from config import * import platform |
︙ | ︙ | |||
98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | ("asx" , r""" <asx\b """), ("smil", r""" <smil[^>]*> .* <seq> """), ("html", r""" (?i)<(audio|video)\b[^>]+\bsrc\s*=\s*["']?https?:// """), ("wpl", r""" <\?wpl \s+ version="1\.0" \s* \?> """), ("b4s", r""" <WinampXML> """), # http://gonze.com/playlists/playlist-format-survey.html ("jspf", r""" ^ \s* \{ \s* "playlist": \s* \{ """), ("asf", r""" ^ \[Reference\] .*? ^Ref\d+= """), ("json", r""" "url": \s* "\w+:\\?/\\?/ """), ("jamj", r""" "audio": \s* "\w+:\\?/\\?/ """), ("gvp", r""" ^gvp_version:1\.\d+$ """), ("href", r""" .* """), ] # Exec wrapper # def run(cmd): log.PROC("Exec:", cmd) | > > > > > > > | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | ("asx" , r""" <asx\b """), ("smil", r""" <smil[^>]*> .* <seq> """), ("html", r""" (?i)<(audio|video)\b[^>]+\bsrc\s*=\s*["']?https?:// """), ("wpl", r""" <\?wpl \s+ version="1\.0" \s* \?> """), ("b4s", r""" <WinampXML> """), # http://gonze.com/playlists/playlist-format-survey.html ("jspf", r""" ^ \s* \{ \s* "playlist": \s* \{ """), ("asf", r""" ^ \[Reference\] .*? ^Ref\d+= """), ("url", r""" ^ \[InternetShortcut\] .*? ^URL= """), ("desktop", r""" ^ \[Desktop Entry\] .*? ^Link= """), ("json", r""" "url": \s* "\w+:\\?/\\?/ """), ("jamj", r""" "audio": \s* "\w+:\\?/\\?/ """), ("gvp", r""" ^gvp_version:1\.\d+$ """), ("href", r""" .* """), ] # Preferred probing order of known formats playlist_fmt_prio = [ "pls", "xspf", "asx", "smil", "jamj", "json", "m3u", "asf", "raw" ] # Exec wrapper # def run(cmd): log.PROC("Exec:", cmd) |
︙ | ︙ | |||
220 221 222 223 224 225 226 | # Leave streaming server as is if mime == "srv": cnt = "" return [url] # Deduce likely content format | > | | | | < < < < < < < < < < < < < < > > | > | > > | > > > > | > > > > > > > > > > > > > > > > > > > | > > | | | | | > | > > > > | > > > > > > | > > | > > > > > | | | > > | > > > | | | > | < | | > | > | > > | > > > | | > > > > > > > > > > > > > > > | | | | | | > > | | > > > > | > > > > | > > > | > > > > | > > > > | > > > > > > > > > > > > | > > > > | > > > > > > > > > > > > > > > > | 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 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 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 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 | # Leave streaming server as is if mime == "srv": cnt = "" return [url] # Deduce likely content format cnv = extract_playlist(cnt) ext = cnv.probe_ext(url) probe = cnv.probe_fmt() # Check ambiguity (except pseudo extension) if len(set([source, mime, probe])) > 1: log.ERR("Possible playlist format mismatch:", "listformat={}, http_mime={}, rx_probe={}, ext={}".format(source, mime, probe, ext)) # Extract URLs from content for fmt in playlist_fmt_prio: if not urls and fmt in (source, mime, probe, ext, "raw"): urls = cnv.urls(fmt) log.DATA("conversion from:", source, " with extractor:", fmt, "got URLs=", urls) # Return original, or asis for srv targets if not urls: return [url] elif dest in ("srv", "href"): return urls # Otherwise convert to local file if local_file: fn, is_unique = tmp_fn(cnt, dest) with open(fn, "w") as f: log.DATA("exporting with format:", dest, " into filename:", fn) f.write( save_playlist(source="srv", multiply=True).export(urls, row, dest) ) return [fn] else: return urls # Tries to fetch a resource, aborts on ICY responses. # def http_probe_get(url): # HTTP request, abort if streaming server hit (no HTTP/ header, but ICY/ response) try: r = session.get(url, stream=True, timeout=5.0) if not len(r.headers): return ("srv", r) except: return ("srv", None) # Extract payload mime = r.headers.get("content-type", "href") mime = mime.split(";")[0].strip() # Map MIME to abbr type (pls, m3u, xspf) if listfmt_t.get(mime): mime = listfmt_t.get(mime) # Raw content (mp3, flv) elif mediafmt_t.get(mime): log.ERR("Got media MIME type for expected playlist", mime, " on url=", url) mime = mediafmt_t.get(mime) return (mime, url) # Rejoin into string content = "\n".join(str.decode(errors='replace') for str in r.iter_lines()) return (mime, content) # Extract URLs from playlist formats: # # It's entirely regex-based at the moment, because that's more # resilient against mailformed XSPF or JSON. # Needs proper extractors later for real playlist *imports*. # class extract_playlist(object): # Content of playlist file src = "" fn = "" def __init__(self, text=None, fn=None): # Literal playlist source content if text: self.src = text # Only read filename if it matches allowed extension if fn and self.probe_ext(fn): self.fn = fn self.src = open(fn, "rt").read() # Test URL/path "extension" for ".pls" / ".m3u" etc. def probe_ext(self, url): e = re.findall("\.(pls|m3u|xspf|jspf|asx|wpl|wsf|smil|html|url|json)$", url) if e: return e[0] else: pass # Probe MIME type and content per regex def probe_fmt(self): for probe,rx in playlist_content_map: if re.search(rx, self.src, re.X|re.S): return listfmt(probe) return None # Return just URL list from extracted playlist def urls(self, fmt): return [row["url"] for row in self.rows(fmt)] # Extract only URLs from given source type def rows(self, fmt=None): if not fmt: fmt = self.probe_fmt() log.DATA("input extractor/regex:", fmt, len(self.src)) # specific extractor implementations if fmt in self.__dict__: return getattr(self, fmt)() # regex scheme rules = self.extr_urls[fmt] rows = [] fields = [name for name in ("url", "title", "homepage", "genre", "playing") if rules.get(name)] # Block-wise processing if rules.get("split"): for part_src in re.split(rules["split"], self.src, re.X): row = {} for name in fields: val = self.field(name, rules, part_src) if val and val[0]: row[name] = val[0] if row.get("url"): rows.append(row) log.DATA("split-rx", rows) # Just associate each found url+title in pairs else: for name in fields: for i,val in enumerate(self.field(name, rules, self.src)): if len(rows) <= i: rows.append({"url":None}) rows[i][name] = val; log.DATA("pair-rx", rows) return self.uniq(rows) # Single field def field(self, name, rules, src_part): if name in rules: vals = re.findall(rules[name], src_part, re.X) #log.PLS_EXTR_FIELD(name, vals, src_part, rules[name]) return [self.decode(val, rules.get("unesc")) for val in vals] return [None] # Decoding def decode(self, val, unesc): if unesc in ("xml", "*"): val = xmlunescape(val) if unesc in ("json", "*"): val = val.replace("\\/", "/") return val # filter out duplicate urls def uniq(self, rows): seen = [] filtered = [] for row in rows: if not row or not row.get("url") or row.get("url") in seen: continue; seen.append(row.get("url")) filtered.append(row) return rows # These regexps only look out for URLs, not local file paths. extr_urls = { "pls": dict( url = r"(?im) ^ \s*File\d* \s*=\s* (\w+://[^\s]+) ", title = r"(?m) ^Title\d*=(.+)", # Notably this extraction method assumes the entries are grouped in associative order ), "m3u": dict( split = r"(?m) (?=^\#)", url = r"(?m) ^( \w+:// [^#\n]+ )", title = r"(?m) ^ \#EXTINF [-:\d,]* (.+)", ), "xspf": dict( split = r"(?x) <track[^>]*>", url = r"(?x) <location> (\w+://[^<>\s]+) </location> ", title = r"(?x) <title> ([^<>]+) ", homepage = r"(?x) <info> ([^<>]+) ", playing = r"(?x) <annotation> ([^<>]+) ", unesc = "xml", ), "asx": dict( split = r" (?x) <entry[^>]*> ", url = r" (?x) <ref \b[^>]+\b href \s*=\s* [\'\"] (\w+://[^\s\"\']+) [\'\"] ", title = r"(?x) <title> ([^<>]+) ", unesc = "xml", ), "smil": dict( url = r" (?x) <(?:audio|video|media)\b [^>]+ \b src \s*=\s* [^\"\']? \s* (\w+://[^\"\'\s]+) ", unesc = "xml", ), "jspf": dict( split = r"(?s) \"track\":\s*\{ >", url = r"(?s) \"location\" \s*:\s* \"(\w+://[^\"\s]+)\" ", unesc = "json", ), "jamj": dict( url = r" (?x) \"audio\" \s*:\s* \"(\w+:\\?/\\?/[^\"\s]+)\" ", title = r" (?x) \"name\" \s*:\s* \"([^\"]+)\" ", unesc = "json", ), "json": dict( url = r" (?x) \"url\" \s*:\s* \"(\w+://[^\"\s]+)\" ", title = r" (?x) \"title\" \s*:\s* \"([^\"]+)\" ", unesc = "json", ), "asf": dict( url = r" (?m) ^ \s*Ref\d+ = (\w+://[^\s]+) ", unesc = "xml", ), "url": dict( url = r"(?m) ^URL=(\w+://.+)", ), "desktop": dict( url = r"(?m) ^URL=(\w+://.+)", title = r"(?m) ^Name=(.+)", genre = r"(?m) ^Categories=(.+)", playing = r"(?m) ^Comment=(.+)", ), "raw": dict( url = r" (?i) ( [\w+]+:// [^\s\"\'\>\#]+ ) ", title = r"(?i)Title[\W]+(.+)", unesc = "*", ), } # Add placeholder fields to extracted row def mkrow(self, row, title=None): url = row.get("url", "") comb = { "title": title or re.sub("\.\w+$", "", os.path.basename(self.fn)), "playing": "", "url": None, "homepage": "", "listformat": self.probe_ext(url) or "href", "format": ",".join(re.findall("ogg|mpeg|mp\d+", url)), "genre": "copy", } comb.update(row) return comb # Save rows in one of the export formats. # # The export() version uses urls[]+row/title= as input, converts it into # a list of rows{} beforehand. # |
︙ | ︙ |