Skip to content

Remove directory name assumption in kore-rpc-client #3970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2024
Merged

Remove directory name assumption in kore-rpc-client #3970

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e854daa
Remove directory name assumption in `kore-rpc-client`
geo2a Jul 8, 2024
97ed886
Create missing parent directories when unpacking
geo2a Jul 9, 2024
5a916ae
Update comments
geo2a Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions booster/tools/rpc-client/RpcClient.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ parseMode =
maybeReader $ \s -> case split (== '=') s of [k, v] -> Just (k, v); _ -> Nothing

----------------------------------------
-- Running all requests contained in the `rpc_*` directory of a tarball
-- Running all requests contained in the subdirectories of the tarball

runTarball ::
CommonOptions ->
Expand Down Expand Up @@ -542,27 +542,25 @@ runTarball common (Just sock) tarFile keepGoing runOnly compareDetails = do
throwAnyError :: Either Tar.FormatError Tar.FileNameError -> IO a
throwAnyError = either throwIO throwIO

-- unpack all rpc_*/*.json files into dir and return their names
-- unpack all */*.json files into dir and return their names
unpackIfRpc :: FilePath -> Tar.Entry -> IO [FilePath] -> IO [FilePath]
unpackIfRpc tmpDir entry acc = do
case splitFileName (Tar.entryPath entry) of
-- unpack all directories "rpc_<something>" containing "*.json" files
-- unpack all directories "<something>" containing "*.json" files
(dir, "") -- directory
| Tar.Directory <- Tar.entryContent entry
, "rpc_" `isPrefixOf` dir -> do
createDirectoryIfMissing False dir -- create rpc dir so we can unpack files there
| Tar.Directory <- Tar.entryContent entry -> do
createDirectoryIfMissing True dir -- create rpc dir so we can unpack files there
acc -- no additional file to return
| otherwise ->
acc -- skip other directories and top-level files
(dir, file)
| "rpc_" `isPrefixOf` dir
, ".json" `isSuffixOf` file
| ".json" `isSuffixOf` file
, not ("." `isPrefixOf` file)
, Tar.NormalFile bs _size <- Tar.entryContent entry -> do
-- unpack json files into tmp directory
let newPath = dir </> file
-- current tarballs do not have dir entries, create dir here
createDirectoryIfMissing False $ tmpDir </> dir
createDirectoryIfMissing True $ tmpDir </> dir
BS.writeFile (tmpDir </> newPath) bs
(newPath :) <$> acc
| otherwise ->
Expand Down
Loading