shinyoukai/marisa
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide more info with partage-trash verbose mode

Browse Source 
git-svn-id: file:///srv/svn/repo/marisa/trunk@55 d6811dac-2434-b64a-9ddc-f563ab233461
This commit is contained in:
dev
2021-10-26 16:04:39 +00:00
parent f68d6af453
commit c7687232ef
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
partage-trash/partage-trash.go
View File

@@ -24,6 +24,7 @@ var conf struct {
var verbose bool var verbose bool
var count int64 var count int64
var deleted int64
var size int64 var size int64
func readmeta(filename string) (metadata, error) { func readmeta(filename string) (metadata, error) {
@@ -52,16 +53,22 @@ func checkexpiry(path string, info os.FileInfo, err error) error {
now := time.Now().Unix() now := time.Now().Unix()
count++
if meta.Expiry > 0 && now >= meta.Expiry { if meta.Expiry > 0 && now >= meta.Expiry {
if verbose { if verbose {
expiration := humanize.Time(time.Unix(meta.Expiry, 0)) expiration := humanize.Time(time.Unix(meta.Expiry, 0))
log.Printf("%s/%s expired %s\n", conf.filepath, meta.Filename, expiration) log.Printf("%s/%s: expired %s\n", conf.filepath, meta.Filename, expiration)
} }
os.Remove(conf.filepath + "/" + meta.Filename) os.Remove(conf.filepath + "/" + meta.Filename)
os.Remove(path) os.Remove(path)
deleted++
return nil return nil
} else { } else {
count++ if verbose {
expiration := humanize.Time(time.Unix(meta.Expiry, 0))
log.Printf("%s/%s: expire %s\n", conf.filepath, meta.Filename, expiration)
}
size += meta.Size size += meta.Size
} }
@@ -81,6 +88,6 @@ func main() {
} }
if verbose && count > 0 { if verbose && count > 0 {
log.Printf("%d file(s) remain on disk (total: %s)", count, humanize.IBytes(uint64(size))) log.Printf("%d/%d file(s) deleted (remaining: %s)", deleted, count, humanize.IBytes(uint64(size)))
} }
} }