Merge pull request #175 from kiwix/fix

Fix
New version 3.0.1
2026-01-01 19:08:04 -05:00 · 2018-11-02 17:32:22 +01:00 · 2018-11-02 17:10:05 +01:00 · 2018-11-02 17:04:55 +01:00 · 2018-11-02 17:03:03 +01:00
6 changed files with 31 additions and 6 deletions
--- a/5
+++ b/5
@@ -1,3 +1,8 @@
+kiwix-lib 3.0.1
+===============
+
+ * Small fix about parsing the opdsStream.
+
 kiwix-lib 3.0.0
 ===============

--- a/include/common/stringTools.h
+++ b/include/common/stringTools.h
@@ -71,5 +71,13 @@ std::string to_string(T value)
    oss << value;
    return oss.str();
 }
+
+template<typename T>
+T extractFromString(const std::string& str) {
+    std::istringstream iss(str);
+    T ret;
+    iss >> ret;
+    return ret;
+}
 } //namespace kiwix
 #endif
--- a/include/manager.h
+++ b/include/manager.h
@@ -196,7 +196,10 @@ class Manager

  std::string writableLibraryPath;

-  std::vector<std::string> bookIdList;
+  bool m_hasSearchResult = false;
+  uint64_t m_totalBooks = 0;
+  uint64_t m_startIndex = 0;
+  uint64_t m_itemsPerPage = 0;

 protected:
  kiwix::LibraryManipulator* manipulator;
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('kiwix-lib', 'cpp',
-  version : '3.0.0',
+  version : '3.0.1',
  license : 'GPL',
  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

--- a/src/downloader.cpp
+++ b/src/downloader.cpp
@@ -72,12 +72,12 @@ void Download::updateStatus(bool follow)
    } catch (InvalidRPCNode& e) { }
  }
  m_status = status;
-  m_totalLength = structNode.getMember("totalLength").getValue().getAsI();
-  m_completedLength = structNode.getMember("completedLength").getValue().getAsI();
-  m_downloadSpeed = structNode.getMember("downloadSpeed").getValue().getAsI();
+  m_totalLength = extractFromString<uint64_t>(structNode.getMember("totalLength").getValue().getAsS());
+  m_completedLength = extractFromString<uint64_t>(structNode.getMember("completedLength").getValue().getAsS());
+  m_downloadSpeed = extractFromString<uint64_t>(structNode.getMember("downloadSpeed").getValue().getAsS());
  try {
    auto verifiedLengthValue = structNode.getMember("verifiedLength").getValue();
-    m_verifiedLength = verifiedLengthValue.getAsI();
+    m_verifiedLength = extractFromString<uint64_t>(verifiedLengthValue.getAsS());
  } catch (InvalidRPCNode& e) { m_verifiedLength = 0; }
  auto filesMember = structNode.getMember("files");
  auto fileStruct = filesMember.getValue().getArray().getValue(0).getStruct();
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -95,6 +95,15 @@ bool Manager::parseOpdsDom(const pugi::xml_document& doc, const std::string& url
 {
  pugi::xml_node libraryNode = doc.child("feed");

+  try {
+    m_totalBooks = strtoull(libraryNode.child("totalResults").child_value(), 0, 0);
+    m_startIndex = strtoull(libraryNode.child("startIndex").child_value(), 0, 0);
+    m_itemsPerPage = strtoull(libraryNode.child("itemsPerPage").child_value(), 0, 0);
+    m_hasSearchResult = true;
+  } catch(...) {
+    m_hasSearchResult = false;
+  }
+
  for (pugi::xml_node entryNode = libraryNode.child("entry"); entryNode;
       entryNode = entryNode.next_sibling("entry")) {
    kiwix::Book book;
Author	SHA1	Message	Date
Matthieu Gautier	802df71410	Merge pull request #175 from kiwix/fix Fix	2018-11-02 17:32:22 +01:00
Matthieu Gautier	4d904c4d8b	New version 3.0.1	2018-11-02 17:10:05 +01:00
Matthieu Gautier	9ab44e6a5f	Get information about the total number of book of a search. When we do a search and paging the result, we need to display to the user the total number of book, not only the `itemsPerPage`. So, we need to parse correctly the xml to keep information of the total number of book.	2018-11-02 17:04:55 +01:00
Matthieu Gautier	5f4c04e79e	Fix use of getAsI when parsing download rpc. The value is store as a string in in the xml, so we cannot use getAsI. We have to get the string and parse it to an int. We cannot use strtoull because android stdc++ lib doesn't have it. We have to implement our how parseFromString function using a istringstream.	2018-11-02 17:03:03 +01:00