From b5d60d9f408432beba430108cd0bfd35d7075766 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Mon, 7 Mar 2022 16:37:04 -0800 Subject: [PATCH] Fix linter warnings --- config/config.go | 1 + utils/utils.go | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config/config.go b/config/config.go index 601769b3e..152c17a57 100644 --- a/config/config.go +++ b/config/config.go @@ -13,6 +13,7 @@ var DatabaseFilePath = "data/owncast.db" // LogDirectory is the path to various log files. var LogDirectory = "./data/logs" +// TempDir is where we store temporary files. var TempDir = "./data/tmp" // EnableDebugFeatures will print additional data to help in debugging. diff --git a/utils/utils.go b/utils/utils.go index 15875ba05..ab40cf5c7 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -58,7 +58,7 @@ func Copy(source, destination string) error { return err } - return os.WriteFile(destination, input, 0600) + return os.WriteFile(destination, input, 0o600) } // Move moves the file at source to destination. @@ -74,18 +74,18 @@ func Move(source, destination string) error { // moveFallback moves a file using a copy followed by a delete, which works across file systems. // source: https://gist.github.com/var23rav/23ae5d0d4d830aff886c3c970b8f6c6b func moveFallback(source, destination string) error { - inputFile, err := os.Open(source) + inputFile, err := os.Open(source) // nolint: gosec if err != nil { return fmt.Errorf("Couldn't open source file: %s", err) } - outputFile, err := os.Create(destination) + outputFile, err := os.Create(destination) // nolint: gosec if err != nil { - inputFile.Close() + _ = inputFile.Close() return fmt.Errorf("Couldn't open dest file: %s", err) } defer outputFile.Close() _, err = io.Copy(outputFile, inputFile) - inputFile.Close() + _ = inputFile.Close() if err != nil { return fmt.Errorf("Writing to output file failed: %s", err) } @@ -289,7 +289,7 @@ func VerifyFFMpegPath(path string) error { mode := stat.Mode() // source: https://stackoverflow.com/a/60128480 - if mode&0111 == 0 { + if mode&0o111 == 0 { return errors.New("ffmpeg path is not executable") } @@ -302,7 +302,7 @@ func CleanupDirectory(path string) { if err := os.RemoveAll(path); err != nil { log.Fatalln("Unable to remove directory. Please check the ownership and permissions", err) } - if err := os.MkdirAll(path, 0750); err != nil { + if err := os.MkdirAll(path, 0o750); err != nil { log.Fatalln("Unable to create directory. Please check the ownership and permissions", err) } }