dandri/simplexmq
1
0 Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-10-22 19:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

xftp: fix experimental send api description paths (#683)

Browse Source
This commit is contained in:
spaced4ndy authored and GitHub committed 2023-03-10 21:06:09 +04:00
1 parent 40164ff21f
commit cf1cd75a15
2 files changed
+18 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Simplex/FileTransfer/Agent.hs
+8 -6
View File
@@ -241,17 +241,19 @@ sendFileExperimental AgentClient {subQ} _userId numRecipients xftpPath filePath
verbose = False
}
liftCLI $ cliSendFile sendOptions
(sndDescr, rcvDescrs) <- readDescrs outputDir
(sndDescr, rcvDescrs) <- readDescrs outputDir fileName
notify sndFileEntityId $ SFDONE sndDescr rcvDescrs
liftCLI :: ExceptT CLIError IO () -> m ()
liftCLI = either (throwError . INTERNAL . show) pure <=< liftIO . runExceptT
readDescrs :: FilePath -> m (String, [String])
readDescrs outDir = do
files <- listDirectory outDir
readDescrs :: FilePath -> FilePath -> m (String, [String])
readDescrs outDir fileName = do
let descrDir = outDir </> (fileName <> ".xftp")
files <- listDirectory descrDir
let (sdFiles, rdFiles) = partition ("snd.xftp.private" `isSuffixOf`) files
sdFile = maybe "" L.head (nonEmpty sdFiles)
sdFile = maybe "" (\l -> descrDir </> L.head l) (nonEmpty sdFiles)
rdFiles' = map (descrDir </>) rdFiles
-- TODO map files to contents
pure (sdFile, rdFiles)
pure (sdFile, rdFiles')
notify :: forall e. AEntityI e => SndFileId -> ACommand 'Agent e -> m ()
notify sndFileEntityId cmd = atomically $ writeTBQueue subQ ("", sndFileEntityId, APC (sAEntity @e) cmd)