From c7def980783d195b1b94d56e28b249a9033cfcc9 Mon Sep 17 00:00:00 2001 From: Andre Brand Date: Sun, 18 Feb 2024 21:42:12 +0100 Subject: [PATCH] Rename ArchiveFactory to Facade7z --- CMakeLists.txt | 4 ++-- ArchiveFactory.cpp => Facade7z.cpp | 20 ++++++++++---------- ArchiveFactory.h => Facade7z.h | 14 +++++++------- main.cpp | 12 ++++++------ 4 files changed, 25 insertions(+), 25 deletions(-) rename ArchiveFactory.cpp => Facade7z.cpp (89%) rename ArchiveFactory.h => Facade7z.h (81%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1ac2c0..1b8b828 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ target_sources(7zip-examples "main.cpp" "InMemoryArchiveUpdateCallback.h" "InMemoryArchiveUpdateCallback.cpp" - "ArchiveFactory.h" - "ArchiveFactory.cpp" + "Facade7z.h" + "Facade7z.cpp" "ArchiveProperties.h" "ArchiveProperties.cpp" "ExportGUID.cpp" diff --git a/ArchiveFactory.cpp b/Facade7z.cpp similarity index 89% rename from ArchiveFactory.cpp rename to Facade7z.cpp index f22976f..921b4e6 100644 --- a/ArchiveFactory.cpp +++ b/Facade7z.cpp @@ -1,4 +1,4 @@ -#include "ArchiveFactory.h" +#include "Facade7z.h" #include "ExportGUID.h" #include #include @@ -39,7 +39,7 @@ static auto getArchiveClassIdFromFormatId(unsigned f_formatId) -> const GUID* } -ArchiveFactory::ArchiveFactory() +Facade7z::Facade7z() { Handle7zipDLL = LoadLibraryW(L"7zip.dll"); if (!Handle7zipDLL) @@ -81,12 +81,12 @@ ArchiveFactory::ArchiveFactory() } } -ArchiveFactory::~ArchiveFactory() +Facade7z::~Facade7z() { FreeLibrary(Handle7zipDLL); } -auto ArchiveFactory::createInArchive(unsigned FormatId) const -> IInArchive* +auto Facade7z::createInArchive(unsigned FormatId) const -> IInArchive* { const auto ArchiveClassGuid = ::getArchiveClassIdFromFormatId(FormatId); if (ArchiveClassGuid == nullptr) @@ -99,7 +99,7 @@ auto ArchiveFactory::createInArchive(unsigned FormatId) const -> IInArchive* return static_cast(Archive); } -auto ArchiveFactory::createOutArchive(unsigned FormatId) const -> IOutArchive* +auto Facade7z::createOutArchive(unsigned FormatId) const -> IOutArchive* { const auto ArchiveClassGuid = ::getArchiveClassIdFromFormatId(FormatId); if (ArchiveClassGuid == nullptr) @@ -112,7 +112,7 @@ auto ArchiveFactory::createOutArchive(unsigned FormatId) const -> IOutArchive* return static_cast(Archive); } -auto ArchiveFactory::createHasher(std::string_view Name) const -> IHasher* +auto Facade7z::createHasher(std::string_view Name) const -> IHasher* { CMyComPtr Hashers{}; if (Functions.GetHashers(&Hashers) != S_OK) [[unlikely]] @@ -145,7 +145,7 @@ auto ArchiveFactory::createHasher(std::string_view Name) const -> IHasher* return Hasher; } -auto ArchiveFactory::getFileExtensionFromFormatId(unsigned FormatId) -> const char* +auto Facade7z::getFileExtensionFromFormatId(unsigned FormatId) -> const char* { switch (FormatId) { @@ -170,7 +170,7 @@ auto ArchiveFactory::getFileExtensionFromFormatId(unsigned FormatId) -> const ch } } -unsigned ArchiveFactory::getNumberOfFormats() const +unsigned Facade7z::getNumberOfFormats() const { UInt32 NumberOfFormats{}; if (Functions.GetNumberOfFormats(&NumberOfFormats) != S_OK) [[unlikely]] @@ -178,12 +178,12 @@ unsigned ArchiveFactory::getNumberOfFormats() const return NumberOfFormats; } -std::uint32_t ArchiveFactory::getMajorVersion() const +std::uint32_t Facade7z::getMajorVersion() const { return Version >> 16; } -std::uint32_t ArchiveFactory::getMinorVersion() const +std::uint32_t Facade7z::getMinorVersion() const { return Version & 0xFFFFu; } \ No newline at end of file diff --git a/ArchiveFactory.h b/Facade7z.h similarity index 81% rename from ArchiveFactory.h rename to Facade7z.h index d96c5b1..81e5956 100644 --- a/ArchiveFactory.h +++ b/Facade7z.h @@ -5,15 +5,15 @@ #include "ArchiveProperties.h" -class ArchiveFactory{ +class Facade7z{ public: - ArchiveFactory(); - ArchiveFactory(const ArchiveFactory&) = delete; - ArchiveFactory(ArchiveFactory&&) noexcept = delete; - ArchiveFactory& operator=(const ArchiveFactory&) = delete; - ArchiveFactory& operator=(ArchiveFactory&&) noexcept = delete; - ~ArchiveFactory(); + Facade7z(); + Facade7z(const Facade7z&) = delete; + Facade7z(Facade7z&&) noexcept = delete; + Facade7z& operator=(const Facade7z&) = delete; + Facade7z& operator=(Facade7z&&) noexcept = delete; + ~Facade7z(); auto createInArchive(unsigned FormatId = 7) const -> IInArchive*; auto createOutArchive(unsigned FormatId = 7) const -> IOutArchive*; diff --git a/main.cpp b/main.cpp index 81ebb03..e632491 100644 --- a/main.cpp +++ b/main.cpp @@ -1,7 +1,7 @@ #include #include -#include "ArchiveFactory.h" +#include "Facade7z.h" #include "ArchiveProperties.h" #include #include <7zip/ICoder.h> @@ -42,7 +42,7 @@ std::string getFileName(IInArchive* Archive, UInt32 Index) } -void extractStuff(ArchiveFactory& Factory) +void extractStuff(Facade7z& Factory) { const unsigned ArchiveFormatId = 0x07; //std::filesystem::path TestArchive("./Archive-Password2.7z"); @@ -83,7 +83,7 @@ void extractStuff(ArchiveFactory& Factory) Archive->Extract(&ItemIndex, 1, false, ExtractCallback); } -void compressStuff(ArchiveFactory& Factory) +void compressStuff(Facade7z& Factory) { const unsigned ArchiveFormatId = 0x07; CMyComPtr OutArchive = Factory.createOutArchive(ArchiveFormatId); @@ -111,7 +111,7 @@ void compressStuff(ArchiveFactory& Factory) { for (const int GeneratedArchiveIndex : std::views::iota(1, 100)) { - const std::filesystem::path Candidate = std::filesystem::current_path() / fmt::format("generatedArchive_{}.{}", GeneratedArchiveIndex, ArchiveFactory::getFileExtensionFromFormatId(ArchiveFormatId)); + const std::filesystem::path Candidate = std::filesystem::current_path() / fmt::format("generatedArchive_{}.{}", GeneratedArchiveIndex, Facade7z::getFileExtensionFromFormatId(ArchiveFormatId)); if (!std::filesystem::exists(Candidate)) return Candidate; } @@ -122,7 +122,7 @@ void compressStuff(ArchiveFactory& Factory) OutFile.write(reinterpret_cast(Buffer.data()), Buffer.size()); } -void hashStuff(ArchiveFactory& Factory) +void hashStuff(Facade7z& Factory) { CMyComPtr Hasher = Factory.createHasher("SHA256"); Hasher->Init(); @@ -137,7 +137,7 @@ void hashStuff(ArchiveFactory& Factory) int main() { fmt::print("Running in directory {}.\n", std::filesystem::current_path()); - ArchiveFactory Factory; + Facade7z Factory; fmt::print("7zip DLL version {}.{}.\n", Factory.getMajorVersion(), Factory.getMinorVersion()); fmt::print("Number of supported formats {}.\n", Factory.getNumberOfFormats()); extractStuff(Factory);