Update to 1.5.2-10

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.5.2-9
+Version: 1.5.2-10
 Architecture: mipsel
 Maintainer: prpr
 Depends: tcpfix,webif-channelicons(>=1.2.4),lighttpd(>=1.4.39-1),jim(>=0.81-3),jim-cgi(>=0.7-2),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),hmt(>=2.0.11),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.13),webif-charts(>=1.2-1),stripts(>=1.4.2),tmenu(>=1.21-2),ffmpeg(>=2.8),id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.98),sqlite3(>=3.15.1),jim-xconv,zip(>=3.0-1),wget

webif/html/browse/ffmpeg.jim

@@ -6,4 +6,11 @@ source /mod/webif/lib/setup
 httpheader
 
 set file [cgi_get file]
-puts [exec /mod/bin/ffprobe -hide_banner $file]
+set log ""
+catch {set log [exec /mod/bin/ffprobe -hide_banner -v level $file]}
+set log [lsearch -all -regexp -inline [split $log "\n"] "^\\\[info\\\]"]
+if {[regsub -all -line -- "^\\\[info\\\]" [join $log "\n"] "" log]} {
+	puts $log
+} else {
+	puts None
+}

webif/html/browse/file.jim

@@ -185,41 +185,41 @@ if {$ts != 0} {
 	<th>Size</th>
 	<td>$sz</td>
 "
-lassign [$ts dlnaloc] url
-if {$url ne ""} {
+	lassign [$ts dlnaloc] url
+	if {$url ne ""} {
 	puts "</tr><tr><th>DLNA&nbsp;URL</th>
-	   <td><a href=\"$url\">$url</a></td>"
+	    <td><a href=\"$url\">$url</a></td>"
 }
-puts "
+	puts "
 </tr><tr>
 	<th>Files</th>
 	<td>
 "
 
-set fileset [$ts fileset]
-puts -nonewline "<img class=collapser x=fileset id=xfileset class=va
+	set fileset [$ts fileset]
+	puts -nonewline "<img class=collapser x=fileset id=xfileset class=va
 	src=/img/tree/plusonly.png>"
-puts -nonewline "[llength $fileset] file"
-if {[llength $fileset] != 1} { puts -nonewline "s" }
-puts -nonewline " in set."
-puts "<div id=fileset class=hidden><ul>"
-foreach f $fileset {
-	puts "<li>[file tail $f] ([pretty_size [file size $f]])</li>" 
-}
-puts "</ul></div>"
+	puts -nonewline "[llength $fileset] file"
+	if {[llength $fileset] != 1} { puts -nonewline "s" }
+	puts -nonewline " in set."
+	puts "<div id=fileset class=hidden><ul>"
+	foreach f $fileset {
+		puts "<li>[file tail $f] ([pretty_size [file size $f]])</li>" 
+	}
+	puts "</ul></div>"
 
-puts "</td></tr>"
+	puts "</td></tr>"
 
-eval_plugins browsetsfile
+	eval_plugins browsetsfile
 
-puts "<tr>
+	puts "<tr>
 	<th>Flags</th>
 	<td>[set flags [$ts get flags]]</td>
 </tr>
 "
 
-if {[$ts get bookmarks]} {
-	puts "
+	if {[$ts get bookmarks]} {
+		puts "
 <tr>
 	<th>Bookmarks</th>
 	<td>[$ts get bookmarks] @ [join [lmap i [$ts bookmarks 1] {
@@ -228,10 +228,10 @@ if {[$ts get bookmarks]} {
 	</td>
 </tr>
 "
-}
+	}
 
-puts "<div class=hidden id=file>$file</div>"
-puts {
+	puts "<div class=hidden id=file>$file</div>"
+	puts {
 <script type=text/javascript>
 var file = $('#file').text();
 $('button').button();
@@ -267,7 +267,7 @@ $('img.rollimg').hover(
 );
 
 </script>
-}
+	}
 
 } else {
 # Otherwise, for a general file.
@@ -283,23 +283,23 @@ $('img.rollimg').hover(
 </tr>"
 }
 
+set hasffmpeg 0
+
 proc ffinfo {} {
 	puts "<tr>
-	<th>Info</th>
-	<td class=pre id=ffmpeg>
-		<img src=/img/spin.gif><i>Loading...</i>
-	</td>
-</tr>"
+	<th>Info</th>"
+	if {$::hasffmpeg} {
+		puts "	<td class=pre id=ffmpeg>
+	<img src=/img/spin.gif><i>Loading...</i>
+	</td>"
+	} else {
+		puts "<td>Encrypted</td>"
+	}
+	puts "</tr>"
 }
 
 
-set hasffmpeg 0
 if {$type eq "ts"} {
-	if {"ODEncrypted" ni $flags && $url eq ""} {
-		ffinfo
-		set hasffmpeg 1
-	}
-
 	if {$url ne ""} {
 		puts [format { 
 			<script type="text/javascript"> 
@@ -307,8 +307,14 @@ if {$type eq "ts"} {
 			</script> } $url]
 	}
 } elseif {$type ne "bad"} {
+	if {[string tolower [file extension $file]] != ".ts"} {
+		set hasffmpeg 1
+	} else {
+		if {![exec /mod/bin/stripts -qE [file rootname $file]]} {
+			set hasffmpeg 1
+		}
+	}
 	ffinfo
-	set hasffmpeg 1
 }
 
 puts "

webif/lib/ts.class

@@ -261,9 +261,7 @@ proc {ts fetch} {file {checked 0}} {
 	if {!$checked} {
 		if {[file extension $file] ne ".ts"} { return 0 }
 		if {![file exists "[file rootname $file].hmt"]} { return 0 }
-	}
-
-	if {[file extension $file] ne ".ts"} {
+	} elseif {[file extension $file] ne ".ts"} {
 		set file "[file rootname $file].ts"
 	}