diff --git a/cmd/apply_lut.go b/cmd/apply_lut.go index dde7886..f9a258f 100644 --- a/cmd/apply_lut.go +++ b/cmd/apply_lut.go @@ -4,7 +4,6 @@ import ( "bufio" "fmt" "image/jpeg" - "io/ioutil" "os" "path/filepath" "regexp" @@ -103,7 +102,7 @@ var applyLutCmd = &cobra.Command{ } if stat.IsDir() { - files, err := ioutil.ReadDir(input) + files, err := os.ReadDir(input) if err != nil { cui.Error(err.Error()) } diff --git a/cmd/calendar.go b/cmd/calendar.go index 943afe3..055ab24 100644 --- a/cmd/calendar.go +++ b/cmd/calendar.go @@ -1,7 +1,6 @@ package cmd import ( - "io/ioutil" "os" "path/filepath" "strconv" @@ -38,7 +37,7 @@ func splitSliceInChunks(a []string, chuckSize int) [][]string { func getModDates(input string) ([]time.Time, error) { modificationDates := []time.Time{} - items, err := ioutil.ReadDir(input) + items, err := os.ReadDir(input) if err != nil { return nil, err } @@ -50,7 +49,11 @@ func getModDates(input string) ([]time.Time, error) { } modificationDates = append(modificationDates, m...) } else { - fileDate := item.ModTime() + fileInfo, err := item.Info() + if err != nil { + return nil, err + } + fileDate := fileInfo.ModTime() parsedDate := time.Date(fileDate.Year(), fileDate.Month(), fileDate.Day(), 0, 0, 0, 0, fileDate.Location()) if !slices.Contains(modificationDates, parsedDate) { modificationDates = append(modificationDates, parsedDate) diff --git a/cmd/export_tags.go b/cmd/export_tags.go index de0c1cc..114eb6c 100644 --- a/cmd/export_tags.go +++ b/cmd/export_tags.go @@ -4,7 +4,6 @@ import ( "encoding/csv" "encoding/json" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -101,7 +100,7 @@ var exportTags = &cobra.Command{ } if stat.IsDir() { - files, err := ioutil.ReadDir(input) + files, err := os.ReadDir(input) if err != nil { cui.Error(err.Error()) } diff --git a/pkg/android/android.go b/pkg/android/android.go index eed5049..985e07c 100644 --- a/pkg/android/android.go +++ b/pkg/android/android.go @@ -2,7 +2,6 @@ package android import ( "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -31,7 +30,7 @@ var ( ) func prepare(out string, deviceFileName string, deviceModel string, mediaDate string, sortOptions utils.SortOptions, deviceFileReader io.ReadCloser, progressBar *mpb.Progress) (*mpb.Bar, string, error) { - localFile, err := ioutil.TempFile(out, deviceFileName) + localFile, err := os.CreateTemp(out, deviceFileName) if err != nil { return nil, "", err } diff --git a/pkg/dji/dji.go b/pkg/dji/dji.go index ea876c7..59a8f32 100644 --- a/pkg/dji/dji.go +++ b/pkg/dji/dji.go @@ -1,7 +1,6 @@ package dji import ( - "io/ioutil" "log" "os" "path/filepath" @@ -69,7 +68,7 @@ func (Entrypoint) Import(params utils.ImportParams) (*utils.Result, error) { root := filepath.Join(params.Input, "DCIM") var result utils.Result - folders, err := ioutil.ReadDir(root) + folders, err := os.ReadDir(root) if err != nil { result.Errors = append(result.Errors, err) return &result, nil diff --git a/pkg/dji/location.go b/pkg/dji/location.go index 024791d..7a4279d 100644 --- a/pkg/dji/location.go +++ b/pkg/dji/location.go @@ -3,7 +3,6 @@ package dji import ( "bufio" "io" - "io/ioutil" "os" "regexp" "strconv" @@ -58,7 +57,7 @@ func fromSRT(srtPath string) (*utils.Location, error) { defer fs.Close() reader := bufio.NewReader(fs) limitedSizeReader := io.LimitReader(reader, 2048) - content, err := ioutil.ReadAll(limitedSizeReader) + content, err := io.ReadAll(limitedSizeReader) if err != nil { return nil, err } diff --git a/pkg/dji/location_test.go b/pkg/dji/location_test.go index 84749e9..ff26b36 100644 --- a/pkg/dji/location_test.go +++ b/pkg/dji/location_test.go @@ -3,7 +3,6 @@ package dji import ( "context" "fmt" - "io/ioutil" "os" "strings" "testing" @@ -38,7 +37,7 @@ func TestParseSRT(t *testing.T) { remoteFile, err := fs.Open(walk.Path()) require.NoError(t, err) - localFile, err := ioutil.TempFile(".", walk.Path()) + localFile, err := os.CreateTemp(".", walk.Path()) require.NoError(t, err) defer os.Remove(localFile.Name()) diff --git a/pkg/gopro/gopro.go b/pkg/gopro/gopro.go index ef04097..96ef03a 100644 --- a/pkg/gopro/gopro.go +++ b/pkg/gopro/gopro.go @@ -4,7 +4,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "log" "os" "path/filepath" @@ -129,7 +128,7 @@ func importFromGoProV2(params utils.ImportParams) utils.Result { fileTypes := FileTypeMatches[V2] var result utils.Result - folders, err := ioutil.ReadDir(params.Input) + folders, err := os.ReadDir(params.Input) if err != nil { result.Errors = append(result.Errors, err) return result @@ -307,7 +306,7 @@ func importFromGoProV1(params utils.ImportParams) utils.Result { fileTypes := FileTypeMatches[V1] var result utils.Result - folders, err := ioutil.ReadDir(params.Input) + folders, err := os.ReadDir(params.Input) if err != nil { result.Errors = append(result.Errors, err) return result diff --git a/pkg/gopro/location_test.go b/pkg/gopro/location_test.go index 5ab5e8c..470f246 100644 --- a/pkg/gopro/location_test.go +++ b/pkg/gopro/location_test.go @@ -3,7 +3,6 @@ package gopro import ( "context" "fmt" - "io/ioutil" "os" "testing" @@ -46,7 +45,7 @@ func TestParseGPMF(t *testing.T) { remoteFile, err := fs.Open(walk.Path()) require.NoError(t, err) - localFile, err := ioutil.TempFile(".", walk.Path()) + localFile, err := os.CreateTemp(".", walk.Path()) require.NoError(t, err) defer os.Remove(localFile.Name()) diff --git a/pkg/gopro/mp4parse.go b/pkg/gopro/mp4parse.go index feca6b5..41834ba 100644 --- a/pkg/gopro/mp4parse.go +++ b/pkg/gopro/mp4parse.go @@ -27,7 +27,7 @@ func (*HMMT) GetType() mp4.BoxType { func (h *HMMT) GetFieldLength(name string, ctx mp4.Context) uint { _ = name _ = ctx - return uint(h.Count) + return uint(h.Count) //nolint:gosec // signed to unsigned is fine. } func GetHiLights(path string) (*HiLights, error) { diff --git a/pkg/insta360/insta360.go b/pkg/insta360/insta360.go index 7a786cb..d894405 100644 --- a/pkg/insta360/insta360.go +++ b/pkg/insta360/insta360.go @@ -3,7 +3,6 @@ package insta360 import ( "bytes" "fmt" - "io/ioutil" "log" "os" "path/filepath" @@ -66,7 +65,7 @@ func (Entrypoint) Import(params utils.ImportParams) (*utils.Result, error) { root := filepath.Join(params.Input, "DCIM") var result utils.Result - folders, err := ioutil.ReadDir(root) + folders, err := os.ReadDir(root) if err != nil { result.Errors = append(result.Errors, err) return &result, nil diff --git a/pkg/videomanipulation/ffmpeg.go b/pkg/videomanipulation/ffmpeg.go index 858f6da..7672328 100644 --- a/pkg/videomanipulation/ffmpeg.go +++ b/pkg/videomanipulation/ffmpeg.go @@ -2,7 +2,7 @@ package videomanipulation import ( "fmt" - "io/ioutil" + "io" "log" "os" "path/filepath" @@ -68,7 +68,7 @@ func (v *VMan) merge(output string, bar *mpb.Bar, ffConfig FFConfig, videos ...s ffConfig.InArgs = append(ffConfig.InArgs, []string{"-hwaccel", "cuda"}...) } - file, err := ioutil.TempFile(filepath.Dir(videos[0]), "filelist.*.txt") + file, err := os.CreateTemp(filepath.Dir(videos[0]), "filelist.*.txt") if err != nil { log.Fatal(err) } @@ -174,7 +174,7 @@ func (v *VMan) ExtractGPMF(input string) (*[]byte, error) { defer wg.Done() defer r.Close() - data, err := ioutil.ReadAll(r) + data, err := io.ReadAll(r) extractData <- data extractError <- err }()