Changeset 516 in code for trunk/msgstore_fs.go

Timestamp:

May 18, 2021, 8:44:10 AM (4 years ago)

Author:

hubert

Message:

Implement CHATHISTORY BETWEEN

File:

• trunk/msgstore_fs.go (modified) (9 diffs)

trunk/msgstore_fs.go

@@ -258 +258 @@
 }
 
-func (ms *fsMessageStore) parseMessagesBefore(network *network, entity string, ref time.Time, limit int, afterOffset int64) ([]*irc.Message, error) {
+func (ms *fsMessageStore) parseMessagesBefore(network *network, entity string, ref time.Time, end time.Time, limit int, afterOffset int64) ([]*irc.Message, error) {
         path := ms.logPath(network, entity, ref)
         f, err := os.Open(path)
@@ -285 +285 @@
                 if err != nil {
                         return nil, err
-                } else if msg == nil {
+                } else if msg == nil || !t.After(end) {
                         continue
                 } else if !t.Before(ref) {
@@ -314 +314 @@
 }
 
-func (ms *fsMessageStore) parseMessagesAfter(network *network, entity string, ref time.Time, limit int) ([]*irc.Message, error) {
+func (ms *fsMessageStore) parseMessagesAfter(network *network, entity string, ref time.Time, end time.Time, limit int) ([]*irc.Message, error) {
         path := ms.logPath(network, entity, ref)
         f, err := os.Open(path)
@@ -333 +333 @@
                 } else if msg == nil || !t.After(ref) {
                         continue
+                } else if !t.Before(end) {
+                        break
                 }
 
@@ -344 +346 @@
 }
 
-func (ms *fsMessageStore) LoadBeforeTime(network *network, entity string, t time.Time, limit int) ([]*irc.Message, error) {
+func (ms *fsMessageStore) LoadBeforeTime(network *network, entity string, start time.Time, end time.Time, limit int) ([]*irc.Message, error) {
         history := make([]*irc.Message, limit)
         remaining := limit
         tries := 0
-        for remaining > 0 && tries < fsMessageStoreMaxTries {
-                buf, err := ms.parseMessagesBefore(network, entity, t, remaining, -1)
+        for remaining > 0 && tries < fsMessageStoreMaxTries && end.Before(start) {
+                buf, err := ms.parseMessagesBefore(network, entity, start, end, remaining, -1)
                 if err != nil {
                         return nil, err
@@ -360 +362 @@
                 copy(history[remaining-len(buf):], buf)
                 remaining -= len(buf)
-                year, month, day := t.Date()
-                t = time.Date(year, month, day, 0, 0, 0, 0, t.Location()).Add(-1)
+                year, month, day := start.Date()
+                start = time.Date(year, month, day, 0, 0, 0, 0, start.Location()).Add(-1)
         }
 
@@ -367 +369 @@
 }
 
-func (ms *fsMessageStore) LoadAfterTime(network *network, entity string, t time.Time, limit int) ([]*irc.Message, error) {
+func (ms *fsMessageStore) LoadAfterTime(network *network, entity string, start time.Time, end time.Time, limit int) ([]*irc.Message, error) {
         var history []*irc.Message
         remaining := limit
         tries := 0
-        now := time.Now()
-        for remaining > 0 && tries < fsMessageStoreMaxTries && t.Before(now) {
-                buf, err := ms.parseMessagesAfter(network, entity, t, remaining)
+        for remaining > 0 && tries < fsMessageStoreMaxTries && start.Before(end) {
+                buf, err := ms.parseMessagesAfter(network, entity, start, end, remaining)
                 if err != nil {
                         return nil, err
@@ -384 +385 @@
                 history = append(history, buf...)
                 remaining -= len(buf)
-                year, month, day := t.Date()
-                t = time.Date(year, month, day+1, 0, 0, 0, 0, t.Location())
+                year, month, day := start.Date()
+                start = time.Date(year, month, day+1, 0, 0, 0, 0, start.Location())
         }
         return history, nil
@@ -421 +422 @@
                 }
 
-                buf, err := ms.parseMessagesBefore(network, entity, t, remaining, offset)
+                buf, err := ms.parseMessagesBefore(network, entity, t, time.Time{}, remaining, offset)
                 if err != nil {
                         return nil, err