chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix zipping on Windows.

Browse Source
This commit is contained in:
sawinglogz 2020-04-24 16:58:10 -04:00
parent 2b6cdccb16
commit 2ac43a4a79
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/mainwindow.cpp
View File

@ -2702,6 +2702,7 @@ void MainWindow::on_actionCreate_Card_zip_triggered()
for (auto & datacard : datacards) { for (auto & datacard : datacards) {
QString cardPath = QDir(datacard.path).canonicalPath(); QString cardPath = QDir(datacard.path).canonicalPath();
QString filename; QString filename;
QString prefix;
// Loop until a valid folder is selected or the user cancels. Disallow the SD card itself! // Loop until a valid folder is selected or the user cancels. Disallow the SD card itself!
while (true) { while (true) {
@ -2715,6 +2716,7 @@ void MainWindow::on_actionCreate_Card_zip_triggered()
} else { } else {
infostr = datacard.loader->loaderName(); infostr = datacard.loader->loaderName();
} }
prefix = infostr;
folder += QDir::separator() + infostr + ".zip"; folder += QDir::separator() + infostr + ".zip";
filename = QFileDialog::getSaveFileName(this, tr("Choose where to save zip"), folder, tr("ZIP files (*.zip)")); filename = QFileDialog::getSaveFileName(this, tr("Choose where to save zip"), folder, tr("ZIP files (*.zip)"));
@ -2747,7 +2749,7 @@ void MainWindow::on_actionCreate_Card_zip_triggered()
if (ok) { if (ok) {
ProgressDialog * prog = new ProgressDialog(this); ProgressDialog * prog = new ProgressDialog(this);
prog->setMessage(tr("Creating zip...")); prog->setMessage(tr("Creating zip..."));
ok = z.AddDirectory(cardPath, prog); ok = z.AddDirectory(cardPath, prefix, prog);
z.Close(); z.Close();
} else { } else {
qWarning() << "Unable to open" << filename; qWarning() << "Unable to open" << filename;
@ -2807,7 +2809,7 @@ void MainWindow::on_actionCreate_OSCAR_Data_zip_triggered()
if (ok) { if (ok) {
debugLog.write(ui->logText->toPlainText().toLocal8Bit().data()); debugLog.write(ui->logText->toPlainText().toLocal8Bit().data());
debugLog.close(); debugLog.close();
QString debugLogName = oscarData.dirName() + QDir::separator() + QFileInfo(debugLog).fileName(); QString debugLogName = oscarData.dirName() + "/" + QFileInfo(debugLog).fileName();
ok = z.AddFile(debugLog.fileName(), debugLogName); ok = z.AddFile(debugLog.fileName(), debugLogName);
if (!ok) { if (!ok) {
qWarning() << "Unable to add debug log to zip!"; qWarning() << "Unable to add debug log to zip!";

4
oscar/zip.cpp
View File

@ -136,7 +136,7 @@ bool ZipFile::AddFile(const QString & path, const QString & name)
if (archive_name.isEmpty()) archive_name = fi.fileName(); if (archive_name.isEmpty()) archive_name = fi.fileName();
if (fi.isDir()) { if (fi.isDir()) {
archive_name += QDir::separator(); archive_name += "/";
m_progress += 1; m_progress += 1;
} else { } else {
// Open and read file into memory. // Open and read file into memory.
@ -184,7 +184,7 @@ bool FileQueue::AddDirectory(const QString & path, const QString & prefix)
for (auto & fi : flist) { for (auto & fi : flist) {
QString canonicalPath = fi.canonicalFilePath(); QString canonicalPath = fi.canonicalFilePath();
QString relative_path = base + QDir::separator() + fi.fileName(); QString relative_path = base + "/" + fi.fileName();
if (fi.isSymLink()) { if (fi.isSymLink()) {
qWarning() << "skipping symlink" << canonicalPath << fi.symLinkTarget(); qWarning() << "skipping symlink" << canonicalPath << fi.symLinkTarget();
} else if (fi.isDir()) { } else if (fi.isDir()) {