diff options
Diffstat (limited to 'src/file')
-rw-r--r-- | src/file/mail.hpp | 27 | ||||
-rw-r--r-- | src/file/mail/checker_decorator.cpp | 58 | ||||
-rw-r--r-- | src/file/mail/checker_decorator.hpp | 25 | ||||
-rw-r--r-- | src/file/mail/file_decorator.cpp (renamed from src/file/mail.cpp) | 30 | ||||
-rw-r--r-- | src/file/mail/file_decorator.hpp | 24 | ||||
-rw-r--r-- | src/file/mail/sort_decorator.cpp | 33 | ||||
-rw-r--r-- | src/file/mail/sort_decorator.hpp | 19 | ||||
-rw-r--r-- | src/file/mail/types/ifile_manipulator.hpp | 18 | ||||
-rw-r--r-- | src/file/settings.cpp | 99 | ||||
-rw-r--r-- | src/file/settings/checker_decorator.cpp | 42 | ||||
-rw-r--r-- | src/file/settings/checker_decorator.hpp | 21 | ||||
-rw-r--r-- | src/file/settings/file_decorator.cpp | 77 | ||||
-rw-r--r-- | src/file/settings/file_decorator.hpp | 22 | ||||
-rw-r--r-- | src/file/settings/parser.cpp (renamed from src/file/parser/settings.cpp) | 2 | ||||
-rw-r--r-- | src/file/settings/parser.hpp (renamed from src/file/parser/settings.hpp) | 0 | ||||
-rw-r--r-- | src/file/settings/settings.cpp | 31 | ||||
-rw-r--r-- | src/file/settings/settings.hpp (renamed from src/file/settings.hpp) | 9 | ||||
-rw-r--r-- | src/file/settings/types/ifile_manipulator.hpp | 18 |
18 files changed, 403 insertions, 152 deletions
diff --git a/src/file/mail.hpp b/src/file/mail.hpp deleted file mode 100644 index b68049b..0000000 --- a/src/file/mail.hpp +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include <string> -#include <optional> - -#include "management/general.hpp" -#include "checker/registrator_mails.hpp" - -namespace smtp::file -{ - class Mail - { - public: - explicit Mail( std::string const& path_file, checker::RegistratorMails const& registrator_errors ); - ~Mail() = default; - - manage::MailsSet Read() const; - bool Write( manage::MailsSet const& data ) const; - private: - manage::MailsSet ReadFile( std::ifstream& mail_file ) const; - bool WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const; - - std::string mPathFile; - checker::RegistratorMails mRegistratorErrors; - }; - -} diff --git a/src/file/mail/checker_decorator.cpp b/src/file/mail/checker_decorator.cpp new file mode 100644 index 0000000..54da9da --- /dev/null +++ b/src/file/mail/checker_decorator.cpp @@ -0,0 +1,58 @@ +#include "checker_decorator.hpp" +#include "logger/logger_set.hpp" + +namespace smtp::file::mail +{ + + // + //Constructors + // + + CheckerDecorator::CheckerDecorator( checker::RegistratorMails const& registrator_errors ) + : mRegistratorErrors( registrator_errors ) + { + } + + // + //Public methods + // + + manage::MailsSet CheckerDecorator::Read() const + { + manage::MailsSet result; + + if( !mBase ) + { + return result; + } + + auto parsed_data = mBase->Read(); + + for( auto const& line : parsed_data ) + { + if( mRegistratorErrors.Check( line ) ) + { + result.push_back( line ); + } + } + return result; + } + + bool CheckerDecorator::Write( manage::MailsSet const& data ) const + { + manage::MailsSet result; + + for( const auto& line : data ) + { + if( mRegistratorErrors.Check( line ) ) + { + result.push_back( line ); + } + } + if( mBase ) + { + return mBase->Write(result); + } + return false; + } +} diff --git a/src/file/mail/checker_decorator.hpp b/src/file/mail/checker_decorator.hpp new file mode 100644 index 0000000..ed87fc5 --- /dev/null +++ b/src/file/mail/checker_decorator.hpp @@ -0,0 +1,25 @@ +#pragma once + +#include "management/general.hpp" +#include "checker/registrator_mails.hpp" +#include "message/builder/types/idecorator.hpp" +#include "types/ifile_manipulator.hpp" + +namespace smtp::file::mail +{ + class CheckerDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator> + { + public: + explicit CheckerDecorator( checker::RegistratorMails const& registrator_errors ); + ~CheckerDecorator() override = default; + + manage::MailsSet Read() const override; + bool Write( manage::MailsSet const& data ) const override; + private: + manage::MailsSet ReadFile( std::ifstream& mail_file ) const; + bool WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const; + + checker::RegistratorMails mRegistratorErrors; + }; + +} diff --git a/src/file/mail.cpp b/src/file/mail/file_decorator.cpp index a7e30ea..82111ac 100644 --- a/src/file/mail.cpp +++ b/src/file/mail/file_decorator.cpp @@ -1,18 +1,17 @@ #include <fstream> -#include "mail.hpp" +#include "file_decorator.hpp" #include "logger/logger_set.hpp" -namespace smtp::file +namespace smtp::file::mail { // //Constructors // - Mail::Mail( std::string const& path_file, checker::RegistratorMails const& registrator_errors ) + FileDecorator::FileDecorator( std::string const& path_file ) : mPathFile( path_file ) - , mRegistratorErrors( registrator_errors ) { } @@ -20,7 +19,7 @@ namespace smtp::file //Public methods // - manage::MailsSet Mail::Read() const + manage::MailsSet FileDecorator::Read() const { static const std::string METHOD_NAME = "Read mails"; @@ -37,7 +36,7 @@ namespace smtp::file return result; } - bool Mail::Write( manage::MailsSet const& data ) const + bool FileDecorator::Write( manage::MailsSet const& data ) const { static const std::string METHOD_NAME = "Write mails"; @@ -60,34 +59,25 @@ namespace smtp::file //Private methods // - manage::MailsSet Mail::ReadFile( std::ifstream& mail_file ) const + manage::MailsSet FileDecorator::ReadFile( std::ifstream& mail_file ) const { std::string line{}; manage::MailsSet result; while ( std::getline( mail_file, line ) ) { - if( mRegistratorErrors.Check( line ) ) - { - result.push_back( line ); - } + result.push_back( line ); } return result; } - bool Mail::WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const + bool FileDecorator::WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const { bool result = true; + for( const auto& mail : data ) { - if( mRegistratorErrors.Check( mail ) ) - { - mail_file << mail << "\n"; - } - else - { - result = false; - } + mail_file << mail << "\n"; } return result; } diff --git a/src/file/mail/file_decorator.hpp b/src/file/mail/file_decorator.hpp new file mode 100644 index 0000000..21dab10 --- /dev/null +++ b/src/file/mail/file_decorator.hpp @@ -0,0 +1,24 @@ +#pragma once + +#include "management/general.hpp" +#include "message/builder/types/idecorator.hpp" +#include "types/ifile_manipulator.hpp" + +namespace smtp::file::mail +{ + class FileDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator> + { + public: + explicit FileDecorator( std::string const& path_file ); + ~FileDecorator() override = default; + + manage::MailsSet Read() const override; + bool Write( manage::MailsSet const& data ) const override; + private: + manage::MailsSet ReadFile( std::ifstream& mail_file ) const; + bool WriteFile( std::ofstream& mail_file, manage::MailsSet const& data ) const; + + std::string mPathFile; + }; + +} diff --git a/src/file/mail/sort_decorator.cpp b/src/file/mail/sort_decorator.cpp new file mode 100644 index 0000000..dca464f --- /dev/null +++ b/src/file/mail/sort_decorator.cpp @@ -0,0 +1,33 @@ +#include "sort_decorator.hpp" + +namespace smtp::file::mail +{ + + // + //Public methods + // + + manage::MailsSet SortDecorator::Read() const + { + manage::MailsSet result; + + if(!mBase) + { + return result; + } + result = mBase->Read(); + + result.sort(); + + return result; + } + + bool SortDecorator::Write( manage::MailsSet const& data ) const + { + if( mBase ) + { + return mBase->Write( data ); + } + return false; + } +} diff --git a/src/file/mail/sort_decorator.hpp b/src/file/mail/sort_decorator.hpp new file mode 100644 index 0000000..80edf1d --- /dev/null +++ b/src/file/mail/sort_decorator.hpp @@ -0,0 +1,19 @@ +#pragma once + +#include "management/general.hpp" +#include "message/builder/types/idecorator.hpp" +#include "types/ifile_manipulator.hpp" + +namespace smtp::file::mail +{ + class SortDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator> + { + public: + SortDecorator() = default; + ~SortDecorator() = default; + + manage::MailsSet Read() const; + bool Write( manage::MailsSet const& data ) const; + }; + +} diff --git a/src/file/mail/types/ifile_manipulator.hpp b/src/file/mail/types/ifile_manipulator.hpp new file mode 100644 index 0000000..62965e7 --- /dev/null +++ b/src/file/mail/types/ifile_manipulator.hpp @@ -0,0 +1,18 @@ + #pragma once + +#include <memory> + +#include "management/general.hpp" + +namespace smtp::file::mail::types +{ + class IFileManipulator + { + public: + virtual ~IFileManipulator() = default; + + virtual manage::MailsSet Read() const = 0; + virtual bool Write( manage::MailsSet const& data ) const = 0; + }; + using IFileManipulatorPtr = std::shared_ptr<IFileManipulator>; +} diff --git a/src/file/settings.cpp b/src/file/settings.cpp deleted file mode 100644 index eb8ed5d..0000000 --- a/src/file/settings.cpp +++ /dev/null @@ -1,99 +0,0 @@ -#include <fstream> - -#include "settings.hpp" -#include "logger/logger_set.hpp" -#include "converter/file_to_struct.hpp" -#include "converter/struct_to_file.hpp" -#include "parser/settings.hpp" - -namespace smtp::file -{ - - // - //Constructors - // - - Settings::Settings( std::string const& path_file, checker::RegistratorSettings const& registrator_errors ) - : mPathFile( path_file ) - , mRegistratorErrors( registrator_errors ) - { - - } - - // - //Public methods - // - - manage::SettingsFields Settings::Read() const - { - auto parsed_store = GetParsedStore(); - return converter::FileToStruct{}.Convert( parsed_store ); - } - - bool Settings::Write( manage::SettingsFields const& settings_fields ) const - { - auto parsed_data = converter::StructToFile{}.Convert( settings_fields ); - return mRegistratorErrors.Check( parsed_data ) && SetParsedData( parsed_data ); - } - - // - //Private methods - // - - manage::SettingsFileDataType Settings::GetParsedStore() const - { - static const std::string METHOD_NAME = "Read settings"; - - std::ifstream settings_file{mPathFile, std::fstream::in}; - if( !settings_file.is_open() ) - { - logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Unable to open file to read " + mPathFile ); - return {}; - } - auto result = GetDataFromFile( settings_file ); - - settings_file.close(); - return mRegistratorErrors.Check( result ) ? result : manage::SettingsFileDataType{}; - } - - manage::SettingsFileDataType Settings::GetDataFromFile( std::ifstream& settings_file ) const - { - std::string line{}; - manage::SettingsFileDataType result; - - while( std::getline( settings_file, line )) - { - auto parsed_data = parser::Settings{}.Parse( line ); - result.insert( parsed_data ); - } - return result; - } - - bool Settings::SetParsedData( manage::SettingsFileDataType const& parsed_data ) const - { - static const std::string METHOD_NAME = "Write settings"; - - std::ofstream settings_file{mPathFile, std::fstream::out | std::fstream::trunc}; - if( !settings_file.is_open()) - { - logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Unable to open file to write " + mPathFile ); - return false; - } - for( const auto& data : parsed_data ) - { - auto line = BuildParam( data ); - settings_file << line << "\n"; - } - settings_file.close(); - return true; - } - - std::string Settings::BuildParam( std::pair < std::string, std::string > const& data ) const - { - std::string result; - result += data.first; - result += '='; - result += data.second; - return result; - } -} diff --git a/src/file/settings/checker_decorator.cpp b/src/file/settings/checker_decorator.cpp new file mode 100644 index 0000000..ef560ad --- /dev/null +++ b/src/file/settings/checker_decorator.cpp @@ -0,0 +1,42 @@ +#include "checker_decorator.hpp" + +namespace smtp::file::settings +{ + + // + //Constructors + // + + CheckerDecorator::CheckerDecorator( checker::RegistratorSettings const& registrator_errors ) + : mRegistratorErrors( registrator_errors ) + { + } + + // + //Public methods + // + + manage::SettingsFileDataType CheckerDecorator::Read() const + { + manage::SettingsFileDataType result; + if(!mBase) + { + return result; + } + result = mBase->Read(); + return mRegistratorErrors.Check( result ) ? result : manage::SettingsFileDataType{}; + } + + bool CheckerDecorator::Write( manage::SettingsFileDataType const& settings_fields ) const + { + if( !mBase ) + { + return false; + } + if( mRegistratorErrors.Check( settings_fields ) ) + { + return mBase->Write(settings_fields); + } + return false; + } +} diff --git a/src/file/settings/checker_decorator.hpp b/src/file/settings/checker_decorator.hpp new file mode 100644 index 0000000..ecaba5a --- /dev/null +++ b/src/file/settings/checker_decorator.hpp @@ -0,0 +1,21 @@ +#pragma once + +#include "management/general.hpp" +#include "checker/registrator_settings.hpp" +#include "types/ifile_manipulator.hpp" +#include "message/builder/types/idecorator.hpp" + +namespace smtp::file::settings +{ + class CheckerDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator> + { + public: + explicit CheckerDecorator( checker::RegistratorSettings const& registrator_errors ); + ~CheckerDecorator() = default; + + manage::SettingsFileDataType Read() const override; + bool Write( manage::SettingsFileDataType const& data ) const override; + private: + checker::RegistratorSettings mRegistratorErrors; + }; +} diff --git a/src/file/settings/file_decorator.cpp b/src/file/settings/file_decorator.cpp new file mode 100644 index 0000000..38b42ce --- /dev/null +++ b/src/file/settings/file_decorator.cpp @@ -0,0 +1,77 @@ +#include <fstream> + +#include "file_decorator.hpp" +#include "logger/logger_set.hpp" +#include "parser.hpp" +#include "converter/file_to_string.hpp" + +namespace smtp::file::settings +{ + + // + //Constructors + // + + FileDecorator::FileDecorator( std::string const& path_file ) + : mPathFile( path_file ) + { + + } + + // + //Public methods + // + + manage::SettingsFileDataType FileDecorator::Read() const + { + static const std::string METHOD_NAME = "Read settings"; + + std::ifstream settings_file{mPathFile, std::fstream::in}; + if( !settings_file.is_open() ) + { + logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Unable to open file to read " + mPathFile ); + return {}; + } + auto result = GetDataFromFile( settings_file ); + + settings_file.close(); + return result; + } + + bool FileDecorator::Write( manage::SettingsFileDataType const& data ) const + { + static const std::string METHOD_NAME = "Write settings"; + + std::ofstream settings_file{mPathFile, std::fstream::out | std::fstream::trunc}; + if( !settings_file.is_open()) + { + logger::LoggerSet::GetInstance()->LogError( METHOD_NAME, "Unable to open file to write " + mPathFile ); + return false; + } + auto settings_as_list = converter::FileToString{}.Convert(data); + for( const auto& settings_as_string : settings_as_list ) + { + settings_file << settings_as_string << "\n"; + } + settings_file.close(); + return true; + } + + // + //Private methods + // + + manage::SettingsFileDataType FileDecorator::GetDataFromFile( std::ifstream& settings_file ) const + { + std::string line{}; + manage::SettingsFileDataType result; + parser::Settings parser; + + while( std::getline( settings_file, line )) + { + auto parsed_data = parser.Parse( line ); + result.insert( parsed_data ); + } + return result; + } +} diff --git a/src/file/settings/file_decorator.hpp b/src/file/settings/file_decorator.hpp new file mode 100644 index 0000000..5896aed --- /dev/null +++ b/src/file/settings/file_decorator.hpp @@ -0,0 +1,22 @@ +#pragma once + +#include "management/general.hpp" +#include "types/ifile_manipulator.hpp" +#include "message/builder/types/idecorator.hpp" + +namespace smtp::file::settings +{ + class FileDecorator : public smtp::message::builder::types::IDecorator< types::IFileManipulator> + { + public: + explicit FileDecorator( std::string const& path_file ); + ~FileDecorator() = default; + + manage::SettingsFileDataType Read() const override; + bool Write( manage::SettingsFileDataType const& data ) const override; + private: + manage::SettingsFileDataType GetDataFromFile( std::ifstream& settings_file ) const; + + std::string mPathFile; + }; +} diff --git a/src/file/parser/settings.cpp b/src/file/settings/parser.cpp index 590ed72..b692ac3 100644 --- a/src/file/parser/settings.cpp +++ b/src/file/settings/parser.cpp @@ -1,4 +1,4 @@ -#include "settings.hpp" +#include "parser.hpp" namespace smtp::file::parser { diff --git a/src/file/parser/settings.hpp b/src/file/settings/parser.hpp index e7de2f6..e7de2f6 100644 --- a/src/file/parser/settings.hpp +++ b/src/file/settings/parser.hpp diff --git a/src/file/settings/settings.cpp b/src/file/settings/settings.cpp new file mode 100644 index 0000000..48232e6 --- /dev/null +++ b/src/file/settings/settings.cpp @@ -0,0 +1,31 @@ +#include <fstream> + +#include "settings.hpp" +#include "logger/logger_set.hpp" +#include "converter/file_to_struct.hpp" +#include "converter/struct_to_file.hpp" + +namespace smtp::file::settings +{ + + Settings::Settings( types::IFileManipulatorPtr const& file_manipulator) + : mFileManipulator( file_manipulator ) + { + + } + // + //Public methods + // + + manage::SettingsFields Settings::Read() const + { + auto parsed_store = mFileManipulator->Read(); + return converter::FileToStruct{}.Convert( parsed_store ); + } + + bool Settings::Write( manage::SettingsFields const& settings_fields ) const + { + auto parsed_data = converter::StructToFile{}.Convert( settings_fields ); + return mFileManipulator->Write( parsed_data ); + } +} diff --git a/src/file/settings.hpp b/src/file/settings/settings.hpp index 32ce2f2..60634fe 100644 --- a/src/file/settings.hpp +++ b/src/file/settings/settings.hpp @@ -1,14 +1,14 @@ #pragma once #include "management/general.hpp" -#include "checker/registrator_settings.hpp" +#include "types/ifile_manipulator.hpp" -namespace smtp::file +namespace smtp::file::settings { class Settings { public: - explicit Settings( std::string const& path_file, checker::RegistratorSettings const& registrator_errors ); + explicit Settings( types::IFileManipulatorPtr const& file_manipulator ); ~Settings() = default; manage::SettingsFields Read() const; @@ -20,7 +20,6 @@ namespace smtp::file std::string BuildParam( std::pair < std::string, std::string > const& data ) const; std::string mPathFile; - checker::RegistratorSettings mRegistratorErrors; - + types::IFileManipulatorPtr mFileManipulator; }; } diff --git a/src/file/settings/types/ifile_manipulator.hpp b/src/file/settings/types/ifile_manipulator.hpp new file mode 100644 index 0000000..6de0bf3 --- /dev/null +++ b/src/file/settings/types/ifile_manipulator.hpp @@ -0,0 +1,18 @@ + #pragma once + +#include <memory> + +#include "management/general.hpp" + +namespace smtp::file::settings::types +{ + class IFileManipulator + { + public: + virtual ~IFileManipulator() = default; + + virtual manage::SettingsFileDataType Read() const = 0; + virtual bool Write( manage::SettingsFileDataType const& data ) const = 0; + }; + using IFileManipulatorPtr = std::shared_ptr<IFileManipulator>; +} |