.mc: Treat `*.m3u8` as playlists

diff --git a/.mc/mc.ext b/.mc/mc.ext
index 936c78554cc8fcbaac517272efa6f0922af86cac..ade8966223f9021b0484d91aeda7f8d6dadbeaaf 100644 (file)
--- a/.mc/mc.ext
+++ b/.mc/mc.ext
@@ -57,7 +57,7 @@ regex/\.ftplist$
    Open=%cd %p#ftplist
 
 # Play list
-regex/i/\.(m3u|pls)$
+regex/i/\.(m3u8?|pls)$
    Include=audio
 
 # Lossless audio
@@ -93,7 +93,7 @@ type/^XML *(1\.0 *)?document
 #   View=%view{ascii} unzip -v %f
 #
 include/audio
-   Open=[ "`audtool --get-volume`" -eq 0 ] && (audacious & sleep 3); audtool --playlist-clear; case %f in *.m3u) while read song; do audtool --playlist-addurl "$song"; done < %f ;; *) audtool --playlist-addurl %f ;; esac; audtool --playback-play
+   Open=[ "`audtool --get-volume`" -eq 0 ] && (audacious & sleep 3); audtool --playlist-clear; case %f in *.m3u8?) while read song; do audtool --playlist-addurl "$song"; done < %f ;; *) audtool --playlist-addurl %f ;; esac; audtool --playback-play
    #Open=mplayer %f &
    #Open=deadbeef %f &
    View=%view{ascii} cat %f
@@ -633,7 +633,7 @@ shell/i/.wma
 
 ### Play lists ###
 
-regex/i/\.(m3u|pls)$
+regex/i/\.(m3u8?|pls)$
        Open=/usr/lib/mc/ext.d/sound.sh open playlist
 
 

diff --git a/.mc/menu b/.mc/menu
index 76be4695154f5367d80cf47ff3639c9db024d70a..18340985d878c579a55316b1143c327561ebf2f3 100644 (file)
--- a/.mc/menu
+++ b/.mc/menu
@@ -132,12 +132,12 @@ I  View icon, JPEG-2000, TIFF, WebP image
 I  Identify image
    identify %f
 
-+ t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
++ t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
 a  Add the audiofile(s) or playlist(s)
    if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
    for f in %s; do
       case "$f" in
-         *.m3u) while read song; do
+         *.m3u8?) while read song; do
             audtool --playlist-addurl "$song"
          done < "$f" ;;
          *) audtool --playlist-addurl "$f" ;;
@@ -145,14 +145,14 @@ a  Add the audiofile(s) or playlist(s)
    done
    #deadbeef --queue %s &
 
-+ t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
-= t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$
++ t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
+= t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$
 p  Load the audiofile(s) or playlist(s)
    if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
    audtool --playlist-clear
    for f in %s; do
       case "$f" in
-         *.m3u) while read song; do
+         *.m3u8?) while read song; do
             audtool --playlist-addurl "$song"
          done < "$f" ;;
          *) audtool --playlist-addurl "$f" ;;
@@ -160,13 +160,13 @@ p  Load the audiofile(s) or playlist(s)
    done
    #deadbeef --queue %s &
 
-+ t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
++ t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
 P  Play the audiofile(s) or playlist(s)
    if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
    audtool --playlist-clear
    for f in %s; do
       case "$f" in
-         *.m3u) while read song; do
+         *.m3u8?) while read song; do
             audtool --playlist-addurl "$song"
          done < "$f" ;;
          *) audtool --playlist-addurl "$f" ;;
@@ -176,7 +176,7 @@ P  Play the audiofile(s) or playlist(s)
    #mplayer -playlist %f &
    #deadbeef %s &
 
-+ t lr & f \.m3u
++ t lr & f \.m3u8?
 R  Play the playlist in random order
    "$HOME"/admin/prog/audio-cdr-video/audio/shuffle-playlist.py %f random-playlist-tmp.m3u
    if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
@@ -189,7 +189,7 @@ R  Play the playlist in random order
    #deadbeef --queue random-playlist-tmp.m3u & deadbeef --play
    (sleep 5; exec rm random-playlist-tmp.m3u) &
 
-+ t lr & f \.(m3u|mp3|MP3|cue|aac|ac3|ape|dts|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$
++ t lr & f \.(m3u8?|mp3|MP3|cue|aac|ac3|ape|dts|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$
 i  Audio/video info
    exec "$HOME"/.config/mpv/mpv_identify.sh %f
 
@@ -197,30 +197,30 @@ i  Audio/video info
 i  DVD info
    exec "$HOME"/.config/mpv/mpv_identify.sh .
 
-+ f \.(aac|ac3|ape|cue|dts|flac|m3u|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
++ f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
 m  Play video file(s) with mpv
    mplayer %s &
 
-+ f \.(aac|ac3|ape|cue|dts|flac|m3u|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
++ f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
 m  Play video file(s) with mpv (loud)
    AUDIO_VOLUME=120
    export AUDIO_VOLUME
    mplayer %s &
 
-+ f \.(aac|ac3|ape|cue|dts|flac|m3u|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
-= f \.(aac|ac3|ape|cue|dts|flac|m3u|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$
++ f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
+= f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$
 m  Play video file(s) with mpv (louder)
    AUDIO_VOLUME=150
    export AUDIO_VOLUME
    mplayer %s &
 
-+ f \.(aac|ac3|ape|cue|dts|flac|m3u|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
++ f \.(aac|ac3|ape|cue|dts|flac|m3u8?|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
 m  Play video file(s) with mpv (ask for volume)
    AUDIO_VOLUME=%{Enter volume}
    export AUDIO_VOLUME
    mplayer %s &
 
-+ f \.(m3u|mp3|MP3|cue|aac|ac3|ape|dts|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
++ f \.(m3u8?|mp3|MP3|cue|aac|ac3|ape|dts|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
 M  Play audio/video with mpv GUI
    gmplayer %s &