This commit is contained in:
hummypkg 2013-09-05 19:05:31 +00:00
parent ad72f6ceb1
commit 97aef7f162
2 changed files with 9 additions and 8 deletions

View File

@ -1,8 +1,8 @@
Package: sweeper
Priority: optional
Section: misc
Version: 1.0.5
Version: 1.0.6
Architecture: mipsel
Maintainer: af123@hummypkg.org.uk
Depends: webif(>=1.0.5-3)
Depends: webif(>=1.0.5-5)
Description: Automatically manage single recording files.

View File

@ -115,6 +115,7 @@ proc ::sweeper::lock {ts g} {
log "Unlocked recording." 0
$ts unlock
}
return 1
}
######################################################################
@ -148,8 +149,8 @@ proc ::sweeper::action {ts cmds} {
foreach f [$ts fileset] {
log " ....... $f"
file rename $f "$root/$rest/[file tail $f]"
if {$rest ni $::sweeper::recalc} {
lappend ::sweeper::recalc $rest
if {"$root/$rest" ni $::sweeper::recalc} {
lappend ::sweeper::recalc "$root/$rest"
}
}
return 1
@ -203,8 +204,7 @@ proc ::sweeper:folder_merge {src dst} {
file rename $f "$dst/[file tail $f]"
}
}
file delete "$src/.series"
if {[catch {file delete $src} msg]} {
if {![system rmdir_if_empty $src]} {
log "Failed to remove directory: $msg" 0
}
if {$dst ni $::sweeper::recalc} {
@ -236,8 +236,8 @@ proc ::sweeper::folder_action {ts cmds} {
if {$target eq "" || ![file isdirectory $target]} {
log "Did not find directory." 2
if {$cmd ne "fileundercreate"} { return 1 }
log "Creating..." 2
set target "$root/$rest/$lfolder"
log "Creating $target" 0
system mkdir_p $target
}
::sweeper:folder_merge $folder $target
@ -390,7 +390,8 @@ proc ::sweeper::apply {dir cf} {
}
foreach dir $::sweeper::recalc {
ts resetnew "$::root/$dir"
log "Resetting unwatched recording flag for $dir" 0
ts resetnew $dir
}
}