From 280262a7c840482be303bf62348b22bc6cc808fa Mon Sep 17 00:00:00 2001 From: Maneesh P M Date: Sat, 3 Jul 2021 16:18:45 +0530 Subject: [PATCH] fixup! Update kiwix::book to use libzim structure --- src/tools/archiveTools.cpp | 40 +------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/src/tools/archiveTools.cpp b/src/tools/archiveTools.cpp index 21959aabf..373319f3b 100644 --- a/src/tools/archiveTools.cpp +++ b/src/tools/archiveTools.cpp @@ -26,44 +26,6 @@ #include #include -inline char hi(char v) -{ - char hex[] = "0123456789abcdef"; - return hex[(v >> 4) & 0xf]; -} - -inline char lo(char v) -{ - char hex[] = "0123456789abcdef"; - return hex[v & 0xf]; -} - -std::string hexUUID(std::string in) -{ - std::ostringstream out; - for (unsigned n = 0; n < 4; ++n) { - out << hi(in[n]) << lo(in[n]); - } - out << '-'; - for (unsigned n = 4; n < 6; ++n) { - out << hi(in[n]) << lo(in[n]); - } - out << '-'; - for (unsigned n = 6; n < 8; ++n) { - out << hi(in[n]) << lo(in[n]); - } - out << '-'; - for (unsigned n = 8; n < 10; ++n) { - out << hi(in[n]) << lo(in[n]); - } - out << '-'; - for (unsigned n = 10; n < 16; ++n) { - out << hi(in[n]) << lo(in[n]); - } - std::string op = out.str(); - return op; -} - namespace kiwix { std::string getMetadata(const zim::Archive& archive, const std::string& name) { @@ -155,7 +117,7 @@ std::string getArchiveOrigId(const zim::Archive& archive) { temp += id[i]; } } - origID = hexUUID(tempArray); + origID = (std::string) zim::Uuid::generate(tempArray); return origID; }