wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-11-24 06:30:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor file handling to use io/fs interface

Browse source 
Updated functions to use the io/fs package instead of embed.FS, making the code more flexible with respect to different filesystem implementations. Revised the method signatures and related documentation to reflect this change.
This commit is contained in:
Winni Neessen 2024-11-18 16:44:00 +01:00
parent bcc32526b7
commit b137fe4611
Signed by: wneessen
GPG key ID: 385AC9889632126E
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
msg.go
View file

@ -12,6 +12,7 @@ import (
"fmt" "fmt"
ht "html/template" ht "html/template"
"io" "io"
"io/fs"
"mime" "mime"
"net/mail" "net/mail"
"os" "os"
@ -1964,7 +1965,7 @@ func (m *Msg) AttachFromEmbedFS(name string, fs *embed.FS, opts ...FileOption) e
if fs == nil { if fs == nil {
return fmt.Errorf("embed.FS must not be nil") return fmt.Errorf("embed.FS must not be nil")
} }
file, err := fileFromEmbedFS(name, fs) file, err := fileFromIOFS(name, fs)
if err != nil { if err != nil {
return err return err
} }
@ -2110,7 +2111,7 @@ func (m *Msg) EmbedFromEmbedFS(name string, fs *embed.FS, opts ...FileOption) er
if fs == nil { if fs == nil {
return fmt.Errorf("embed.FS must not be nil") return fmt.Errorf("embed.FS must not be nil")
} }
file, err := fileFromEmbedFS(name, fs) file, err := fileFromIOFS(name, fs)
if err != nil { if err != nil {
return err return err
} }
@ -2666,15 +2667,15 @@ func (m *Msg) addDefaultHeader() {
m.SetGenHeader(HeaderMIMEVersion, string(m.mimever)) m.SetGenHeader(HeaderMIMEVersion, string(m.mimever))
} }
// fileFromEmbedFS returns a File pointer from a given file in the provided embed.FS. // fileFromIOFS returns a File pointer from a given file in the provided fs.FS.
// //
// This method retrieves a file from the embedded filesystem (embed.FS) and returns a File structure // This method retrieves a file from the provided io/fs (fs.FS) and returns a File structure
// that can be used as an attachment or embed in the email message. The file's content is read when // that can be used as an attachment or embed in the email message. The file's content is read when
// writing to an io.Writer, and the file is identified by its base name. // writing to an io.Writer, and the file is identified by its base name.
// //
// Parameters: // Parameters:
// - name: The name of the file to retrieve from the embedded filesystem. // - name: The name of the file to retrieve from the embedded filesystem.
// - fs: A pointer to the embed.FS from which the file will be opened. // - fs: An instance that satisfies the fs.FS interface
// //
// Returns: // Returns:
// - A pointer to the File structure representing the embedded file. // - A pointer to the File structure representing the embedded file.
@ -2682,8 +2683,8 @@ func (m *Msg) addDefaultHeader() {
// //
// References: // References:
// - https://datatracker.ietf.org/doc/html/rfc2183 // - https://datatracker.ietf.org/doc/html/rfc2183
func fileFromEmbedFS(name string, fs *embed.FS) (*File, error) { func fileFromIOFS(name string, iofs fs.FS) (*File, error) {
_, err := fs.Open(name) _, err := iofs.Open(name)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to open file from embed.FS: %w", err) return nil, fmt.Errorf("failed to open file from embed.FS: %w", err)
} }
@ -2691,7 +2692,7 @@ func fileFromEmbedFS(name string, fs *embed.FS) (*File, error) {
Name: filepath.Base(name), Name: filepath.Base(name),
Header: make(map[string][]string), Header: make(map[string][]string),
Writer: func(writer io.Writer) (int64, error) { Writer: func(writer io.Writer) (int64, error) {
file, err := fs.Open(name) file, err := iofs.Open(name)
if err != nil { if err != nil {
return 0, err return 0, err
} }