Skip to content

fix: Update .gitignore to include additional build and release artifacts #303

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

Merged
deepin-bot merged 2 commits into from
Jul 28, 2025
Merged

fix: Update .gitignore to include additional build and release artifacts #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b71f100
fix: Update .gitignore to include additional build and release artifacts
pppanghu77 Jul 28, 2025
a4edeae
fix: Improve folder name handling in archive path construction
pppanghu77 Jul 28, 2025
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
9 changes: 8 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ CMakeLists.txt.user*



# QtCreator 4.8< compilation database
# QtCreator 4.8< compilation database

compile_commands.json

Expand All @@ -103,3 +103,10 @@ so(cmake).sh
tests/test_output
translations/*.qm
build
release
obj-x86_64-linux-gnu
debian/.debhelper
debian/deepin-compressor
debian/deepin-compressor.debhelper.log
debian/deepin-compressor.substvars
debian/files
20 changes: 15 additions & 5 deletions src/source/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2253,7 +2253,7 @@ void MainWindow::saveConfigWinState()
// 使用默认尺寸或之前保存的正常尺寸
QVariant tempWidth = m_pSettings->value(MAINWINDOW_WIDTH_NAME);
QVariant tempHeight = m_pSettings->value(MAINWINDOW_HEIGHT_NAME);

if (!tempWidth.isValid() || !tempHeight.isValid()) {
// 如果没有之前保存的尺寸，使用默认尺寸
m_pSettings->setValue(MAINWINDOW_WIDTH_NAME, MAINWINDOW_DEFAULTW);
Expand All @@ -2279,10 +2279,10 @@ void MainWindow::restoreConfigWinState()
// 获取保存的窗口状态
Qt::WindowState savedState = static_cast<Qt::WindowState>(
m_pSettings->value(MAINWINDOW_STATE_NAME, Qt::WindowNoState).toInt());

// 先设置正常尺寸
resize(getConfigWinSize());

// 然后应用状态
if (savedState == Qt::WindowMaximized) {
// 使用QTimer延迟执行，确保窗口完全初始化后再最大化
Expand Down Expand Up @@ -2498,12 +2498,22 @@ bool MainWindow::handleArguments_RightMenu(const QStringList &listParam)
//这里使用最后一个文件夹名进行压缩，防止特殊字符压缩不成功
QRegExp reg("^\s+|[\\:*\"'?<>|\r\n\t]");
if (strpath.mid(iIndex).indexOf(reg) != -1) {
QString compressor = strpath.split("=").last() + strSuffix;
QString folderName = strpath.split("=").last();
// 处理长文件夹名称，避免超出系统限制
if (folderName.length() + strSuffix.length() > FILE_TRUNCATION_LENGTH) {
folderName = folderName.left(FILE_TRUNCATION_LENGTH - strSuffix.length());
}
QString compressor = folderName + strSuffix;
if (compressor.indexOf(reg) != -1)
compressor.remove(reg);
strArchivePath += QDir::separator() + compressor;
} else {
strArchivePath += strpath.mid(iIndex) + strSuffix;
QString folderName = strpath.mid(iIndex + 1); // 去掉前面的分隔符
// 处理长文件夹名称，避免超出系统限制
if (folderName.length() + strSuffix.length() > FILE_TRUNCATION_LENGTH) {
folderName = folderName.left(FILE_TRUNCATION_LENGTH - strSuffix.length());
}
strArchivePath += QDir::separator() + folderName + strSuffix;
}
}

Expand Down