aboutsummaryrefslogtreecommitdiffstats
path: root/src/core/function/ArchiveFileOperator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/function/ArchiveFileOperator.cpp')
-rw-r--r--src/core/function/ArchiveFileOperator.cpp79
1 files changed, 38 insertions, 41 deletions
diff --git a/src/core/function/ArchiveFileOperator.cpp b/src/core/function/ArchiveFileOperator.cpp
index 475ef434..0df1a284 100644
--- a/src/core/function/ArchiveFileOperator.cpp
+++ b/src/core/function/ArchiveFileOperator.cpp
@@ -46,14 +46,14 @@ auto CopyData(struct archive *ar, struct archive *aw) -> int {
r = archive_read_data_block(ar, &buff, &size, &offset);
if (r == ARCHIVE_EOF) return (ARCHIVE_OK);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_read_data_block() failed: {}",
- archive_error_string(ar));
+ qCWarning(core) << "archive_read_data_block() failed: "
+ << archive_error_string(ar);
return (r);
}
r = archive_write_data_block(aw, buff, size, offset);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_write_data_block() failed: {}",
- archive_error_string(aw));
+ qCWarning(core) << "archive_write_data_block() failed: "
+ << archive_error_string(aw);
return (r);
}
}
@@ -113,8 +113,8 @@ void ArchiveFileOperator::NewArchive2DataExchanger(
#endif
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_read_disk_open() failed: {}, abort...",
- archive_error_string(disk));
+ qCWarning(core, "archive_read_disk_open() failed: %s, abort...",
+ archive_error_string(disk));
archive_read_free(disk);
archive_write_free(archive);
return -1;
@@ -125,8 +125,9 @@ void ArchiveFileOperator::NewArchive2DataExchanger(
r = archive_read_next_header2(disk, entry);
if (r == ARCHIVE_EOF) break;
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR(
- "archive_read_next_header2() failed, ret: {}, explain: {}", r,
+ qCWarning(
+ core,
+ "archive_read_next_header2() failed, ret: %d, explain: %s", r,
archive_error_string(disk));
ret = -1;
break;
@@ -143,11 +144,8 @@ void ArchiveFileOperator::NewArchive2DataExchanger(
#endif
QFile file(source_path);
-#ifdef QT5_BUILD
+
if (file.open(QIODevice::ReadOnly)) {
-#else
- if (file.open(QIODeviceBase::ReadOnly)) {
-#endif
// turn absolute path to relative path
auto relativ_path_name = base_path.relativeFilePath(source_path);
archive_entry_set_pathname(entry, relativ_path_name.toUtf8());
@@ -164,17 +162,17 @@ void ArchiveFileOperator::NewArchive2DataExchanger(
r = archive_write_header(archive, entry);
if (r < ARCHIVE_OK) {
- GF_CORE_LOG_ERROR(
- "archive_write_header() failed, ret: {}, explain: {} ", r,
- archive_error_string(archive));
+ qCWarning(core,
+ "archive_write_header() failed, ret: %d, explain: %s",
+ r, archive_error_string(archive));
continue;
}
if (r == ARCHIVE_FATAL) {
- GF_CORE_LOG_ERROR(
- "archive_write_header() failed, ret: {}, explain: {}, "
- "abort ...",
- r, archive_error_string(archive));
+ qCWarning(core,
+ "archive_write_header() failed, ret: %d, explain: %s, "
+ "abort ...",
+ r, archive_error_string(archive));
ret = -1;
break;
}
@@ -201,7 +199,6 @@ void ArchiveFileOperator::NewArchive2DataExchanger(
void ArchiveFileOperator::ExtractArchiveFromDataExchanger(
std::shared_ptr<GFDataExchanger> ex, const QString &target_path,
const OperationCallback &cb) {
- GF_CORE_LOG_INFO("target path: {}", target_path);
RunIOOperaAsync(
[=](const DataObjectPtr &data_object) -> GFError {
auto *archive = archive_read_new();
@@ -209,17 +206,17 @@ void ArchiveFileOperator::ExtractArchiveFromDataExchanger(
auto r = archive_read_support_filter_all(archive);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR(
- "archive_read_support_filter_all(), ret: {}, reason: {}", r,
- archive_error_string(archive));
+ qCWarning(core,
+ "archive_read_support_filter_all(), ret: %d, reason: %s", r,
+ archive_error_string(archive));
return r;
}
r = archive_read_support_format_all(archive);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR(
- "archive_read_support_format_all(), ret: {}, reason: {}", r,
- archive_error_string(archive));
+ qCWarning(core,
+ "archive_read_support_format_all(), ret: %d, reason: %s", r,
+ archive_error_string(archive));
return r;
}
@@ -230,16 +227,16 @@ void ArchiveFileOperator::ExtractArchiveFromDataExchanger(
nullptr);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_read_open(), ret: {}, reason: {}", r,
- archive_error_string(archive));
+ qCWarning(core, "archive_read_open(), ret: %d, reason: %s", r,
+ archive_error_string(archive));
return r;
}
r = archive_write_disk_set_options(ext, 0);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR(
- "archive_write_disk_set_options(), ret: {}, reason: {}", r,
- archive_error_string(archive));
+ qCWarning(core,
+ "archive_write_disk_set_options(), ret: %d, reason: %s", r,
+ archive_error_string(archive));
return r;
}
@@ -248,8 +245,8 @@ void ArchiveFileOperator::ExtractArchiveFromDataExchanger(
r = archive_read_next_header(archive, &entry);
if (r == ARCHIVE_EOF) break;
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_read_next_header(), ret: {}, reason: {}",
- r, archive_error_string(archive));
+ qCWarning(core, "archive_read_next_header(), ret: %d, reason: %s",
+ r, archive_error_string(archive));
break;
}
@@ -267,8 +264,8 @@ void ArchiveFileOperator::ExtractArchiveFromDataExchanger(
r = archive_write_header(ext, entry);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_write_header(), ret: {}, reason: {}", r,
- archive_error_string(archive));
+ qCWarning(core, "archive_write_header(), ret: %d, reason: %s", r,
+ archive_error_string(archive));
} else {
r = CopyData(archive, ext);
}
@@ -276,13 +273,13 @@ void ArchiveFileOperator::ExtractArchiveFromDataExchanger(
r = archive_read_free(archive);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_read_free(), ret: {}, reason: {}", r,
- archive_error_string(archive));
+ qCWarning(core, "archive_read_free(), ret: %d, reason: %s", r,
+ archive_error_string(archive));
}
r = archive_write_free(ext);
if (r != ARCHIVE_OK) {
- GF_CORE_LOG_ERROR("archive_read_free(), ret: {}, reason: {}", r,
- archive_error_string(archive));
+ qCWarning(core, "archive_read_free(), ret: %d, reason: %s", r,
+ archive_error_string(archive));
}
return 0;
@@ -302,8 +299,8 @@ void ArchiveFileOperator::ListArchive(const QString &archive_path) {
10240); // Note 1
if (r != ARCHIVE_OK) return;
while (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
- GF_CORE_LOG_DEBUG("File: {}", archive_entry_pathname(entry));
- GF_CORE_LOG_DEBUG("File Path: {}", archive_entry_pathname(entry));
+ qCDebug(core, core, "File: %s", archive_entry_pathname(entry));
+ qCDebug(core, core, "File Path: %s", archive_entry_pathname(entry));
archive_read_data_skip(a); // Note 2
}
r = archive_read_free(a); // Note 3
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 18:19:03 +0000