diff --git a/main.go b/main.go index 63245b1..2a8d8e5 100644 --- a/main.go +++ b/main.go @@ -167,7 +167,7 @@ func processArchiveFile(path string, info os.FileInfo) { timeDeltaFormatted := time.Duration(timeDelta) * time.Millisecond log.Printf("File %s last %s at %s, %s ago", path, timeType, fileTimeFormatted, timeDeltaFormatted) - if timeDelta > constants.DELETE_THRESHOLD { + if timeDelta > constants.DELETE_THRESHOLD.Milliseconds() { log.Printf("File %s was %s more than %dms ago, deleting...", path, timeType, constants.DELETE_THRESHOLD) deleteFile(path) } @@ -249,8 +249,8 @@ type Constants struct { ROOT string ROOT_ARCHIVE string IGNORED_DIRECTORIES []string - ARCHIVE_THRESHOLD int64 - DELETE_THRESHOLD int64 + ARCHIVE_THRESHOLD time.Duration + DELETE_THRESHOLD time.Duration SCAN_INTERVAL time.Duration USE_MODTIME bool } @@ -258,7 +258,7 @@ type Constants struct { var constants = &Constants{} func main() { - log.SetFlags(log.Lmicroseconds) + log.SetFlags(log.Lmicroseconds | log.Lshortfile) // Important: Access times don’t accumulate. // This implies that archiving the file won't alter its access time. // Therefore, assign X as the ARCHIVE_TIME and X + Y as the DELETE_TIME, @@ -278,8 +278,8 @@ func main() { for key, dir := range IGNORED_DIRECTORIES { IGNORED_DIRECTORIES[key] = filepath.ToSlash(strings.TrimSpace(dir)) } - ARCHIVE_THRESHOLD := parseDuration(getEnv("ARCHIVE_THRESHOLD", "1d")) - DELETE_THRESHOLD := parseDuration(getEnv("DELETE_THRESHOLD", "12h")) + ARCHIVE_THRESHOLD := time.Duration(parseDuration(getEnv("ARCHIVE_THRESHOLD", "1d"))) * time.Millisecond + DELETE_THRESHOLD := time.Duration(parseDuration(getEnv("DELETE_THRESHOLD", "12h"))) * time.Millisecond SCAN_INTERVAL := time.Duration(parseDuration(getEnv("SCAN_INTERVAL", "1m"))) * time.Millisecond USE_MODTIME := strings.TrimSpace(getEnv("USE_MODTIME", "false")) == "true" @@ -295,8 +295,8 @@ func main() { log.Printf("ROOT: %s", ROOT) log.Printf("ROOT_ARCHIVE: %s", ROOT_ARCHIVE) log.Printf("IGNORED_DIRECTORIES: %s", IGNORED_DIRECTORIES) - log.Printf("ARCHIVE_THRESHOLD: %s", time.Duration(ARCHIVE_THRESHOLD) * time.Millisecond) - log.Printf("DELETE_THRESHOLD: %s", time.Duration(DELETE_THRESHOLD) * time.Millisecond) + log.Printf("ARCHIVE_THRESHOLD: %s", ARCHIVE_THRESHOLD) + log.Printf("DELETE_THRESHOLD: %s", DELETE_THRESHOLD) log.Printf("SCAN_INTERVAL: %s", SCAN_INTERVAL) log.Printf("USE_MODTIME: %s", strconv.FormatBool(USE_MODTIME))