From 9d5603f1e3eb1bfa2d406b76c1aa4889c2c5bd1d Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 23 Feb 2014 16:11:15 +0000 Subject: [PATCH] stop logging invalid ts file --- CONTROL/control | 4 ++-- webif/plugin/sweeper/auto.hook | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 9a8b3c9..6301992 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: sweeper Priority: optional Section: misc -Version: 1.0.9-2 +Version: 1.0.9-3 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif(>=1.0.9) -Description: Automatically manage single recording files. [Fix for recordings with unicode characters in their name] +Description: Automatically manage single recording files. [Fix for spurious Invalid TS File messages] Tags: http://hummy.tv/forum/threads/3843/ diff --git a/webif/plugin/sweeper/auto.hook b/webif/plugin/sweeper/auto.hook index 2b4b431..1fa60ad 100644 --- a/webif/plugin/sweeper/auto.hook +++ b/webif/plugin/sweeper/auto.hook @@ -191,13 +191,15 @@ proc ::sweeper:folder_merge {src dst} { if {![string match {*.ts} $e]} continue set entry "$src/$e" + log "+ Sweeper processing $entry" 2 + if {[catch {set ts [ts fetch $entry]} msg} { log "Error reading TS file, $msg" 0 continue } if {$ts == "0"} { - log "Invalid TS file." 0 + log "Invalid TS file." 2 continue } @@ -339,7 +341,7 @@ proc ::sweeper::apply {dir cf} { } if {$ts == "0"} { - log "Invalid TS file." 0 + log "Invalid TS file." 2 continue }