From a58564ff880d003a8360a0c0d21121bb5d3eb85c Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 4 Sep 2014 16:48:24 +0200 Subject: [PATCH] count directories as files (fixes #607) --- versioner/staggered.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/versioner/staggered.go b/versioner/staggered.go index aac06c2f9..9ae00abc2 100644 --- a/versioner/staggered.go +++ b/versioner/staggered.go @@ -129,7 +129,10 @@ func (v Staggered) clean() { switch mode := f.Mode(); { case mode.IsDir(): filesPerDir[path] = 0 - + if path != v.versionsPath { + dir := filepath.Dir(path) + filesPerDir[dir]++ + } case mode.IsRegular(): extension := filepath.Ext(path) dir := filepath.Dir(path) @@ -152,15 +155,17 @@ func (v Staggered) clean() { } for path, numFiles := range filesPerDir { + if numFiles > 0 { + continue + } + if path == v.versionsPath { if debug { l.Debugln("Cleaner: versions dir is empty, don't delete", path) } continue } - if numFiles > 0 { - continue - } + if debug { l.Debugln("Cleaner: deleting empty directory", path)