diff --git a/upload/autofile.go b/upload/autofile.go deleted file mode 100644 index 88d643bb..00000000 --- a/upload/autofile.go +++ /dev/null @@ -1,28 +0,0 @@ -package upload - -import ( - "os" -) - -// AutoDeleteFile is a wrapper around os.File that deletes the file when it is -// closed. -type AutoDeleteFile struct { - *os.File -} - -// Close implements the io.Closer interface -func (f *AutoDeleteFile) Close() error { - if err := f.File.Close(); err != nil { - return err - } - return os.Remove(f.Name()) -} - -// NewAutoDeleteFile takes a filename and wraps it in an AutoDeleteFile -func NewAutoDeleteFile(path string) (*AutoDeleteFile, error) { - f, err := os.Open(path) - if err != nil { - return nil, err - } - return &AutoDeleteFile{f}, nil -} diff --git a/upload/autofile_test.go b/upload/autofile_test.go deleted file mode 100644 index 0d11f344..00000000 --- a/upload/autofile_test.go +++ /dev/null @@ -1,57 +0,0 @@ -package upload - -import ( - "os" - "testing" -) - -func Test_NewAutoDeleteTempFile(t *testing.T) { - adFile, err := NewAutoDeleteFile(mustCreateTempFilename()) - if err != nil { - t.Fatalf("NewAutoDeleteFile() failed: %v", err) - } - defer adFile.Close() - - if _, err := os.Stat(adFile.Name()); os.IsNotExist(err) { - t.Fatalf("Expected file to exist: %s", adFile.Name()) - } -} - -func Test_AutoDeleteFile_Name(t *testing.T) { - name := mustCreateTempFilename() - adFile, err := NewAutoDeleteFile(name) - if err != nil { - t.Fatalf("NewAutoDeleteFile() failed: %v", err) - } - defer adFile.Close() - - if adFile.Name() != name { - t.Fatalf("Expected Name() to return %s, got %s", name, adFile.Name()) - } -} - -func Test_AutoDeleteFile_Close(t *testing.T) { - adFile, err := NewAutoDeleteFile(mustCreateTempFilename()) - if err != nil { - t.Fatalf("NewAutoDeleteFile() failed: %v", err) - } - filename := adFile.Name() - - err = adFile.Close() - if err != nil { - t.Fatalf("Close() failed: %v", err) - } - - if _, err := os.Stat(filename); !os.IsNotExist(err) { - t.Fatalf("Expected file to be deleted after Close(): %s", filename) - } -} - -func mustCreateTempFilename() string { - f, err := os.CreateTemp("", "autodeletefile_test") - if err != nil { - panic(err) - } - f.Close() - return f.Name() -}