From 7c21fdd97132e63572a6aca6fa0492d2ce74e777 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 16 Oct 2023 03:47:52 +0800 Subject: feat: start to add plugin system and do some improve on project configuration --- src/core/function/ArchiveFileOperator.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index 4db5af5f..749cf2f1 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -34,14 +34,6 @@ namespace GpgFrontend { -struct ArchiveStruct { - struct archive *archive; - struct archive_entry *entry; - int fd; - bool is_open; - std::string name; -}; - class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { public: static void ListArchive(const std::filesystem::path &archive_path); -- cgit v1.2.3 From 95997d27106daf91336847f50efaaa32279b7fc7 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 16 Oct 2023 17:54:05 +0800 Subject: fix: check and update copyright at files --- src/core/function/ArchiveFileOperator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index 749cf2f1..0531879a 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -1,5 +1,5 @@ /** - * Copyright (C) 2021 Saturneric + * Copyright (C) 2021 Saturneric * * This file is part of GpgFrontend. * @@ -20,7 +20,7 @@ * the gpg4usb project, which is under GPL-3.0-or-later. * * All the source code of GpgFrontend was modified and released by - * Saturneric starting on May 12, 2021. + * Saturneric starting on May 12, 2021. * * SPDX-License-Identifier: GPL-3.0-or-later * -- cgit v1.2.3 From 8fdeb3af49999f29e017b7f7a70bd36f020ba721 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 23 Oct 2023 18:27:25 +0800 Subject: perf: reduce header includes and improve build speed --- src/core/function/ArchiveFileOperator.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index 0531879a..cc74231d 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -26,8 +26,7 @@ * */ -#ifndef GPGFRONTEND_ARCHIVEFILEOPERATOR_H -#define GPGFRONTEND_ARCHIVEFILEOPERATOR_H +#pragma once #include "core/GpgFrontendCore.h" #include "core/function/FileOperator.h" @@ -47,5 +46,3 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { const std::filesystem::path &base_path); }; } // namespace GpgFrontend - -#endif // GPGFRONTEND_ARCHIVEFILEOPERATOR_H -- cgit v1.2.3 From 889cb8092381b073a0f4a0411a4ede04cd7bdd14 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 6 Nov 2023 20:49:44 +0800 Subject: refactor: improve the code structure of core --- src/core/function/ArchiveFileOperator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index cc74231d..e4bf2011 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -29,7 +29,7 @@ #pragma once #include "core/GpgFrontendCore.h" -#include "core/function/FileOperator.h" +#include "core/utils/IOUtils.h" namespace GpgFrontend { -- cgit v1.2.3 From 3ad7fecdb6458fdd6f146bed19fe643c7f93e905 Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 7 Nov 2023 15:18:06 +0800 Subject: refactor: remove CommonUtils at core --- src/core/function/ArchiveFileOperator.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index e4bf2011..7cbe644c 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -35,13 +35,32 @@ namespace GpgFrontend { class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { public: + /** + * @brief + * + * @param archive_path + */ static void ListArchive(const std::filesystem::path &archive_path); + /** + * @brief Create a Archive object + * + * @param base_path + * @param archive_path + * @param compress + * @param files + */ static void CreateArchive(const std::filesystem::path &base_path, const std::filesystem::path &archive_path, int compress, const std::vector &files); + /** + * @brief + * + * @param archive_path + * @param base_path + */ static void ExtractArchive(const std::filesystem::path &archive_path, const std::filesystem::path &base_path); }; -- cgit v1.2.3 From 300e55bf5bddc393de050c2ca9a0356fce9a8a9d Mon Sep 17 00:00:00 2001 From: saturneric Date: Thu, 28 Dec 2023 14:32:49 +0800 Subject: feat: add simple archiving functions for encrypt and decrypt --- src/core/function/ArchiveFileOperator.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index 7cbe644c..86a3070d 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -29,6 +29,7 @@ #pragma once #include "core/GpgFrontendCore.h" +#include "core/typedef/CoreTypedef.h" #include "core/utils/IOUtils.h" namespace GpgFrontend { @@ -50,10 +51,8 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { * @param compress * @param files */ - static void CreateArchive(const std::filesystem::path &base_path, - const std::filesystem::path &archive_path, - int compress, - const std::vector &files); + static void NewArchive2Fd(const std::filesystem::path &target_directory, + int fd, const OperationCallback &cb); /** * @brief @@ -61,7 +60,8 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { * @param archive_path * @param base_path */ - static void ExtractArchive(const std::filesystem::path &archive_path, - const std::filesystem::path &base_path); + static void ExtractArchiveFromFd(int fd, + const std::filesystem::path &target_path, + const OperationCallback &cb); }; } // namespace GpgFrontend -- cgit v1.2.3 From 9f7593eab9b2d6f6fa6d76a303975b355b6ab458 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sat, 30 Dec 2023 19:55:20 +0800 Subject: feat: do not load entire data to memory in libarchive operations --- src/core/function/ArchiveFileOperator.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index 86a3070d..ce3022bd 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -29,6 +29,7 @@ #pragma once #include "core/GpgFrontendCore.h" +#include "core/model/GFDataExchanger.h" #include "core/typedef/CoreTypedef.h" #include "core/utils/IOUtils.h" @@ -51,8 +52,9 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { * @param compress * @param files */ - static void NewArchive2Fd(const std::filesystem::path &target_directory, - int fd, const OperationCallback &cb); + static void NewArchive2DataExchanger( + const std::filesystem::path &target_directory, + std::shared_ptr, const OperationCallback &cb); /** * @brief @@ -60,8 +62,8 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { * @param archive_path * @param base_path */ - static void ExtractArchiveFromFd(int fd, - const std::filesystem::path &target_path, - const OperationCallback &cb); + static void ExtractArchiveFromDataExchanger( + std::shared_ptr fd, + const std::filesystem::path &target_path, const OperationCallback &cb); }; } // namespace GpgFrontend -- cgit v1.2.3 From 6983b5c1dd82d159236ebd06cf17f071cc9c1ee9 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jan 2024 23:08:38 +0800 Subject: refactor: remove boost and use QString instead of std::filesystem::path --- src/core/function/ArchiveFileOperator.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/function/ArchiveFileOperator.h') diff --git a/src/core/function/ArchiveFileOperator.h b/src/core/function/ArchiveFileOperator.h index ce3022bd..bfeec0c4 100644 --- a/src/core/function/ArchiveFileOperator.h +++ b/src/core/function/ArchiveFileOperator.h @@ -42,7 +42,7 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { * * @param archive_path */ - static void ListArchive(const std::filesystem::path &archive_path); + static void ListArchive(const QString &archive_path); /** * @brief Create a Archive object @@ -52,9 +52,9 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { * @param compress * @param files */ - static void NewArchive2DataExchanger( - const std::filesystem::path &target_directory, - std::shared_ptr, const OperationCallback &cb); + static void NewArchive2DataExchanger(const QString &target_directory, + std::shared_ptr, + const OperationCallback &cb); /** * @brief @@ -63,7 +63,7 @@ class GPGFRONTEND_CORE_EXPORT ArchiveFileOperator { * @param base_path */ static void ExtractArchiveFromDataExchanger( - std::shared_ptr fd, - const std::filesystem::path &target_path, const OperationCallback &cb); + std::shared_ptr fd, const QString &target_path, + const OperationCallback &cb); }; } // namespace GpgFrontend -- cgit v1.2.3