From 61055efc7e5fa4e5381f66081b7b62358c91ca79 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 23 Aug 2023 17:27:10 +0200 Subject: [PATCH] Adapt to new api introduced in kiwix/libkiwix#991 --- src/manager/kiwix-manage.cpp | 28 ++++++++++++++-------------- src/server/kiwix-serve.cpp | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/manager/kiwix-manage.cpp b/src/manager/kiwix-manage.cpp index 0f9b7856..8d3f1722 100644 --- a/src/manager/kiwix-manage.cpp +++ b/src/manager/kiwix-manage.cpp @@ -29,10 +29,10 @@ using namespace std; enum supportedAction { NONE, ADD, SHOW, REMOVE }; -void show(kiwix::Library* library, const std::string& bookId) +void show(const kiwix::Library& library, const std::string& bookId) { try { - auto& book = library->getBookById(bookId); + auto& book = library.getBookById(bookId); std::cout << "id:\t\t" << book.getId() << std::endl << "path:\t\t" << book.getPath() << std::endl << "url:\t\t" << book.getUrl() << std::endl @@ -96,7 +96,7 @@ void usage() << std::endl; } -int handle_show(kiwix::Library* library, const std::string& libraryPath, +int handle_show(const kiwix::Library& library, const std::string& libraryPath, int argc, char* argv[]) { if (argc > 3 ) { @@ -105,7 +105,7 @@ int handle_show(kiwix::Library* library, const std::string& libraryPath, show(library, bookId); } } else { - auto booksIds = library->getBooksIds(); + auto booksIds = library.getBooksIds(); for(auto& bookId: booksIds) { show(library, bookId); } @@ -113,7 +113,7 @@ int handle_show(kiwix::Library* library, const std::string& libraryPath, return(0); } -int handle_add(kiwix::Library* library, const std::string& libraryPath, +int handle_add(kiwix::LibraryPtr library, const std::string& libraryPath, int argc, char* argv[]) { string zimPath; @@ -182,11 +182,11 @@ int handle_add(kiwix::Library* library, const std::string& libraryPath, return(resultCode); } -int handle_remove(kiwix::Library* library, const std::string& libraryPath, +int handle_remove(kiwix::Library& library, const std::string& libraryPath, int argc, char* argv[]) { std::string bookId; - const unsigned int totalBookCount = library->getBookCount(true, true); + const unsigned int totalBookCount = library.getBookCount(true, true); int exitCode = 0; if (argc <= 3) { @@ -203,7 +203,7 @@ int handle_remove(kiwix::Library* library, const std::string& libraryPath, for (int i = 3; iremoveBookById(bookId)) { + if (!library.removeBookById(bookId)) { std::cerr << "Invalid book id '" << bookId << "'." << std::endl; exitCode = 1; } @@ -216,7 +216,7 @@ int main(int argc, char** argv) { string libraryPath = ""; supportedAction action = NONE; - kiwix::Library library; + auto library = kiwix::Library::create(); /* General argument parsing */ static struct option long_options[] = { @@ -261,7 +261,7 @@ int main(int argc, char** argv) libraryPath = kiwix::isRelativePath(libraryPath) ? kiwix::computeAbsolutePath(kiwix::getCurrentDirectory(), libraryPath) : libraryPath; - kiwix::Manager manager(&library); + kiwix::Manager manager(library); if (!manager.readFile(libraryPath, false)) { if (kiwix::fileExists(libraryPath) || action!=ADD) { std::cerr << "Cannot read the library " << libraryPath << std::endl; @@ -273,13 +273,13 @@ int main(int argc, char** argv) int exitCode = 0; switch (action) { case SHOW: - exitCode = handle_show(&library, libraryPath, argc, argv); + exitCode = handle_show(*library, libraryPath, argc, argv); break; case ADD: - exitCode = handle_add(&library, libraryPath, argc, argv); + exitCode = handle_add(library, libraryPath, argc, argv); break; case REMOVE: - exitCode = handle_remove(&library, libraryPath, argc, argv); + exitCode = handle_remove(*library, libraryPath, argc, argv); break; case NONE: break; @@ -292,7 +292,7 @@ int main(int argc, char** argv) /* Rewrite the library file */ if (action == REMOVE || action == ADD) { // writeToFile return true (1) if everything is ok => exitCode is 0 - if (!library.writeToFile(libraryPath)) { + if (!library->writeToFile(libraryPath)) { std::cerr << "Cannot write the library " << libraryPath << std::endl; return 1; } diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp index 9a35d3ce..d50481b2 100644 --- a/src/server/kiwix-serve.cpp +++ b/src/server/kiwix-serve.cpp @@ -197,7 +197,7 @@ int main(int argc, char** argv) #endif std::string rootLocation = "/"; - kiwix::Library library; + auto library = kiwix::Library::create(); unsigned int nb_threads = DEFAULT_THREADS; std::vector zimPathes; std::string libraryPath; @@ -331,7 +331,7 @@ int main(int argc, char** argv) } /* Setup the library manager and get the list of books */ - kiwix::Manager manager(&library); + kiwix::Manager manager(library); std::vector libraryPaths; if (libraryFlag) { libraryPaths = kiwix::split(libraryPath, ";"); @@ -340,7 +340,7 @@ int main(int argc, char** argv) } /* Check if the library is not empty (or only remote books)*/ - if (library.getBookCount(true, false) == 0) { + if (library->getBookCount(true, false) == 0) { std::cerr << "The XML library file '" << libraryPath << "' is empty (or has only remote books)." << std::endl; } @@ -376,8 +376,8 @@ int main(int argc, char** argv) } #endif - kiwix::UpdatableNameMapper nameMapper(library, noDateAliasesFlag); - kiwix::Server server(&library, &nameMapper); + auto nameMapper = std::make_shared(library, noDateAliasesFlag); + kiwix::Server server(library, nameMapper); if (!customIndexPath.empty()) { try { @@ -447,7 +447,7 @@ int main(int argc, char** argv) if ( libraryMustBeReloaded && !libraryPaths.empty() ) { libraryFileTimestamp = curLibraryFileTimestamp; reloadLibrary(manager, libraryPaths); - nameMapper.update(); + nameMapper->update(); libraryMustBeReloaded = false; } } while (waiting);