dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-03-30 16:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hostStore path and check before removing (#3375)

Browse Source
This commit is contained in:
Alexander Bondarenko
2023-11-15 17:57:29 +02:00
committed by GitHub
parent b71daed3ec
commit a75fce8dfa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Simplex/Chat/Remote.hs
View File

@@ -70,7 +70,7 @@ import Simplex.RemoteControl.Types
import System.FilePath (takeFileName, (</>))
import UnliftIO
import UnliftIO.Concurrent (forkIO)
import UnliftIO.Directory (copyFile, createDirectoryIfMissing, removeDirectoryRecursive, renameFile)
import UnliftIO.Directory (copyFile, createDirectoryIfMissing, doesDirectoryExist, removeDirectoryRecursive, renameFile)
-- when acting as host
minRemoteCtrlVersion :: AppVersion
@@ -279,11 +279,11 @@ remoteHostInfo RemoteHost {remoteHostId, storePath, hostDeviceName} sessionState
deleteRemoteHost :: ChatMonad m => RemoteHostId -> m ()
deleteRemoteHost rhId = do
RemoteHost {storePath} <- withStore (`getRemoteHost` rhId)
chatReadVar filesFolder >>= \case
chatReadVar remoteHostsFolder >>= \case
Just baseDir -> do
let hostStore = baseDir </> storePath
logInfo $ "removing host store at " <> tshow hostStore
removeDirectoryRecursive $ hostStore
whenM (doesDirectoryExist hostStore) $ removeDirectoryRecursive hostStore
Nothing -> logWarn "Local file store not available while deleting remote host"
withStore' (`deleteRemoteHostRecord` rhId)