clean includes

Author: andiwand

cli/src/back_translate.cpp

@@ -4,20 +4,22 @@
 
 #include <odr/internal/util/file_util.hpp>
 
-#include <iostream>
 #include <string>
 
 using namespace odr;
 
 int main(int, char **argv) {
+  const std::shared_ptr logger =
+      Logger::create_stdio("odr-back-translate", LogLevel::verbose);
+
   const std::string input{argv[1]};
   const std::string diff_path{argv[2]};
   const std::string output{argv[3]};
 
   const DocumentFile document_file{input};
 
   if (document_file.password_encrypted()) {
-    std::cerr << "encrypted documents are not supported" << std::endl;
+    ODR_FATAL(*logger, "encrypted documents are not supported");
     return 1;
   }
 

cli/src/meta.cpp

@@ -10,21 +10,27 @@
 using namespace odr;
 
 int main(const int argc, char **argv) {
+  const std::shared_ptr logger =
+      Logger::create_stdio("odr-meta", LogLevel::verbose);
+
   const std::string input{argv[1]};
 
-  const bool has_password = argc >= 4;
-  std::string password;
-  if (has_password) {
+  std::optional<std::string> password;
+  if (argc >= 3) {
     password = argv[2];
   }
 
   DocumentFile document_file{input};
 
-  if (document_file.password_encrypted() && has_password) {
+  if (document_file.password_encrypted() && !password) {
+    ODR_FATAL(*logger, "document encrypted but no password given");
+    return 2;
+  }
+  if (document_file.password_encrypted()) {
     try {
-      document_file = document_file.decrypt(password);
+      document_file = document_file.decrypt(*password);
     } catch (const WrongPasswordError &) {
-      std::cerr << "wrong password" << std::endl;
+      ODR_FATAL(*logger, "wrong password");
       return 1;
     }
   }

cli/src/server.cpp

@@ -1,18 +1,16 @@
-#include "odr/archive.hpp"
-
+#include <odr/archive.hpp>
 #include <odr/exceptions.hpp>
 #include <odr/file.hpp>
 #include <odr/filesystem.hpp>
 #include <odr/html.hpp>
 #include <odr/http_server.hpp>
 
-#include <iostream>
 #include <string>
 
 using namespace odr;
 
 int main(const int argc, char **argv) {
-  std::shared_ptr logger =
+  const std::shared_ptr logger =
       Logger::create_stdio("odr-server", LogLevel::verbose);
 
   std::string input{argv[1]};

cli/src/translate.cpp

@@ -3,12 +3,14 @@
 #include <odr/html.hpp>
 
 #include <filesystem>
-#include <iostream>
 #include <string>
 
 using namespace odr;
 
 int main(const int argc, char **argv) {
+  const std::shared_ptr logger =
+      Logger::create_stdio("odr-translate", LogLevel::verbose);
+
   const std::string input{argv[1]};
   const std::string output{argv[2]};
 
@@ -20,14 +22,14 @@ int main(const int argc, char **argv) {
   DecodedFile decoded_file{input};
 
   if (decoded_file.password_encrypted() && !password) {
-    std::cerr << "document encrypted but no password given" << std::endl;
+    ODR_FATAL(*logger, "document encrypted but no password given");
     return 2;
   }
   if (decoded_file.password_encrypted()) {
     try {
       decoded_file = decoded_file.decrypt(*password);
     } catch (const WrongPasswordError &) {
-      std::cerr << "wrong password" << std::endl;
+      ODR_FATAL(*logger, "wrong password");
       return 1;
     }
   }

src/odr/document_path.cpp

@@ -3,7 +3,6 @@
 #include <odr/document_element.hpp>
 
 #include <algorithm>
-#include <iostream>
 #include <stdexcept>
 
 namespace odr {

src/odr/internal/common/path.hpp

@@ -2,7 +2,6 @@
 
 #include <cstdint>
 #include <filesystem>
-#include <iostream>
 #include <string>
 #include <typeindex>
 

src/odr/internal/csv/csv_file.cpp

@@ -2,8 +2,6 @@
 
 #include <odr/internal/csv/csv_util.hpp>
 
-#include <iostream>
-
 namespace odr::internal::csv {
 
 CsvFile::CsvFile(std::shared_ptr<text::TextFile> file)

src/odr/internal/html/pdf_file.cpp

@@ -15,6 +15,7 @@
 #include <odr/internal/pdf/pdf_graphics_state.hpp>
 
 #include <fstream>
+#include <iostream>
 
 namespace odr::internal::html {
 

src/odr/internal/json/json_file.cpp

@@ -2,8 +2,6 @@
 
 #include <odr/internal/json/json_util.hpp>
 
-#include <iostream>
-
 namespace odr::internal::json {
 
 JsonFile::JsonFile(std::shared_ptr<text::TextFile> file)

src/odr/internal/magic.cpp

@@ -7,8 +7,6 @@
 #include <odr/internal/libmagic/libmagic.hpp>
 #include <odr/internal/util/string_util.hpp>
 
-#include <iostream>
-
 namespace odr::internal {
 
 namespace {