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

df-videomp2t-patch #9

Closed
df wants to merge 3 commits from df-videomp2t-patch into master
pull from: df-videomp2t-patch
merge into: df:master
Conversation 2 Commits 3 Files Changed 2 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ set urlbase [cgi_get base ""]
# Default to just downloading the raw file. # Default to just downloading the raw file.
set url $file set url $file
set mime "video/ts" set mime "video/mp2t"
if {[string match {*.ts} $file]} { if {[string match {*.ts} $file]} {
if {![catch {set ts [ts fetch $file]}]} { if {![catch {set ts [ts fetch $file]}]} {

7
webif/lib/system.class
View File

@ -269,7 +269,7 @@ proc {system dlnadb} {} {
} }
proc {system _dlnaurl} {file urlbase} { proc {system _dlnaurl} {file urlbase} {
set mime "video/ts" set mime "video/mp2t"
if {[catch {set db [sqlite3.open [system dlnadb]]}]} { if {[catch {set db [sqlite3.open [system dlnadb]]}]} {
return {} return {}
} }
@ -278,7 +278,10 @@ proc {system _dlnaurl} {file urlbase} {
from tblresource join tblmedia using (mediaid) from tblresource join tblmedia using (mediaid)
where localurl = '%s'} $file] where localurl = '%s'} $file]
if {[llength $muri]} { if {[llength $muri]} {
lassign [lindex $muri 0] x mime x xuri lassign [lindex $muri 0] x maybemime x xuri
if {$maybemime ne "video/ts"} {
set mime $maybemime
}
} else { } else {
# Try for partially linked entry # Try for partially linked entry
set muri [$db query { set muri [$db query {