hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

Adjust whitespace and indentation to match project

Browse Source
This commit is contained in:
HummyPkg 2020-06-03 11:19:29 +01:00
parent cd9e9924f6
commit 022e6459fc
2 changed files with 129 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webif/lib/epg.class
View File

@ -200,7 +200,9 @@ epg method scheduled {{debug 0}} {
if {$rsvlookup eq ""} {
set st [clock milliseconds]
set rsvlookup [rsv lookuptab]
if {$debug} {puts "mS $([clock milliseconds]-$st) --- $rsvlookup}
if {$debug} {
puts "mS $([clock milliseconds] - $st) --- $rsvlookup"
}
}
set p 0
@ -210,7 +212,7 @@ epg method scheduled {{debug 0}} {
[string tolower "$service_id:$channel_crid$series_crid"] \
[string tolower "$channel_crid$series_crid:$channel_crid$event_crid"] \
] {
if {$debug} {puts "Check key ($key)"}
if {$debug} { puts "Check key ($key)" }
if {[dict exists $rsvlookup $key]} {
set p $rsvlookup($key)
if {$debug} {puts "FOUND ($p)"}
@ -226,16 +228,16 @@ epg method scheduled {{debug 0}} {
default { set sched_type 0 }
}
if {$debug} {puts "SCHED_TYPE: ($sched_type)"}
if {$debug} { puts "SCHED_TYPE: ($sched_type)" }
return $sched_type
}
proc {epg update_lookup_tab} {svcid evtid {add true} {type "S"} } {
proc {epg update_lookup_tab} {svcid evtid {add true} {type "S"}} {
global rsvlookup
# Update the reservations look up table (if present) with single entry
if {$rsvlookup==""} {return}
if {$rsvlookup == ""} return
set key $svcid:$evtid
if {$add} {
# add new entry
@ -246,10 +248,9 @@ proc {epg update_lookup_tab} {svcid evtid {add true} {type "S"} } {
dict unset rsvlookup $key
}
}
#puts "$svcid:$evtid $add $type == $rsvlookup "
#puts "$svcid:$evtid $add $type == $rsvlookup"
}
epg method icon_set {{height 0}} {
if {$height > 0} { set height "height=$height" } else { set height "" }
set icon [$self type_icon]
@ -567,3 +568,4 @@ proc {epg channellist} {{field usLcn}} {
return $channels
}

39
webif/lib/rsv.class
View File

@ -312,7 +312,6 @@ rsv method iconset {{height 20}} {
return $iconlist
}
# source /df
rsv method set {ivName val} {
set $ivName $val
}
@ -346,7 +345,7 @@ rsv method set_refresh {} {
}
rsv method update_aul {new_event old_aul} {
# Add new_event (optional) to the aulEventToRecordInfo and szEventToRecord
# Add new_event (optional) to aulEventToRecordInfo and szEventToRecord
# remove old_aul (optional) from " "
# Maintain list in time order
set curauls [$self aul]
@ -361,7 +360,8 @@ rsv method update_aul {new_event old_aul} {
set end [$new_event end]
set evtid [$new_event get event_id]
set evtaul [list $service_id $start $end $evtid]
set evtcrid [string toupper "1[$new_event get channel_crid][$new_event get event_crid]"]
set evtcrid [string toupper
"1[$new_event get channel_crid][$new_event get event_crid]"]
set insert 0
}
# rebuild aul and events list with new event in correct order
@ -386,12 +386,12 @@ rsv method update_aul {new_event old_aul} {
set action 5
$self setaul [$self buildaul $newaul]
set szEventToRecord $newevnts
}
}
rsv method set_next_event {} {
# Update reservation next event info in ucVolume
if {[string length $aulEventToRecordInfo] >0} {
binary scan [string range $aulEventToRecordInfo 0 15]\
binary scan [string range $aulEventToRecordInfo 0 15] \
iiii service_id start end event_id
set dur $($end-$start)
if {$hsvc != $service_id ||
@ -410,7 +410,7 @@ rsv method set_next_event {} {
rsv method reset_next_event {} {
# Ensure our copy matches the updated reservation
if {$ucVolume!=0} {
if {$ucVolume != 0} {
lassign [split $ucVolume ":"] service_id event_id start
set hsvc $service_id
set nsttime $start
@ -783,20 +783,24 @@ proc {rsv lookuptab} {} {
set aul $rec(aulEventToRecordInfo)
if {[string length $aul]} {
for {set i 0} {$i < [string length $aul]} {incr i 16} {
binary scan [string range $aul $i $($i + 15)]\
for {set i 0} {
$i < [string length $aul]} {incr i 16} {
binary scan [string range \
$aul $i $($i + 15)] \
iiii service start end event_id
set records([\
string tolower "$service:$event_id"]) $p
set records([
string tolower \
"$service:$event_id"]) $p
}
} else {
set records([
string tolower \
"$rec(usSvcId):$rec(szCRID)"]) $p
}
}
}
} else {
set records([\
string tolower "$rec(usSvcId):$rec(szCRID)"]) $p
}
}
}
# Add all skipped epsisodes for all series
# Add all skipped episodes for all series
set skiplist [rsv _skiplist]
foreach skip $skiplist {
set records($skip) "X"
@ -1718,3 +1722,4 @@ proc {rsv reassert_skips} {{debug false}} {
rsv commit
}
}