af123/webif
1
0
Fork 0
forked from hummypkg/webif
Code Issues Pull Requests Releases Wiki Activity

Crop is failing due to double URL encode

Browse Source
This commit is contained in:
HummyPkg 2019-11-17 16:08:16 +00:00
parent 249af1b4fa
commit 38aca0d740
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -1,7 +1,7 @@
Package: webif
Priority: optional
Section: web
Version: 1.4.5
Version: 1.4.6
Architecture: mipsel
Maintainer: af123@hpkg.tv
Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.78-1),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.8),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.12-1),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

2
webif/html/browse/crop/crop.jim
View File

@ -120,7 +120,7 @@ puts "
</table>
<span class=hidden id=params
file=\"[cgi_quote_url $rfile]\"
file=\"$rfile\"
perc=\"$keepperc\"
dir=\"[cgi_quote_url $dir]\"
></span>

2
webif/html/browse/crop/execute.jim
View File

@ -14,7 +14,7 @@ if {[system inuse $rfile]} {
exit
}
set ts [ts fetch $rfile]
set ts [ts fetch_or_error $rfile]
set dir [file dirname $rfile]
set len [$ts duration 1]

8
webif/lib/ts.class
View File

@ -243,6 +243,14 @@ ts method fileset {} {
return $fset
}
proc {ts fetch_or_error} {file {checked 0}} {
if {[catch {set ts [ts fetch $file $checked]}] || $ts == 0} {
print "Could not load ts file $file"
return 0
}
return $ts
}
proc {ts fetch} {file {checked 0}} {
# Check that this is a .ts file which has at least one sidecar
# file (.hmt)