clients: persist FT download/upload msg

Author: miki

bruig/flutterui/bruig/lib/models/client.dart

@@ -82,6 +82,13 @@ class SynthChatEvent extends ChatEvent with ChangeNotifier {
 // Regexp for messages in the history about suggested KX.
 var _suggestedKXMsgRegexp = RegExp(r'Suggested KX to ([0-9a-f]{64}) "(.*)"');
 
+// Regexp for messages in the history about a completed download.
+var _completedFTDownloadMsgRegexp =
+    RegExp(r'Download completed: "(.*)" \(([0-9a-f]{64})\)');
+
+// Regexp for messages in the history about completed uploads (/ft send).
+var _sentFTUploadMsgRegexp = RegExp(r'Sent file "(.*)" \(([0-9a-f]{64})\)');
+
 class RequestedResourceEvent extends ChatEvent {
   final PagesSession session;
 
@@ -1034,9 +1041,15 @@ class ClientModel extends ChangeNotifier {
         ChatEvent m;
         var source = !mine ? c : null;
         if (chatHistory[i].internal) {
-          var matchSuggestKX = _suggestedKXMsgRegexp.firstMatch(
+          RegExpMatch? matchSuggestKX = _suggestedKXMsgRegexp.firstMatch(
             chatHistory[i].message,
           );
+          RegExpMatch? matchDownload = matchSuggestKX == null
+              ? _completedFTDownloadMsgRegexp.firstMatch(chatHistory[i].message)
+              : null;
+          RegExpMatch? matchUpload = (matchSuggestKX ?? matchDownload) == null
+              ? _sentFTUploadMsgRegexp.firstMatch(chatHistory[i].message)
+              : null;
           if (matchSuggestKX != null) {
             var targetUID = matchSuggestKX[1]!;
             var alreadyKnown = getExistingChat(targetUID) != null;
@@ -1047,6 +1060,10 @@ class ClientModel extends ChangeNotifier {
               matchSuggestKX[2]!,
               targetUID,
             );
+          } else if (matchDownload != null) {
+            m = FileDownloadedEvent(id, matchDownload[1]!);
+          } else if (matchUpload != null) {
+            m = SynthChatEvent("Sent file ${matchUpload[1]!}", SCE_sent);
           } else {
             m = SynthChatEvent(chatHistory[i].message, SCE_history);
           }

client/client_content.go

@@ -898,7 +898,9 @@ func (c *Client) handleFTPayForChunk(ru *RemoteUser, pfc rpc.RMFTPayForChunk) er
 }
 
 // handleFTGetChunkReply is called to handle received chunk data for a download.
-func (c *Client) handleFTGetChunkReply(ru *RemoteUser, gcr rpc.RMFTGetChunkReply) error {
+//
+// This is the main handler for processing download chunks in the receiver.
+func (c *Client) handleFTGetChunkReply(ru *RemoteUser, gcr rpc.RMFTGetChunkReply, ts time.Time) error {
 	var fid clientdb.FileID
 	if err := fid.FromString(gcr.FileID); err != nil {
 		return err
@@ -917,6 +919,17 @@ func (c *Client) handleFTGetChunkReply(ru *RemoteUser, gcr rpc.RMFTGetChunkReply
 
 		completedFname, err = c.db.SaveFileDownloadChunk(tx, ru.Nick(), &fd, gcr.Index, gcr.Chunk)
 		nbMissingChunks = len(c.db.MissingFileDownloadChunks(tx, &fd))
+
+		if completedFname != "" {
+			logMsg := fmt.Sprintf(clientdb.CompletedFTDownloadMsg,
+				completedFname, fd.FID)
+			_, err := c.db.LogPM(tx, ru.ID(), true, ru.Nick(),
+				logMsg, ts)
+			if err != nil {
+				return err
+			}
+		}
+
 		return err
 	})
 	if err != nil {
@@ -1047,7 +1060,15 @@ func (c *Client) SendFile(uid UserID, chunkSize uint64, filepath string,
 		return nil
 	}
 
-	ru.log.Infof("Finished sending file %s to user", filepath)
+	ru.log.Infof("Sent file %q (%s)", filepath, fileId)
+	err = c.dbUpdate(func(tx clientdb.ReadWriteTx) error {
+		logMsg := fmt.Sprintf(clientdb.SentFTUploadMsg, filepath, fileId)
+		_, err := c.db.LogPM(tx, uid, true, ru.Nick(), logMsg, time.Now())
+		return err
+	})
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

client/client_rm_handlers.go

@@ -384,7 +384,7 @@ func (c *Client) handleUserRM(ru *RemoteUser, h *rpc.RMHeader, p interface{}, ts
 		return nil
 
 	case rpc.RMFTGetChunkReply:
-		err := c.handleFTGetChunkReply(ru, p)
+		err := c.handleFTGetChunkReply(ru, p, ts)
 		c.logHandlerError(ru, h.Command, p, err)
 		return nil
 

client/clientdb/fscdb.go

@@ -100,6 +100,10 @@ var (
 	//
 	// This MUST match log messages generated by SuggestedKXLogMsg.
 	suggestedKXRegexp = regexp.MustCompile(`Suggested KX to ([0-9a-f]{64}) "(.*)"`)
+
+	CompletedFTDownloadMsg = "Download completed: %q (%s)"
+
+	SentFTUploadMsg = "Sent file %q (%s)"
 )
 
 func (db *DB) LocalID(tx ReadTx) (*zkidentity.FullIdentity, error) {