core: new files protocol (#492)

src/Simplex/Chat/View.hs

@@ -93,7 +93,7 @@ responseToView testView = \case
   CRRcvFileAccepted RcvFileTransfer {fileId, senderDisplayName = c} filePath ->
     ["saving file " <> sShow fileId <> " from " <> ttyContact c <> " to " <> plain filePath]
   CRRcvFileAcceptedSndCancelled ft -> viewRcvFileSndCancelled ft
-  CRSndGroupFileCancelled fts -> viewSndGroupFileCancelled fts
+  CRSndGroupFileCancelled ftm fts -> viewSndGroupFileCancelled ftm fts
   CRRcvFileCancelled ft -> receivingFile_ "cancelled" ft
   CRUserProfileUpdated p p' -> viewUserProfileUpdated p p'
   CRContactUpdated c c' -> viewContactUpdated c c'
@@ -488,11 +488,11 @@ viewRcvFileSndCancelled :: RcvFileTransfer -> [StyledString]
 viewRcvFileSndCancelled ft@RcvFileTransfer {senderDisplayName = c} =
   [ttyContact c <> " cancelled sending " <> rcvFile ft]
 
-viewSndGroupFileCancelled :: [SndFileTransfer] -> [StyledString]
-viewSndGroupFileCancelled fts =
+viewSndGroupFileCancelled :: FileTransferMeta -> [SndFileTransfer] -> [StyledString]
+viewSndGroupFileCancelled FileTransferMeta {fileId, fileName} fts =
   case filter (\SndFileTransfer {fileStatus = s} -> s /= FSCancelled && s /= FSComplete) fts of
-    [] -> ["sending file can't be cancelled"]
-    ts@(ft : _) -> ["cancelled sending " <> sndFile ft <> " to " <> listMembers ts]
+    [] -> ["cancelled sending " <> fileTransferStr fileId fileName]
+    ts -> ["cancelled sending " <> fileTransferStr fileId fileName <> " to " <> listRecipients ts]
 
 sendingFile_ :: StyledString -> SndFileTransfer -> [StyledString]
 sendingFile_ status ft@SndFileTransfer {recipientDisplayName = c} =
@@ -533,24 +533,20 @@ fileTransferStr :: Int64 -> String -> StyledString
 fileTransferStr fileId fileName = "file " <> sShow fileId <> " (" <> ttyFilePath fileName <> ")"
 
 viewFileTransferStatus :: (FileTransfer, [Integer]) -> [StyledString]
-viewFileTransferStatus (FTSnd [ft@SndFileTransfer {fileStatus, fileSize, chunkSize}], chunksNum) =
-  ["sending " <> sndFile ft <> " " <> sndStatus]
-  where
-    sndStatus = case fileStatus of
-      FSNew -> "not accepted yet"
-      FSAccepted -> "just started"
-      FSConnected -> "progress " <> fileProgress chunksNum chunkSize fileSize
-      FSComplete -> "complete"
-      FSCancelled -> "cancelled"
-viewFileTransferStatus (FTSnd [], _) = ["no file transfers (empty group)"]
-viewFileTransferStatus (FTSnd fts@(ft : _), chunksNum) =
-  case concatMap membersTransferStatus $ groupBy ((==) `on` fs) $ sortOn fs fts of
-    [membersStatus] -> ["sending " <> sndFile ft <> " " <> membersStatus]
-    membersStatuses -> ("sending " <> sndFile ft <> ": ") : map ("  " <>) membersStatuses
+viewFileTransferStatus (FTSnd FileTransferMeta {fileId, fileName, cancelled} [], _) =
+  [ "sending " <> fileTransferStr fileId fileName <> ": no file transfers"
+      <> if cancelled then ", file transfer cancelled" else ""
+  ]
+viewFileTransferStatus (FTSnd FileTransferMeta {cancelled} fts@(ft : _), chunksNum) =
+  recipientStatuses <> ["file transfer cancelled" | cancelled]
   where
+    recipientStatuses =
+      case concatMap recipientsTransferStatus $ groupBy ((==) `on` fs) $ sortOn fs fts of
+        [recipientsStatus] -> ["sending " <> sndFile ft <> " " <> recipientsStatus]
+        recipientsStatuses -> ("sending " <> sndFile ft <> ": ") : map ("  " <>) recipientsStatuses
     fs = fileStatus :: SndFileTransfer -> FileStatus
-    membersTransferStatus [] = []
-    membersTransferStatus ts@(SndFileTransfer {fileStatus, fileSize, chunkSize} : _) = [sndStatus <> ": " <> listMembers ts]
+    recipientsTransferStatus [] = []
+    recipientsTransferStatus ts@(SndFileTransfer {fileStatus, fileSize, chunkSize} : _) = [sndStatus <> ": " <> listRecipients ts]
       where
         sndStatus = case fileStatus of
           FSNew -> "not accepted"
@@ -568,8 +564,8 @@ viewFileTransferStatus (FTRcv ft@RcvFileTransfer {fileId, fileInvitation = FileI
       RFSComplete RcvFileInfo {filePath} -> "complete, path: " <> plain filePath
       RFSCancelled RcvFileInfo {filePath} -> "cancelled, received part path: " <> plain filePath
 
-listMembers :: [SndFileTransfer] -> StyledString
-listMembers = mconcat . intersperse ", " . map (ttyContact . recipientDisplayName)
+listRecipients :: [SndFileTransfer] -> StyledString
+listRecipients = mconcat . intersperse ", " . map (ttyContact . recipientDisplayName)
 
 fileProgress :: [Integer] -> Integer -> Integer -> StyledString
 fileProgress chunksNum chunkSize fileSize =
@@ -622,6 +618,7 @@ viewChatError = \case
     SEDuplicateContactLink -> ["you already have chat address, to show: " <> highlight' "/sa"]
     SEUserContactLinkNotFound -> ["no chat address, to create: " <> highlight' "/ad"]
     SEContactRequestNotFoundByName c -> ["no contact request from " <> ttyContact c]
+    SEFileIdNotFoundBySharedMsgId _ -> [] -- recipient tried to accept cancelled file
     SEConnectionNotFound _ -> [] -- TODO mutes delete group error, but also mutes any error from getConnectionEntity
     SEQuotedChatItemNotFound -> ["message not found - reply is not sent"]
     e -> ["chat db error: " <> sShow e]