From a1876e3b270a383659eaf496f122e6bbd9e9a0b8 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 26 Oct 2018 14:18:06 +0200 Subject: [PATCH 1/3] Add a method converta2toa3 to convert language code alpha2 to alpha3. Qt give use alpha2 language code but we use alpha3. --- include/common/otherTools.h | 1 + src/common/otherTools.cpp | 255 ++++++++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+) diff --git a/include/common/otherTools.h b/include/common/otherTools.h index 212567f86..ecd4ab8ab 100644 --- a/include/common/otherTools.h +++ b/include/common/otherTools.h @@ -32,6 +32,7 @@ namespace kiwix { void sleep(unsigned int milliseconds); std::string nodeToString(pugi::xml_node node); +std::string converta2toa3(const std::string& a2code); } #endif diff --git a/src/common/otherTools.cpp b/src/common/otherTools.cpp index b57add752..4472cddfe 100644 --- a/src/common/otherTools.cpp +++ b/src/common/otherTools.cpp @@ -18,6 +18,257 @@ */ #include +#include + +std::map codeisomapping { + { "af", "afg" }, + { "ax", "ala" }, + { "al", "alb" }, + { "dz", "dza" }, + { "as", "asm" }, + { "ad", "and" }, + { "ao", "ago" }, + { "ai", "aia" }, + { "aq", "ata" }, + { "ag", "atg" }, + { "ar", "arg" }, + { "am", "arm" }, + { "aw", "abw" }, + { "au", "aus" }, + { "at", "aut" }, + { "az", "aze" }, + { "bs", "bhs" }, + { "bh", "bhr" }, + { "bd", "bgd" }, + { "bb", "brb" }, + { "by", "blr" }, + { "be", "bel" }, + { "bz", "blz" }, + { "bj", "ben" }, + { "bm", "bmu" }, + { "bt", "btn" }, + { "bo", "bol" }, + { "ba", "bih" }, + { "bw", "bwa" }, + { "bv", "bvt" }, + { "br", "bra" }, + { "vg", "vgb" }, + { "io", "iot" }, + { "bn", "brn" }, + { "bg", "bgr" }, + { "bf", "bfa" }, + { "bi", "bdi" }, + { "kh", "khm" }, + { "cm", "cmr" }, + { "ca", "can" }, + { "cv", "cpv" }, + { "ky", "cym" }, + { "cf", "caf" }, + { "td", "tcd" }, + { "cl", "chl" }, + { "cn", "chn" }, + { "hk", "hkg" }, + { "mo", "mac" }, + { "cx", "cxr" }, + { "cc", "cck" }, + { "co", "col" }, + { "km", "com" }, + { "cg", "cog" }, + { "cd", "cod" }, + { "ck", "cok" }, + { "cr", "cri" }, + { "ci", "civ" }, + { "hr", "hrv" }, + { "cu", "cub" }, + { "cy", "cyp" }, + { "cz", "cze" }, + { "dk", "dnk" }, + { "dj", "dji" }, + { "dm", "dma" }, + { "do", "dom" }, + { "ec", "ecu" }, + { "eg", "egy" }, + { "sv", "slv" }, + { "gq", "gnq" }, + { "er", "eri" }, + { "ee", "est" }, + { "et", "eth" }, + { "fk", "flk" }, + { "fo", "fro" }, + { "fj", "fji" }, + { "fi", "fin" }, + { "fr", "fra" }, + { "gf", "guf" }, + { "pf", "pyf" }, + { "tf", "atf" }, + { "ga", "gab" }, + { "gm", "gmb" }, + { "ge", "geo" }, + { "de", "deu" }, + { "gh", "gha" }, + { "gi", "gib" }, + { "gr", "grc" }, + { "gl", "grl" }, + { "gd", "grd" }, + { "gp", "glp" }, + { "gu", "gum" }, + { "gt", "gtm" }, + { "gg", "ggy" }, + { "gn", "gin" }, + { "gw", "gnb" }, + { "gy", "guy" }, + { "ht", "hti" }, + { "hm", "hmd" }, + { "va", "vat" }, + { "hn", "hnd" }, + { "hu", "hun" }, + { "is", "isl" }, + { "in", "ind" }, + { "id", "idn" }, + { "ir", "irn" }, + { "iq", "irq" }, + { "ie", "irl" }, + { "im", "imn" }, + { "il", "isr" }, + { "it", "ita" }, + { "jm", "jam" }, + { "jp", "jpn" }, + { "je", "jey" }, + { "jo", "jor" }, + { "kz", "kaz" }, + { "ke", "ken" }, + { "ki", "kir" }, + { "kp", "prk" }, + { "kr", "kor" }, + { "kw", "kwt" }, + { "kg", "kgz" }, + { "la", "lao" }, + { "lv", "lva" }, + { "lb", "lbn" }, + { "ls", "lso" }, + { "lr", "lbr" }, + { "ly", "lby" }, + { "li", "lie" }, + { "lt", "ltu" }, + { "lu", "lux" }, + { "mk", "mkd" }, + { "mg", "mdg" }, + { "mw", "mwi" }, + { "my", "mys" }, + { "mv", "mdv" }, + { "ml", "mli" }, + { "mt", "mlt" }, + { "mh", "mhl" }, + { "mq", "mtq" }, + { "mr", "mrt" }, + { "mu", "mus" }, + { "yt", "myt" }, + { "mx", "mex" }, + { "fm", "fsm" }, + { "md", "mda" }, + { "mc", "mco" }, + { "mn", "mng" }, + { "me", "mne" }, + { "ms", "msr" }, + { "ma", "mar" }, + { "mz", "moz" }, + { "mm", "mmr" }, + { "na", "nam" }, + { "nr", "nru" }, + { "np", "npl" }, + { "nl", "nld" }, + { "an", "ant" }, + { "nc", "ncl" }, + { "nz", "nzl" }, + { "ni", "nic" }, + { "ne", "ner" }, + { "ng", "nga" }, + { "nu", "niu" }, + { "nf", "nfk" }, + { "mp", "mnp" }, + { "no", "nor" }, + { "om", "omn" }, + { "pk", "pak" }, + { "pw", "plw" }, + { "ps", "pse" }, + { "pa", "pan" }, + { "pg", "png" }, + { "py", "pry" }, + { "pe", "per" }, + { "ph", "phl" }, + { "pn", "pcn" }, + { "pl", "pol" }, + { "pt", "prt" }, + { "pr", "pri" }, + { "qa", "qat" }, + { "re", "reu" }, + { "ro", "rou" }, + { "ru", "rus" }, + { "rw", "rwa" }, + { "bl", "blm" }, + { "sh", "shn" }, + { "kn", "kna" }, + { "lc", "lca" }, + { "mf", "maf" }, + { "pm", "spm" }, + { "vc", "vct" }, + { "ws", "wsm" }, + { "sm", "smr" }, + { "st", "stp" }, + { "sa", "sau" }, + { "sn", "sen" }, + { "rs", "srb" }, + { "sc", "syc" }, + { "sl", "sle" }, + { "sg", "sgp" }, + { "sk", "svk" }, + { "si", "svn" }, + { "sb", "slb" }, + { "so", "som" }, + { "za", "zaf" }, + { "gs", "sgs" }, + { "ss", "ssd" }, + { "es", "esp" }, + { "lk", "lka" }, + { "sd", "sdn" }, + { "sr", "sur" }, + { "sj", "sjm" }, + { "sz", "swz" }, + { "se", "swe" }, + { "ch", "che" }, + { "sy", "syr" }, + { "tw", "twn" }, + { "tj", "tjk" }, + { "tz", "tza" }, + { "th", "tha" }, + { "tl", "tls" }, + { "tg", "tgo" }, + { "tk", "tkl" }, + { "to", "ton" }, + { "tt", "tto" }, + { "tn", "tun" }, + { "tr", "tur" }, + { "tm", "tkm" }, + { "tc", "tca" }, + { "tv", "tuv" }, + { "ug", "uga" }, + { "ua", "ukr" }, + { "ae", "are" }, + { "gb", "gbr" }, + { "us", "usa" }, + { "um", "umi" }, + { "uy", "ury" }, + { "uz", "uzb" }, + { "vu", "vut" }, + { "ve", "ven" }, + { "vn", "vnm" }, + { "vi", "vir" }, + { "wf", "wlf" }, + { "eh", "esh" }, + { "ye", "yem" }, + { "zm", "zmb" }, + { "zw", "zwe" } +}; void kiwix::sleep(unsigned int milliseconds) { @@ -43,3 +294,7 @@ std::string kiwix::nodeToString(pugi::xml_node node) node.print(writer, " "); return writer.result; } + +std::string kiwix::converta2toa3(const std::string& a2code){ + return codeisomapping.at(a2code); +} From a22f962722477fd65b0901d2233f85690e62b1bc Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 26 Oct 2018 14:18:40 +0200 Subject: [PATCH 2/3] Correctly store the size of the book in the library. `reader.getFileSize()` return ko. --- src/book.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/book.cpp b/src/book.cpp index 49318a7c6..6a173ba9c 100644 --- a/src/book.cpp +++ b/src/book.cpp @@ -87,7 +87,7 @@ void Book::update(const kiwix::Reader& reader) m_origId = reader.getOrigId(); m_articleCount = reader.getArticleCount(); m_mediaCount = reader.getMediaCount(); - m_size = reader.getFileSize(); + m_size = reader.getFileSize() << 10; reader.getFavicon(m_favicon, m_faviconMimeType); } From 2682fa8f9c7a12d9e62eda38240e2a604558708e Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 26 Oct 2018 14:19:10 +0200 Subject: [PATCH 3/3] Remove unecessary variable or output. --- src/library.cpp | 1 - src/subprocess_unix.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/library.cpp b/src/library.cpp index bd37e4127..ef1a65d1a 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -42,7 +42,6 @@ Library::~Library() bool Library::addBook(const Book& book) { /* Try to find it */ - std::vector::iterator itr; try { auto& oldbook = books.at(book.getId()); oldbook.update(book); diff --git a/src/subprocess_unix.cpp b/src/subprocess_unix.cpp index fad700353..08586f952 100644 --- a/src/subprocess_unix.cpp +++ b/src/subprocess_unix.cpp @@ -58,7 +58,6 @@ void* UnixImpl::waitForPID(void* _self) void UnixImpl::run(const commandLine_t& commandLine) { const char* binary = commandLine[0]; - std::cerr << "running " << binary << std::endl; int pid = fork(); switch(pid) { case -1: