diff --git a/webif/cgi-bin/status.jim b/webif/cgi-bin/status.jim index dd04255..645e833 100755 --- a/webif/cgi-bin/status.jim +++ b/webif/cgi-bin/status.jim @@ -212,12 +212,8 @@ if {[llength $data]} { foreach file [array names data] { set bname [file tail $file] - set name [string map { - "/mnt/hd2/My Video/" "" - "/media/drive1/Video/" "" - "/media/" "" - ".ts" "" - } $file] + regexp {(^/(mnt/hd2/My Video|media/drive[1-9]+/Video)/)?(.*)(\.ts)?$}\ + $file _ _ _ name if {[lindex $data($file) 0] == -1} { set mode chase @@ -250,7 +246,7 @@ if {[llength $data]} { set mode $ops($file) } - regexp -- {^([^0-9]+)} $mode x mode + regexp -- {^([^0-9]+)} $mode _ mode switch $mode { chase {