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

Merge pull request 'master' (#1) from hummypkg/webif:master into master

Browse Source 
Reviewed-on: prpr/webif#1
This commit is contained in:
prpr 2020-10-16 21:05:30 +00:00
commit ee885a173c
5 changed files with 25 additions and 11 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 Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.4.8-9 Version: 1.4.8-10
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hpkg.tv Maintainer: af123@hpkg.tv
Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.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 Depends: tcpfix,webif-channelicons(>=1.1.27),lighttpd(>=1.4.39-1),jim(>=0.79),jim-pack(>=0.79),jim-oo(>=0.77),jim-sqlite3(>=0.77),jim-cgi(>=0.7-2),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.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

4
webif/lib/auto/deq
View File

@ -115,8 +115,8 @@ proc ::auto::dumpq {qq} {
if {[$q get action] in $::auto::plugins} { if {[$q get action] in $::auto::plugins} {
set pri $::auto::plugins([$q get action]) set pri $::auto::plugins([$q get action])
} }
log [format " C: %4d %5d %8s - [$q get file]" \ log [format " C: %4d %5d %8s - %s" \
[$q get id] $pri [$q get action]] 2 [$q get id] $pri [$q get action] [$q get file]] 2
} }
} }

5
webif/lib/auto/scan
View File

@ -73,7 +73,10 @@ if {!$::auto::force} {
set timesincelast $(([clock seconds] - [$::auto::settings autolast]) \ set timesincelast $(([clock seconds] - [$::auto::settings autolast]) \
/ 60) / 60)
if {$timesincelast < $autofreq} { if {$timesincelast < 0} {
# time machine issue: correct it
$::auto::settings autolast 0
} elseif {$timesincelast < $autofreq} {
::auto::log "Aborting, not yet time to run." 2 ::auto::log "Aborting, not yet time to run." 2
::auto::log " elapsed (minutes): $timesincelast (<$autofreq)" 2 ::auto::log " elapsed (minutes): $timesincelast (<$autofreq)" 2
exit exit

9
webif/lib/auto/util.jim
View File

@ -5,12 +5,13 @@ set ::auto::logprefix ""
set ::auto::loglevel 1 set ::auto::loglevel 1
proc ::auto::loginit {} { proc ::auto::loginit {} {
variable settings
set logsize [$settings logsize]
# Rotate log file if large enough. # Rotate log file if large enough.
if {[file exists $::auto::logfile] && if {[file exists $::auto::logfile] &&
[file size $::auto::logfile] > 2097152} { [file size $::auto::logfile] > $logsize} {
file copy -force $::auto::logfile "/mod/tmp/auto_old.log" set tstamp [clock format [clock seconds] -format {%Y%m%d%H%M%S}]
file delete $::auto::logfile file rename -force $::auto::logfile "/mod/tmp/auto.$tstamp.log"
} }
# Open log file # Open log file

16
webif/lib/rsv.class
View File

@ -967,19 +967,29 @@ proc {rsv construct} {event type} {
set args(szFPBRecPath) "$args(szevtname)" set args(szFPBRecPath) "$args(szevtname)"
set events {} set events {}
set seen {} set seen {}
set now [clock seconds]
set progs [lmap i [\ set progs [lmap i [\
epg dbfetch dump -scrid [$event get series_crid] \ epg dbfetch dump -scrid [$event get series_crid] \
-sort start] { -sort start] {
if {[set ecrid [$i get event_crid]] eq ""} continue if {[set ecrid [$i get event_crid]] eq ""} continue
if {$ecrid in $seen} continue
lappend seen $ecrid if {[$i end] < $now} {
if {[$i get start] < [$event get start]} {
set args(usLastRecordedEvtId) [$i get event_id] set args(usLastRecordedEvtId) [$i get event_id]
continue continue
} }
if {$ecrid in $seen} continue
lappend seen $ecrid
lappend events [rsv mkaul $i] lappend events [rsv mkaul $i]
list "1$::ccrid$ecrid" list "1$::ccrid$ecrid"
}] }]
# set 1st event to record
binary scan [string range [lindex $events 0] 0 15] \
iiii service_id start end event_id
#puts "$service_id $start [clock format $end] $event_id"
set args(hsvc) $service_id
set args(nsttime) $start
set args(usevtid) $event_id
set args(nduration) $($end-$start)
set args(szEventToRecord) "[join $progs "|"]|" set args(szEventToRecord) "[join $progs "|"]|"
set args(aulEventToRecordInfo) [join $events ""] set args(aulEventToRecordInfo) [join $events ""]
} }