diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim index 9d67d07..bf50c8e 100755 --- a/webif/html/browse/file.jim +++ b/webif/html/browse/file.jim @@ -156,10 +156,14 @@ if {$type eq "ts"} { puts "(Scheduled: [clock format \ [expr {[$ts get schedstart] + [$ts get scheddur]}] \ -format "%c %Z"])" + set duration [$ts duration] + set durmins [format "minute%s" $($duration == 1 ? "" : "s")] + set resume [$ts get resume] + set resmins [format "minute%s" $($resume == 1 ? "" : "s")] puts " Duration - [$ts duration] minute(s). + $duration $durmins. (Scheduled: [expr {[$ts get scheddur] / 60}]) @@ -167,8 +171,8 @@ if {$type eq "ts"} { [$ts get status] Resumes - [expr {[$ts get resume] / 60}] minutes into recording. - [progressbar $([$ts get resume] * 100 / [$ts duration 1])] + [expr {$resume / 60}] $resmins into recording. + [progressbar $($resume * 100 / [$ts duration 1])] Size diff --git a/webif/html/play/play.jim b/webif/html/play/play.jim index 8e5fc48..803aa4a 100755 --- a/webif/html/play/play.jim +++ b/webif/html/play/play.jim @@ -33,7 +33,9 @@ puts {
VLC Player } -puts "Now playing: $rfile, [$ts duration] minutes." +set duration [$ts duration] +set mins [format "minute%s" $($duration == 1 ? "" : "s")] +puts "Now playing: $rfile, $duration $mins." puts {