Changeset 666 in code for trunk/msgstore_fs.go


Ignore:
Timestamp:
Nov 3, 2021, 3:37:01 PM (4 years ago)
Author:
contact
Message:

msgstore: take Network as arg instead of network

The message stores don't need to access the internal network
struct, they just need network metadata such as ID and name.

This can ease moving message stores into a separate package in the
future.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/msgstore_fs.go

    r665 r666  
    9595}
    9696
    97 func (ms *fsMessageStore) logPath(network *network, entity string, t time.Time) string {
     97func (ms *fsMessageStore) logPath(network *Network, entity string, t time.Time) string {
    9898        year, month, day := t.Date()
    9999        filename := fmt.Sprintf("%04d-%02d-%02d.log", year, month, day)
    … …  
    102102
    103103// nextMsgID queries the message ID for the next message to be written to f.
    104 func nextFSMsgID(network *network, entity string, t time.Time, f *os.File) (string, error) {
     104func nextFSMsgID(network *Network, entity string, t time.Time, f *os.File) (string, error) {
    105105        offset, err := f.Seek(0, io.SeekEnd)
    106106        if err != nil {
    … …  
    110110}
    111111
    112 func (ms *fsMessageStore) LastMsgID(network *network, entity string, t time.Time) (string, error) {
     112func (ms *fsMessageStore) LastMsgID(network *Network, entity string, t time.Time) (string, error) {
    113113        p := ms.logPath(network, entity, t)
    114114        fi, err := os.Stat(p)
    … …  
    121121}
    122122
    123 func (ms *fsMessageStore) Append(network *network, entity string, msg *irc.Message) (string, error) {
     123func (ms *fsMessageStore) Append(network *Network, entity string, msg *irc.Message) (string, error) {
    124124        s := formatMessage(msg)
    125125        if s == "" {
    … …  
    389389}
    390390
    391 func (ms *fsMessageStore) parseMessagesBefore(network *network, entity string, ref time.Time, end time.Time, events bool, limit int, afterOffset int64) ([]*irc.Message, error) {
     391func (ms *fsMessageStore) parseMessagesBefore(network *Network, entity string, ref time.Time, end time.Time, events bool, limit int, afterOffset int64) ([]*irc.Message, error) {
    392392        path := ms.logPath(network, entity, ref)
    393393        f, err := os.Open(path)
    … …  
    445445}
    446446
    447 func (ms *fsMessageStore) parseMessagesAfter(network *network, entity string, ref time.Time, end time.Time, events bool, limit int) ([]*irc.Message, error) {
     447func (ms *fsMessageStore) parseMessagesAfter(network *Network, entity string, ref time.Time, end time.Time, events bool, limit int) ([]*irc.Message, error) {
    448448        path := ms.logPath(network, entity, ref)
    449449        f, err := os.Open(path)
    … …  
    477477}
    478478
    479 func (ms *fsMessageStore) LoadBeforeTime(network *network, entity string, start time.Time, end time.Time, limit int, events bool) ([]*irc.Message, error) {
     479func (ms *fsMessageStore) LoadBeforeTime(network *Network, entity string, start time.Time, end time.Time, limit int, events bool) ([]*irc.Message, error) {
    480480        start = start.In(time.Local)
    481481        end = end.In(time.Local)
    … …  
    502502}
    503503
    504 func (ms *fsMessageStore) LoadAfterTime(network *network, entity string, start time.Time, end time.Time, limit int, events bool) ([]*irc.Message, error) {
     504func (ms *fsMessageStore) LoadAfterTime(network *Network, entity string, start time.Time, end time.Time, limit int, events bool) ([]*irc.Message, error) {
    505505        start = start.In(time.Local)
    506506        end = end.In(time.Local)
    … …  
    526526}
    527527
    528 func (ms *fsMessageStore) LoadLatestID(network *network, entity, id string, limit int) ([]*irc.Message, error) {
     528func (ms *fsMessageStore) LoadLatestID(network *Network, entity, id string, limit int) ([]*irc.Message, error) {
    529529        var afterTime time.Time
    530530        var afterOffset int64
    … …  
    570570}
    571571
    572 func (ms *fsMessageStore) ListTargets(network *network, start, end time.Time, limit int, events bool) ([]chatHistoryTarget, error) {
     572func (ms *fsMessageStore) ListTargets(network *Network, start, end time.Time, limit int, events bool) ([]chatHistoryTarget, error) {
    573573        start = start.In(time.Local)
    574574        end = end.In(time.Local)
    … …  
    645645}
    646646
    647 func (ms *fsMessageStore) RenameNetwork(oldNet, newNet *network) error {
     647func (ms *fsMessageStore) RenameNetwork(oldNet, newNet *Network) error {
    648648        oldDir := filepath.Join(ms.root, escapeFilename(oldNet.GetName()))
    649649        newDir := filepath.Join(ms.root, escapeFilename(newNet.GetName()))
Note: See TracChangeset for help on using the changeset viewer.