Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-18 01:57:02 +00:00
Code Issues Releases Wiki Activity

Renames, closes #69

Browse Source 
- storage: rename StoreMessage to Message
- storage: rename Message.RawReader() to Source()
This commit is contained in:
James Hillyerd
2018-03-17 17:56:06 -07:00
parent f953bcf4bb
commit 30a329c0d3
12 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/message/manager.go
View File

@@ -43,10 +43,10 @@ func (s *StoreManager) Deliver(
from string,
recipients []*policy.Recipient,
prefix string,
content []byte,
source []byte,
) (string, error) {
// TODO enmime is too heavy for this step, only need header
env, err := enmime.ReadEnvelope(bytes.NewReader(content))
env, err := enmime.ReadEnvelope(bytes.NewReader(source))
if err != nil {
return "", err
}
@@ -69,7 +69,7 @@ func (s *StoreManager) Deliver(
Date: time.Now(),
Subject: env.GetHeader("Subject"),
},
Reader: io.MultiReader(strings.NewReader(prefix), bytes.NewReader(content)),
Reader: io.MultiReader(strings.NewReader(prefix), bytes.NewReader(source)),
}
id, err := s.Store.AddMessage(delivery)
if err != nil {
@@ -110,7 +110,7 @@ func (s *StoreManager) GetMessage(mailbox, id string) (*Message, error) {
if err != nil {
return nil, err
}
r, err := sm.RawReader()
r, err := sm.Source()
if err != nil {
return nil, err
}
@@ -139,7 +139,7 @@ func (s *StoreManager) SourceReader(mailbox, id string) (io.ReadCloser, error) {
if err != nil {
return nil, err
}
return sm.RawReader()
return sm.Source()
}
// MailboxForAddress parses an email address to return the canonical mailbox name.
@@ -147,8 +147,8 @@ func (s *StoreManager) MailboxForAddress(mailbox string) (string, error) {
return policy.ParseMailboxName(mailbox)
}
// makeMetadata populates Metadata from a StoreMessage.
func makeMetadata(m storage.StoreMessage) *Metadata {
// makeMetadata populates Metadata from a storage.Message.
func makeMetadata(m storage.Message) *Metadata {
return &Metadata{
Mailbox: m.Mailbox(),
ID: m.ID(),

6
pkg/message/message.go
View File

@@ -34,7 +34,7 @@ type Delivery struct {
Reader io.Reader
}
var _ storage.StoreMessage = &Delivery{}
var _ storage.Message = &Delivery{}
// Mailbox getter.
func (d *Delivery) Mailbox() string {
@@ -71,7 +71,7 @@ func (d *Delivery) Size() int64 {
return d.Meta.Size
}
// RawReader contains the raw content of the message.
func (d *Delivery) RawReader() (io.ReadCloser, error) {
// Source contains the raw content of the message.
func (d *Delivery) Source() (io.ReadCloser, error) {
return ioutil.NopCloser(d.Reader), nil
}