1 files changed, 25 insertions, 79 deletions

diff --git a/src/gpg/function/GpgFileOpera.cpp b/src/gpg/function/GpgFileOpera.cpp
index 71e60f76..79214d2d 100644
--- a/src/gpg/function/GpgFileOpera.cpp
+++ b/src/gpg/function/GpgFileOpera.cpp
@@ -26,42 +26,15 @@
 #include "gpg/function/BasicOperator.h"
 
 #include <boost/process/detail/config.hpp>
-#include <filesystem>
+
 #include <iterator>
 #include <memory>
 #include <string>
 
-std::string read_all_data_in_file(const std::string &path) {
-  using namespace std::filesystem;
-  class path file_info(path.c_str());
-
-  if (!exists(file_info) || !is_regular_file(path))
-    throw std::runtime_error("no permission");
-
-  std::ifstream in_file;
-  in_file.open(path, std::ios::in);
-  if (!in_file.good())
-    throw std::runtime_error("cannot open file");
-  std::istreambuf_iterator<char> begin(in_file);
-  std::istreambuf_iterator<char> end;
-  std::string in_buffer(begin, end);
-  in_file.close();
-  return in_buffer;
-}
-
-void write_buufer_to_file(const std::string &path,
-                          const std::string &out_buffer) {
-  std::ofstream out_file(path);
-  out_file.open(path.c_str(), std::ios::out);
-  if (!out_file.good())
-    throw std::runtime_error("cannot open file");
-  out_file.write(out_buffer.c_str(), out_buffer.size());
-  out_file.close();
-}
-
 GpgFrontend::GpgError GpgFrontend::GpgFileOpera::EncryptFile(
-    KeyArgsList &keys, const std::string &path, GpgEncrResult &result) {
-
+    KeyArgsList& keys,
+    const std::string& path,
+    GpgEncrResult& result) {
   std::string in_buffer = read_all_data_in_file(path);
   std::unique_ptr<std::string> out_buffer;
 
@@ -70,38 +43,13 @@ GpgFrontend::GpgError GpgFrontend::GpgFileOpera::EncryptFile(
 
   assert(check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR);
 
-  write_buufer_to_file(path + ".asc", *out_buffer);
+  write_buffer_to_file(path + ".asc", *out_buffer);
   return err;
 }
 
-std::string get_file_extension(const std::string &path) {
-  // Create a Path object from given string
-  std::filesystem::path path_obj(path);
-  // Check if file name in the path object has extension
-  if (path_obj.has_extension()) {
-    // Fetch the extension from path object and return
-    return path_obj.extension().string();
-  }
-  // In case of no extension return empty string
-  return std::string();
-}
-
-std::string get_file_name_with_path(const std::string &path) {
-  // Create a Path object from given string
-  std::filesystem::path path_obj(path);
-  // Check if file name in the path object has extension
-  if (path_obj.has_filename()) {
-    // Fetch the extension from path object and return
-    return path_obj.parent_path() / path_obj.filename();
-  }
-  // In case of no extension return empty string
-  throw std::runtime_error("invalid file path");
-}
-
-GpgFrontend::GpgError
-GpgFrontend::GpgFileOpera::DecryptFile(const std::string &path,
-                                       GpgDecrResult &result) {
-
+GpgFrontend::GpgError GpgFrontend::GpgFileOpera::DecryptFile(
+    const std::string& path,
+    GpgDecrResult& result) {
   std::string in_buffer = read_all_data_in_file(path);
   std::unique_ptr<std::string> out_buffer;
 
@@ -116,15 +64,14 @@ GpgFrontend::GpgFileOpera::DecryptFile(const std::string &path,
   if (!(file_extension == ".asc" || file_extension == ".gpg"))
     out_file_name += ".out";
 
-  write_buufer_to_file(out_file_name, *out_buffer);
+  write_buffer_to_file(out_file_name, *out_buffer);
 
   return err;
 }
 
-gpgme_error_t GpgFrontend::GpgFileOpera::SignFile(KeyArgsList &keys,
-                                                  const std::string &path,
-                                                  GpgSignResult &result) {
-
+gpgme_error_t GpgFrontend::GpgFileOpera::SignFile(KeyArgsList& keys,
+                                                  const std::string& path,
+                                                  GpgSignResult& result) {
   auto in_buffer = read_all_data_in_file(path);
   std::unique_ptr<std::string> out_buffer;
 
@@ -133,14 +80,13 @@ gpgme_error_t GpgFrontend::GpgFileOpera::SignFile(KeyArgsList &keys,
 
   assert(check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR);
 
-  write_buufer_to_file(path + ".sig", *out_buffer);
+  write_buffer_to_file(path + ".sig", *out_buffer);
 
   return err;
 }
 
-gpgme_error_t GpgFrontend::GpgFileOpera::VerifyFile(const std::string &path,
-                                                    GpgVerifyResult &result) {
-
+gpgme_error_t GpgFrontend::GpgFileOpera::VerifyFile(const std::string& path,
+                                                    GpgVerifyResult& result) {
   auto in_buffer = read_all_data_in_file(path);
   std::unique_ptr<std::string> sign_buffer = nullptr;
 
@@ -162,9 +108,10 @@ gpgme_error_t GpgFrontend::GpgFileOpera::VerifyFile(const std::string &path,
 // TODO
 
 gpg_error_t GpgFrontend::GpgFileOpera::EncryptSignFile(
-    KeyArgsList &keys, const std::string &path, GpgEncrResult &encr_res,
-    GpgSignResult &sign_res) {
-
+    KeyArgsList& keys,
+    const std::string& path,
+    GpgEncrResult& encr_res,
+    GpgSignResult& sign_res) {
   auto in_buffer = read_all_data_in_file(path);
   std::unique_ptr<std::string> out_buffer = nullptr;
 
@@ -177,16 +124,15 @@ gpg_error_t GpgFrontend::GpgFileOpera::EncryptSignFile(
 
   assert(check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR);
 
-  write_buufer_to_file(path + ".gpg", *out_buffer);
+  write_buffer_to_file(path + ".gpg", *out_buffer);
 
   return err;
 }
 
-gpg_error_t
-GpgFrontend::GpgFileOpera::DecryptVerifyFile(const std::string &path,
-                                             GpgDecrResult &decr_res,
-                                             GpgVerifyResult &verify_res) {
-
+gpg_error_t GpgFrontend::GpgFileOpera::DecryptVerifyFile(
+    const std::string& path,
+    GpgDecrResult& decr_res,
+    GpgVerifyResult& verify_res) {
   auto in_buffer = read_all_data_in_file(path);
   std::unique_ptr<std::string> out_buffer = nullptr;
 
@@ -200,7 +146,7 @@ GpgFrontend::GpgFileOpera::DecryptVerifyFile(const std::string &path,
   if (!(file_extension == ".asc" || file_extension == ".gpg"))
     out_file_name = path + ".out";
 
-  write_buufer_to_file(out_file_name, *out_buffer);
+  write_buffer_to_file(out_file_name, *out_buffer);
 
   return err;
 }