Permalink
Browse files

Improve REGEXP

  • Loading branch information...
1 parent 529ff81 commit af2fadbd35e1fd20e7902c77e5c285a0cc3ebc14 Aldis Berjoza committed Dec 2, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 bin/playd.sh
View
@@ -33,7 +33,7 @@
# 1}}}
# project email: playd@bsdroot.lv
-readonly PLAYD_VERSION='1.18.3'
+readonly PLAYD_VERSION='1.18.4'
readonly PLAYD_NAME="${0##*/}"
readonly PLAYD_FILE_FORMATS='mp3|flac|og[agxmv]|wv|aac|mp[421a]|wav|aif[cf]?|m4[abpr]|ape|mk[av]|avi|mpf|vob|di?vx|mpga?|mov|3gp|wm[av]|midi?'
readonly PLAYD_PLAYLIST_FORMATS='plst?|m3u8?|asx|xspf|ram|qtl|wax|wpl'
@@ -308,7 +308,7 @@ playd_cat_playlist() { # {{{1
-e 's#_# #g' \
-e 's# ?- ?[0-9]{1,2} ?- ?# - #' \
-e 's#-[0-9]{2}\.# - #' \
- -e "s#\.($PLAYD_FILE_FORMATS)\$##" \
+ -e "s#\.($PLAYD_FILE_FORMATS)\$##I" \
-e 's#\| (([0-9][ -]?)?[0-9]{1,2}( - |\. |-|\.| ))?#| #' \
-e 's#\|\* (([0-9][ -]?)?[0-9]{1,2}( - |\. |-|\.| ))?#|* #' \
-e 's# [ ]*# #g' \
@@ -374,7 +374,7 @@ playd_ls() { # {{{1
-e 's#_# #g' \
-e 's# ?- ?[0-9]{1,2} ?- ?# - #' \
-e 's#-[0-9]{2}\.# - #' \
- -e "s#\.($PLAYD_FILE_FORMATS)\$##" \
+ -e "s#\.($PLAYD_FILE_FORMATS)\$##I" \
-e 's#\| (([0-9][ -]?)?[0-9]{1,2}( - |\. |-|\.| ))?#| #' \
-e "s#\|\\$POS_MARKER (([0-9][ -]?)?[0-9]{1,2}( - |\. |-|\.| ))?#|$POS_MARKER #" \
-e 's# [ ]*# #g' \

0 comments on commit af2fadb

Please sign in to comment.