puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge branch 's3-decompress' of https://github.com/lukegb/nix

Browse source
This commit is contained in:
Eelco Dolstra 2021-04-22 10:20:40 +02:00
parent 7c90552879 97dde3cdd9
commit a6eebcff36
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libutil/compression.cc
View file

@ -186,7 +186,9 @@ struct BrotliDecompressionSink : ChunkedCompressionSink
ref<std::string> decompress(const std::string & method, const std::string & in) ref<std::string> decompress(const std::string & method, const std::string & in)
{ {
if (method == "br") { if (method == "none" || method == "")
return make_ref<std::string>(in);
else if (method == "br") {
StringSink ssink; StringSink ssink;
auto sink = makeDecompressionSink(method, ssink); auto sink = makeDecompressionSink(method, ssink);
(*sink)(in); (*sink)(in);

18
src/libutil/tests/compression.cc
View file

@ -17,6 +17,24 @@ namespace nix {
ASSERT_EQ(*o, "this-is-a-test"); ASSERT_EQ(*o, "this-is-a-test");
} }
TEST(decompress, decompressNoneCompressed) {
auto method = "none";
auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
ref<std::string> o = decompress(method, str);
ASSERT_EQ(*o, str);
}
TEST(decompress, decompressEmptyCompressed) {
// Empty-method decompression used e.g. by S3 store
// (Content-Encoding == "").
auto method = "";
auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";
ref<std::string> o = decompress(method, str);
ASSERT_EQ(*o, str);
}
TEST(decompress, decompressXzCompressed) { TEST(decompress, decompressXzCompressed) {
auto method = "xz"; auto method = "xz";
auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf"; auto str = "slfja;sljfklsa;jfklsjfkl;sdjfkl;sadjfkl;sdjf;lsdfjsadlf";