Skip to content

fix: update current filename display during p7zip compression #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LiHua000 wants to merge 1 commit into
base: release/eagle
Choose a base branch
from
+59 −15
Open

fix: update current filename display during p7zip compression #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 58 additions & 15 deletions 3rdparty/interface/archiveinterface/cliinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,12 @@ PluginFinishType CliInterface::addFiles(const QList<FileEntry> &files, const Com

m_isTar7z = false;

// 计算并缓存总文件大小，避免在handleProgress中重复计算
m_totalFileSize = 0;
for (const auto &file : m_files) {
m_totalFileSize += file.qSize;
}

bool ret = false;
QStringList fileList;

Expand Down Expand Up @@ -817,39 +823,76 @@ void CliInterface::handleProgress(const QString &line)
if (percentage > 0) {
if (line.contains("\b\b\b\b") == true) {
QString strfilename;
if (m_workStatus == WT_Extract || m_workStatus == WT_Add) { // 解压、压缩解析文件名
int count = line.indexOf("+"); // 获取压缩参数解析

// 解压参数解析
if (-1 == count) {
count = line.indexOf("-");
}

// 更新参数解析
if (-1 == count) {
count = line.indexOf("U");
}
if (m_workStatus == WT_Extract) { // 解压解析文件名
int count = line.indexOf("-"); // 解压参数解析

if (count > 0) {
strfilename = line.midRef(count + 2).toString(); // 文件名
// 右键 解压到当前文件夹
if (m_workStatus == WT_Extract && !m_extractOptions.bExistList && m_indexOfListRootEntry == 0) {
if (!m_extractOptions.bExistList && m_indexOfListRootEntry == 0) {
m_indexOfListRootEntry++;
FileEntry entry;
entry.strFullPath = strfilename;
DataManager::get_instance().archiveData().listRootEntry << entry;
}
}
} else { // 删除解析文件名
} else if (m_workStatus == WT_Add) { // 压缩：根据进度百分比计算当前文件
// p7zip在压缩时只显示最后一个文件名，需要根据进度推断当前文件
if (!m_files.isEmpty()) {
// 如果总大小为0，使用文件数量平均分配
if (m_totalFileSize == 0) {
int fileIndex = (percentage * m_files.size()) / 100;
if (fileIndex >= m_files.size()) {
fileIndex = m_files.size() - 1;
}
strfilename = m_files[fileIndex].strFileName;
if (strfilename.isEmpty()) {
strfilename = QFileInfo(m_files[fileIndex].strFullPath).fileName();
}
} else {
// 根据进度计算已压缩的大小
qint64 compressedSize = (percentage * m_totalFileSize) / 100;

// 找到当前正在压缩的文件
qint64 accumulatedSize = 0;
int fileIndex = 0;
for (int i = 0; i < m_files.size(); ++i) {
accumulatedSize += m_files[i].qSize;
if (accumulatedSize > compressedSize) {
fileIndex = i;
break;
}
fileIndex = i; // 防止最后一个文件时索引越界
}

// 确保索引在有效范围内
if (fileIndex >= m_files.size()) {
fileIndex = m_files.size() - 1;
}

strfilename = m_files[fileIndex].strFileName;
if (strfilename.isEmpty()) {
strfilename = QFileInfo(m_files[fileIndex].strFullPath).fileName();
}
}
}
} else { // 删除、重命名等操作解析文件名
if (line.contains("% = ")) {
strfilename = line.right(line.length() - line.indexOf(QLatin1Char('=')) - 2);
} else if (line.contains("% R ")) {
strfilename = line.right(line.length() - line.indexOf(QLatin1Char('R')) - 2);
} else if (line.contains("U ")) { // 重命名操作
int count = line.indexOf("U ");
if (count > 0) {
strfilename = line.midRef(count + 2).toString();
}
}
}

emit signalprogress(percentage);
emit signalCurFileName(strfilename);
if (!strfilename.isEmpty()) {
emit signalCurFileName(strfilename);
}
}
} else {
// 7z解压小文件无法获取文件名添加一个空的entry
Expand Down
1 change: 1 addition & 0 deletions 3rdparty/interface/archiveinterface/cliinterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ private slots:
qint64 m_processId; // 进程Id
bool m_isTar7z = false; // 是否是tar.7z文件
qint64 m_filesSize; //选择需要压缩的文件大小，压缩tar.7z时使用
qint64 m_totalFileSize = 0; // 待压缩文件总大小（缓存，避免在handleProgress中重复计算）
QString m_rootEntry; // 追加压缩文件夹的时候记录上一层节点
int m_indexOfListRootEntry = 0; // 右键解压到当前文件夹时的数据
QMap<QString, int> m_mapLongName; // 长文件名统计
Expand Down
Loading