Skip to content
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.

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

Add more details to FileManager error report #1895

Merged
merged 28 commits into from
Nov 30, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
741a56d
Fix case where saving with no undo changes would fail
MrStevns Nov 22, 2024
0d9bf8a
QMiniz: Simplify logic
MrStevns Nov 22, 2024
871ccc9
QMiniz: Make sure to abort when failing to compress file
MrStevns Nov 22, 2024
33115d4
Improve the error detail log for readability
MrStevns Nov 22, 2024
466f6be
ErrorDialog: Add copy to clipboard
MrStevns Nov 22, 2024
335d88d
Improve error details for readability - take 2
MrStevns Nov 23, 2024
422cce5
Improve error details for readability - take 3
MrStevns Nov 23, 2024
8b705f8
Write a note when a backup has been made
MrStevns Nov 23, 2024
30397b2
FileManager: Fix logic does not account for existing backup files
MrStevns Nov 23, 2024
e106ac5
Improve layer saving diagnostics
MrStevns Nov 23, 2024
93fd589
Fix where where project couldn't be saved because miniz tried to zip …
MrStevns Nov 23, 2024
fb0b24e
Improve diagnostics around qminiz and archiving
MrStevns Nov 23, 2024
afa857f
Add text explaining the importance of the bug report
MrStevns Nov 23, 2024
05b0381
Add missing space
MrStevns Nov 23, 2024
dcd70c5
QMiniz: make sure to always close reader
MrStevns Nov 23, 2024
09deac9
Layer: Add error diagnostics when failing to save one or more layers
MrStevns Nov 23, 2024
66034b3
FileManager:writeMainXML: Slightly safer way to close file
MrStevns Nov 23, 2024
566ae76
QMiniz: Make errors more explicit and fail quickly.
MrStevns Nov 24, 2024
33eed04
Add error keyword to writePalette
MrStevns Nov 24, 2024
b511d5d
FileManager: close file after recovery.
MrStevns Nov 24, 2024
93e8213
Remove indentation
MrStevns Nov 24, 2024
8480697
FileManager: Check for Unzipping errors
MrStevns Nov 24, 2024
3447d67
QMiniz: Fix typo...
MrStevns Nov 24, 2024
d4bdc23
Add missing QFile::close where a file has been opened.
MrStevns Nov 24, 2024
87007c5
ErrorDialog: shorten description
MrStevns Nov 28, 2024
85b43e6
QMiniz: Only close if we succeded to open it
MrStevns Nov 28, 2024
685f96f
Remove explicit file.close because QFile already handles this
MrStevns Nov 29, 2024
055dd7f
Fix relative include path
MrStevns Nov 29, 2024
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
Prev Previous commit
Next Next commit
QMiniz: Only close if we succeded to open it
.
  • Loading branch information
MrStevns committed Nov 28, 2024
commit 85b43e6d24f01621e3cc56958e43e0cc5b58f628
13 changes: 6 additions & 7 deletions core_lib/src/qminiz.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@ Status MiniZ::compressFolder(QString zipFilePath, QString srcFolderPath, const Q
mz_zip_zero_struct(mz);

mz_bool ok = mz_zip_writer_init_file(mz, zipFilePath.toUtf8().data(), 0);
ScopeGuard mzScopeGuard2([&] {
mz_zip_writer_end(mz);
});

if (!ok)
{
mz_zip_error err = mz_zip_get_last_error(mz);
dd << QString("Error: Failed to init writer. Error code: %1, reason: %2").arg(static_cast<int>(err)).arg(mz_zip_get_error_string(err));
return Status(Status::FAIL, dd);
}
ScopeGuard mzScopeGuard2([&] {
mz_zip_writer_end(mz);
});

// Add special uncompressed mimetype file to help with the identification of projects
{
Expand Down Expand Up @@ -172,15 +172,14 @@ Status MiniZ::uncompressFolder(QString zipFilePath, QString destPath)
mz_zip_zero_struct(mz);

mz_bool ok = mz_zip_reader_init_file(mz, zipFilePath.toUtf8().data(), 0);
ScopeGuard mzScopeGuard2([&] {
mz_zip_reader_end(mz);
});

if (!ok) {
mz_zip_error err = mz_zip_get_last_error(mz);
dd << QString("Error: Failed to init reader. Error code: %1, reason: %2").arg(static_cast<int>(err)).arg(mz_zip_get_error_string(err));
return Status(Status::FAIL, dd);
}
ScopeGuard mzScopeGuard2([&] {
mz_zip_reader_end(mz);
});

int num = mz_zip_reader_get_num_files(mz);

Expand Down
Loading