From 1feeb15d7ebe9ebe8702147f41515c261fee9b72 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Mon, 5 Oct 2015 14:03:48 +0000 Subject: [PATCH] use new system rmdir --- CONTROL/control | 4 ++-- webif/plugin/sweeper/auto.hook | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CONTROL/control b/CONTROL/control index 3927301..e91c075 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: sweeper Priority: optional Section: misc -Version: 2.0.12 +Version: 2.0.13 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif(>=1.2.4-3) +Depends: webif(>=1.2.5) Description: Sweeper is a package for managing recordings in a variety of ways using custom rules [See forum for details] Tags: http://hummy.tv/forum/threads/5138/ diff --git a/webif/plugin/sweeper/auto.hook b/webif/plugin/sweeper/auto.hook index 61ab6c3..b479d03 100644 --- a/webif/plugin/sweeper/auto.hook +++ b/webif/plugin/sweeper/auto.hook @@ -345,10 +345,9 @@ proc ::sweeper::folder_apply {dir callback args} { proc ::sweeper::rmdir_if_empty {dir} { if {$dir eq $::root} return - if {[file exists "$dir/.sweeper"]} return - if {![system rmdir_if_empty $dir]} { + if {![system rmdir_if_empty $dir ".series"]} { log "Failed to remove directory" 0 - foreach l [system rmdir_if_empty $dir 1] { + foreach l [system dirblockers $dir] { log "Blocking file: $l" 2 } }