[{"id":4034,"web_url":"https://patchwork.libcamera.org/comment/4034/","msgid":"<20200316155915.GK2260535@oden.dyn.berto.se>","date":"2020-03-16T15:59:15","subject":"Re: [libcamera-devel] [PATCH 2/8] libcamera: utils: Add string join\n\tfunction","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2020-03-14 01:38:50 +0200, Laurent Pinchart wrote:\n> Add a utils::join() function to join elements of a container into a\n> string, with a separator and an optional conversion function if the\n> elements are not implicitly convertible to std::string.\n> \n> Signed-off-by: Laurent Pinchart \n\nAre you sure we don't want python ;-P\n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/include/utils.h | 44 +++++++++++++++++++++++++++++++++++\n> src/libcamera/utils.cpp | 16 +++++++++++++\n> test/utils.cpp | 7 +++++-\n> 3 files changed, 66 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/include/utils.h b/src/libcamera/include/utils.h\n> index 940597760ee2..74ceed760cb3 100644\n> --- a/src/libcamera/include/utils.h\n> +++ b/src/libcamera/include/utils.h\n> @@ -11,6 +11,7 @@\n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> #include \n> @@ -109,6 +110,49 @@ inline _hex hex(uint64_t value, unsigned int width)\n> \n> size_t strlcpy(char *dst, const char *src, size_t size);\n> \n> +#ifndef __DOXYGEN__\n> +template\n> +std::string join(const Container &items, const std::string &sep, UnaryOp op)\n> +{\n> +\tstd::ostringstream ss;\n> +\tbool first = true;\n> +\n> +\tfor (typename Container::const_iterator it = std::begin(items);\n> +\t it != std::end(items); ++it) {\n> +\t\tif (!first)\n> +\t\t\tss << sep;\n> +\t\telse\n> +\t\t\tfirst = false;\n> +\n> +\t\tss << op(*it);\n> +\t}\n> +\n> +\treturn ss.str();\n> +}\n> +\n> +template\n> +std::string join(const Container &items, const std::string &sep)\n> +{\n> +\tstd::ostringstream ss;\n> +\tbool first = true;\n> +\n> +\tfor (typename Container::const_iterator it = std::begin(items);\n> +\t it != std::end(items); ++it) {\n> +\t\tif (!first)\n> +\t\t\tss << sep;\n> +\t\telse\n> +\t\t\tfirst = false;\n> +\n> +\t\tss << *it;\n> +\t}\n> +\n> +\treturn ss.str();\n> +}\n> +#else\n> +template\n> +std::string join(const Container &items, const std::string &sep, UnaryOp op = nullptr);\n> +#endif\n> +\n> namespace details {\n> \n> class StringSplitter\n> diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp\n> index f566e88cec5b..1d0e583756cf 100644\n> --- a/src/libcamera/utils.cpp\n> +++ b/src/libcamera/utils.cpp\n> @@ -291,6 +291,22 @@ details::StringSplitter::iterator details::StringSplitter::end() const\n> \treturn iterator(this, std::string::npos);\n> }\n> \n> +/**\n> + * \\fn template \\\n> + * std::string utils::join(const Container &items, const std::string &sep, UnaryOp op)\n> + * \\brief Join elements of a container in a string with a separator\n> + * \\param[in] items The container\n> + * \\param[in] sep The separator to add between elements\n> + * \\param[in] op A function that converts individual elements to strings\n> + *\n> + * This function joins all elements in the \\a items container into a string and\n> + * returns it. The \\a sep separator is added between elements. If the container\n> + * elements are not implicitly convertible to std::string, the \\a op function\n> + * shall be provided to perform conversion of elements to std::string.\n> + *\n> + * \\return A string that concatenates all elements in the container\n> + */\n> +\n> /**\n> * \\fn split(const std::string &str, const std::string &delim)\n> * \\brief Split a string based on a delimiter\n> diff --git a/test/utils.cpp b/test/utils.cpp\n> index 58816f153066..2fca89ef3278 100644\n> --- a/test/utils.cpp\n> +++ b/test/utils.cpp\n> @@ -99,7 +99,7 @@ protected:\n> \t\t\treturn TestFail;\n> \t\t}\n> \n> -\t\t/* utils::split() test. */\n> +\t\t/* utils::join() and utils::split() test. */\n> \t\tstd::vector elements = {\n> \t\t\t\"/bin\",\n> \t\t\t\"/usr/bin\",\n> @@ -111,6 +111,11 @@ protected:\n> \t\tfor (const auto &element : elements)\n> \t\t\tpath += (path.empty() ? \"\" : \":\") + element;\n> \n> +\t\tif (path != utils::join(elements, \":\")) {\n> +\t\t\tcerr << \"utils::join() test failed\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> \t\tstd::vector dirs;\n> \n> \t\tfor (const auto &dir : utils::split(path, \":\"))\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lf1-x135.google.com (mail-lf1-x135.google.com\n\t[IPv6:2a00:1450:4864:20::135])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 28AD26041A\n\tfor ;\n\tMon, 16 Mar 2020 16:59:18 +0100 (CET)","by mail-lf1-x135.google.com with SMTP id 5so7409998lfr.2\n\tfor ;\n\tMon, 16 Mar 2020 08:59:18 -0700 (PDT)","from localhost (h-200-138.A463.priv.bahnhof.se. [176.10.200.138])\n\tby smtp.gmail.com with ESMTPSA id\n\to144sm187470lff.91.2020.03.16.08.59.16\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 16 Mar 2020 08:59:16 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=9zW91bxQCsxPgsB/fHshaLPCNR4dp+NQJmQKhLLYwMU=;\n\tb=JbC/TVJbkRHDvJE8lrGYSqktOwUR8DFaL9e9kdOFm4Y9NPPgQg8KPC2hLukYd6h5ki\n\t3NFZAR0GvrRx0DCuSgpxjttotA3YRn7jaaf6bkYh3OvLvw+8p4Y4gwV+w5655ZneK4Uw\n\tHHRHef4g+BdeX5ssxtbX1ARcIG/NI6Mykxx/AG8pRReslETjnuBhQm6WOlfJDGURWue+\n\t56bmP8OrCbfJ/SP/Q8zIJgVYjlh7vFsKmz0OvNiR5DfaWUIZcSaxEUwxIxvsO0RAhGTP\n\tUheeuUTILE+/PQcrgK0yNU5m6nXQnZF/ZczRRBTiSERD6JtMWl1UYAnrdQyF4l8hZ29N\n\tP2CA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=9zW91bxQCsxPgsB/fHshaLPCNR4dp+NQJmQKhLLYwMU=;\n\tb=EhK8vKBRtlCJmNtO949NFvHd6hDbQgke+VHWR0IQCy/DfbD0/Jjw4wG4OrtMTahjAK\n\tmcKi7hFMOtmGRmpfNi2w/66NyGWFveR6bOV3K0kTjCwOn1QL9HRvqXX7ekMFoIDEWuzz\n\tULadzzBsryQ9GgMHHxwsuRQSAxy5BvwHizX6IGDbWJMfP53mYzE78UBx/W/PP6jwCmJX\n\t3wPccSkb5rzIc2clGUg2Uj/Qt9z9h6k2axtX7QzoGGOLQuF12QTDnz3Dd75OpDoC2hpr\n\tx+Jfyo2krjdqj39vi4503tdGbUMEOz0GFUmm130RXiPUW2GNdX7+JuRWB6UXWFIMWhTO\n\tnvzA==","X-Gm-Message-State":"ANhLgQ0beOzy7LB7e3R56wZkhVjk7IBuparklxtlQpTB19PaWDFQeXv5\n\tWjUdSiO441yoUZBwtIt3MbY+MQ==","X-Google-Smtp-Source":"ADFU+vtSolVfglBNgl9N3M5QL9SseaXO8SJRQ7O4XrBAKfWmhN/wBBfX104BBb6AkQUhlZbOlMUr5A==","X-Received":"by 2002:a19:a401:: with SMTP id q1mr36324lfc.157.1584374357214; \n\tMon, 16 Mar 2020 08:59:17 -0700 (PDT)","Date":"Mon, 16 Mar 2020 16:59:15 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org, Martijn Braam , \n\tMickael GUENE ,\n\tBenjamin GAIGNARD ","Message-ID":"<20200316155915.GK2260535@oden.dyn.berto.se>","References":"<20200313233856.25202-1-laurent.pinchart@ideasonboard.com>\n\t<20200313233856.25202-3-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200313233856.25202-3-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 2/8] libcamera: utils: Add string join\n\tfunction","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 16 Mar 2020 15:59:18 -0000"}}]