Check-in [4c8fadb925]
Overview
| Comment: | Workaround for file:/// paths on windows with mixed driver letters and backslashes. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
4c8fadb925dba48ac40e0d2e75e06ce7 |
| User & Date: | Oliver on 2016-12-23 21:31:22 |
| Other Links: | manifest | tags |
Context
|
2016-12-23
| ||
| 21:33 | Fix missing url: plugin meta. Display bitrate and length. Fix more mutagen extraction faults. check-in: 3c3ec8e447 user: Oliver tags: trunk | |
| 21:31 | Workaround for file:/// paths on windows with mixed driver letters and backslashes. check-in: 4c8fadb925 user: Oliver tags: trunk | |
|
2016-12-19
| ||
| 20:17 | New plugin: rcast check-in: 40eb70e68c user: mario tags: trunk | |
Changes
Modified action.py from [078f11948a] to [93aa08299f].
| ︙ | ︙ | |||
255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 |
if add_default and cmd.find("%") < 0:
cmd = cmd + " %pls"
# "pls" as default requires no conversion for most channels, and seems broadly supported by players
# Playlist type placeholders (%pls, %m3u, %xspf, etc.)
for dest, rx in placeholder_map.items():
rx = "(?<!%%)%s\\b" % rx
if re.search(rx, cmd, re.X):
# no conversion
if conf.playlist_asis:
url = row["url"]
# e.g. from .m3u to .pls
else:
url = convert_playlist(row["url"], listfmt(source), listfmt(dest), local_file=True, row=row)
# insert quoted URL/filepath
| > > > | > > > | 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 |
if add_default and cmd.find("%") < 0:
cmd = cmd + " %pls"
# "pls" as default requires no conversion for most channels, and seems broadly supported by players
# Playlist type placeholders (%pls, %m3u, %xspf, etc.)
for dest, rx in placeholder_map.items():
rx = "(?<!%%)%s\\b" % rx
# rx = '(?!"\a"|"\n")%s\\b' % rx
if re.search(rx, cmd, re.X):
# no conversion
if conf.playlist_asis:
url = row["url"]
# e.g. from .m3u to .pls
else:
url = convert_playlist(row["url"], listfmt(source), listfmt(dest), local_file=True, row=row)
# insert quoted URL/filepath
#return re.sub(rx, quote(url), cmd.replace("%%", "%"), 2, re.X)
if conf.windows:
return re.sub(rx, quote(url), cmd.replace("%%", "%"), 2, re.X)
else:
return re.sub(rx, quote(url).replace("\\", "/"), cmd.replace("%%", "%"), 2, re.X)
if not add_default:
return cmd
else:
return "/bin/false"
|
| ︙ | ︙ |