Merge pull request #8738 from JosJuice/convert-dialog

Replace the compress/uncompress actions with a convert dialog

Source/Core/DolphinQt/CMakeLists.txt

@@ -18,6 +18,8 @@ add_executable(dolphin-emu
   AboutDialog.h
   CheatsManager.cpp
   CheatsManager.h
+  ConvertDialog.cpp
+  ConvertDialog.h
   DiscordHandler.cpp
   DiscordHandler.h
   DiscordJoinRequestDialog.cpp

Source/Core/DolphinQt/ConvertDialog.cpp

@@ -0,0 +1,374 @@
+// Copyright 2020 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "DolphinQt/ConvertDialog.h"
+
+#include <algorithm>
+#include <functional>
+#include <future>
+#include <memory>
+#include <utility>
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QErrorMessage>
+#include <QFileDialog>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QList>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QString>
+#include <QVBoxLayout>
+
+#include "Common/Assert.h"
+#include "Common/Logging/Log.h"
+#include "DiscIO/Blob.h"
+#include "DiscIO/ScrubbedBlob.h"
+#include "DolphinQt/QtUtils/ModalMessageBox.h"
+#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
+#include "UICommon/GameFile.h"
+#include "UICommon/UICommon.h"
+
+static bool CompressCB(const std::string& text, float percent, void* ptr)
+{
+  if (ptr == nullptr)
+    return false;
+
+  auto* progress_dialog = static_cast<ParallelProgressDialog*>(ptr);
+
+  progress_dialog->SetValue(percent * 100);
+  return !progress_dialog->WasCanceled();
+}
+
+ConvertDialog::ConvertDialog(QList<std::shared_ptr<const UICommon::GameFile>> files,
+                             QWidget* parent)
+    : QDialog(parent), m_files(std::move(files))
+{
+  ASSERT(!m_files.empty());
+
+  setWindowTitle(tr("Convert"));
+  setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+  QGridLayout* grid_layout = new QGridLayout;
+  grid_layout->setColumnStretch(1, 1);
+
+  m_format = new QComboBox;
+  AddToFormatComboBox(QStringLiteral("ISO"), DiscIO::BlobType::PLAIN);
+  AddToFormatComboBox(QStringLiteral("GCZ"), DiscIO::BlobType::GCZ);
+  grid_layout->addWidget(new QLabel(tr("Format:")), 0, 0);
+  grid_layout->addWidget(m_format, 0, 1);
+
+  m_block_size = new QComboBox;
+  grid_layout->addWidget(new QLabel(tr("Block Size:")), 1, 0);
+  grid_layout->addWidget(m_block_size, 1, 1);
+
+  m_scrub = new QCheckBox;
+  grid_layout->addWidget(new QLabel(tr("Remove Junk Data (Irreversible):")), 2, 0);
+  grid_layout->addWidget(m_scrub, 2, 1);
+  m_scrub->setEnabled(
+      std::none_of(m_files.begin(), m_files.end(), std::mem_fn(&UICommon::GameFile::IsDatelDisc)));
+
+  QPushButton* convert_button = new QPushButton(tr("Convert"));
+
+  QVBoxLayout* options_layout = new QVBoxLayout;
+  options_layout->addLayout(grid_layout);
+  options_layout->addWidget(convert_button);
+  QGroupBox* options_group = new QGroupBox(tr("Options"));
+  options_group->setLayout(options_layout);
+
+  QLabel* info_text =
+      new QLabel(tr("ISO: A simple and robust format which is supported by many programs. "
+                    "It takes up more space than any other format.\n\n"
+                    "GCZ: A basic compressed format which is compatible with most versions of "
+                    "Dolphin and some other programs. It can't efficiently compress junk data "
+                    "(unless removed) or encrypted Wii data."));
+  info_text->setWordWrap(true);
+
+  QVBoxLayout* info_layout = new QVBoxLayout;
+  info_layout->addWidget(info_text);
+  QGroupBox* info_group = new QGroupBox(tr("Info"));
+  info_group->setLayout(info_layout);
+
+  QVBoxLayout* main_layout = new QVBoxLayout;
+  main_layout->addWidget(options_group);
+  main_layout->addWidget(info_group);
+
+  setLayout(main_layout);
+
+  connect(m_format, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+          &ConvertDialog::OnFormatChanged);
+  connect(convert_button, &QPushButton::clicked, this, &ConvertDialog::Convert);
+
+  OnFormatChanged();
+}
+
+void ConvertDialog::AddToFormatComboBox(const QString& name, DiscIO::BlobType format)
+{
+  if (std::all_of(m_files.begin(), m_files.end(),
+                  [format](const auto& file) { return file->GetBlobType() == format; }))
+  {
+    return;
+  }
+
+  m_format->addItem(name, static_cast<int>(format));
+}
+
+void ConvertDialog::AddToBlockSizeComboBox(int size)
+{
+  m_block_size->addItem(QString::fromStdString(UICommon::FormatSize(size, 0)), size);
+}
+
+void ConvertDialog::OnFormatChanged()
+{
+  // Because DVD timings are emulated as if we can't read less than an entire ECC block at once
+  // (32 KiB - 0x8000), there is little reason to use a block size smaller than that.
+  constexpr int MIN_BLOCK_SIZE = 0x8000;
+
+  // For performance reasons, blocks shouldn't be too large.
+  // 2 MiB (0x200000) was picked because it is the smallest block size supported by WIA.
+  constexpr int MAX_BLOCK_SIZE = 0x200000;
+
+  const DiscIO::BlobType format = static_cast<DiscIO::BlobType>(m_format->currentData().toInt());
+
+  m_block_size->clear();
+  switch (format)
+  {
+  case DiscIO::BlobType::GCZ:
+  {
+    m_block_size->setEnabled(true);
+
+    // In order for versions of Dolphin prior to 5.0-11893 to be able to convert a GCZ file
+    // to ISO without messing up the final part of the file in some way, the file size
+    // must be an integer multiple of the block size (fixed in 3aa463c) and must not be
+    // an integer multiple of the block size multiplied by 32 (fixed in 26b21e3).
+
+    const auto block_size_ok = [this](int block_size) {
+      return std::all_of(m_files.begin(), m_files.end(), [block_size](const auto& file) {
+        constexpr u64 BLOCKS_PER_BUFFER = 32;
+        const u64 file_size = file->GetVolumeSize();
+        return file_size % block_size == 0 && file_size % (block_size * BLOCKS_PER_BUFFER) != 0;
+      });
+    };
+
+    // Add all block sizes in the normal range that do not cause problems
+    for (int block_size = MIN_BLOCK_SIZE; block_size <= MAX_BLOCK_SIZE; block_size *= 2)
+    {
+      if (block_size_ok(block_size))
+        AddToBlockSizeComboBox(block_size);
+    }
+
+    // If we didn't find a good block size, pick the block size which was hardcoded
+    // in older versions of Dolphin. That way, at least we're not worse than older versions.
+    if (m_block_size->count() == 0)
+    {
+      constexpr int FALLBACK_BLOCK_SIZE = 0x4000;
+      if (!block_size_ok(FALLBACK_BLOCK_SIZE))
+      {
+        ERROR_LOG(MASTER_LOG, "Failed to find a block size which does not cause problems "
+                              "when decompressing using an old version of Dolphin");
+      }
+      AddToBlockSizeComboBox(FALLBACK_BLOCK_SIZE);
+    }
+
+    break;
+  }
+  default:
+    m_block_size->setEnabled(false);
+    break;
+  }
+}
+
+bool ConvertDialog::ShowAreYouSureDialog(const QString& text)
+{
+  ModalMessageBox warning(this);
+  warning.setIcon(QMessageBox::Warning);
+  warning.setWindowTitle(tr("Confirm"));
+  warning.setText(tr("Are you sure?"));
+  warning.setInformativeText(text);
+  warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+
+  return warning.exec() == QMessageBox::Yes;
+}
+
+void ConvertDialog::Convert()
+{
+  const DiscIO::BlobType format = static_cast<DiscIO::BlobType>(m_format->currentData().toInt());
+  const int block_size = m_block_size->currentData().toInt();
+  const bool scrub = m_scrub->isChecked();
+
+  if (scrub && format == DiscIO::BlobType::PLAIN)
+  {
+    if (!ShowAreYouSureDialog(tr("Removing junk data does not save any space when converting to "
+                                 "ISO (unless you package the ISO file in a compressed file format "
+                                 "such as ZIP afterwards). Do you want to continue anyway?")))
+    {
+      return;
+    }
+  }
+
+  if (!scrub && format == DiscIO::BlobType::GCZ &&
+      std::any_of(m_files.begin(), m_files.end(), [](const auto& file) {
+        return file->GetPlatform() == DiscIO::Platform::WiiDisc && !file->IsDatelDisc();
+      }))
+  {
+    if (!ShowAreYouSureDialog(tr("Converting Wii disc images to GCZ without removing junk data "
+                                 "does not save any noticeable amount of space compared to "
+                                 "converting to ISO. Do you want to continue anyway?")))
+    {
+      return;
+    }
+  }
+
+  QString extension;
+  QString filter;
+  switch (format)
+  {
+  case DiscIO::BlobType::PLAIN:
+    extension = QStringLiteral(".iso");
+    filter = tr("Uncompressed GC/Wii images (*.iso *.gcm)");
+    break;
+  case DiscIO::BlobType::GCZ:
+    extension = QStringLiteral(".gcz");
+    filter = tr("Compressed GC/Wii images (*.gcz)");
+    break;
+  default:
+    ASSERT(false);
+    return;
+  }
+
+  QString dst_dir;
+  QString dst_path;
+
+  if (m_files.size() > 1)
+  {
+    dst_dir = QFileDialog::getExistingDirectory(
+        this, tr("Select where you want to save the converted images"),
+        QFileInfo(QString::fromStdString(m_files[0]->GetFilePath())).dir().absolutePath());
+
+    if (dst_dir.isEmpty())
+      return;
+  }
+  else
+  {
+    dst_path = QFileDialog::getSaveFileName(
+        this, tr("Select where you want to save the converted image"),
+        QFileInfo(QString::fromStdString(m_files[0]->GetFilePath()))
+            .dir()
+            .absoluteFilePath(
+                QFileInfo(QString::fromStdString(m_files[0]->GetFilePath())).completeBaseName())
+            .append(extension),
+        filter);
+
+    if (dst_path.isEmpty())
+      return;
+  }
+
+  for (const auto& file : m_files)
+  {
+    const auto original_path = file->GetFilePath();
+    if (m_files.size() > 1)
+    {
+      dst_path =
+          QDir(dst_dir)
+              .absoluteFilePath(QFileInfo(QString::fromStdString(original_path)).completeBaseName())
+              .append(extension);
+      QFileInfo dst_info = QFileInfo(dst_path);
+      if (dst_info.exists())
+      {
+        ModalMessageBox confirm_replace(this);
+        confirm_replace.setIcon(QMessageBox::Warning);
+        confirm_replace.setWindowTitle(tr("Confirm"));
+        confirm_replace.setText(tr("The file %1 already exists.\n"
+                                   "Do you wish to replace it?")
+                                    .arg(dst_info.fileName()));
+        confirm_replace.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+
+        if (confirm_replace.exec() == QMessageBox::No)
+          continue;
+      }
+    }
+
+    ParallelProgressDialog progress_dialog(tr("Converting..."), tr("Abort"), 0, 100, this);
+    progress_dialog.GetRaw()->setWindowModality(Qt::WindowModal);
+    progress_dialog.GetRaw()->setWindowTitle(tr("Progress"));
+
+    if (m_files.size() > 1)
+    {
+      progress_dialog.GetRaw()->setLabelText(
+          tr("Converting...") + QLatin1Char{'\n'} +
+          QFileInfo(QString::fromStdString(original_path)).fileName());
+    }
+
+    std::unique_ptr<DiscIO::BlobReader> blob_reader;
+    bool scrub_current_file = scrub;
+
+    if (scrub_current_file)
+    {
+      blob_reader = DiscIO::ScrubbedBlob::Create(original_path);
+      if (!blob_reader)
+      {
+        const int result =
+            ModalMessageBox::warning(this, tr("Question"),
+                                     tr("Failed to remove junk data from file \"%1\".\n\n"
+                                        "Would you like to convert it without removing junk data?")
+                                         .arg(QString::fromStdString(original_path)),
+                                     QMessageBox::Ok | QMessageBox::Abort);
+
+        if (result == QMessageBox::Ok)
+          scrub_current_file = false;
+        else
+          return;
+      }
+    }
+
+    if (!scrub_current_file)
+      blob_reader = DiscIO::CreateBlobReader(original_path);
+
+    if (!blob_reader)
+    {
+      QErrorMessage(this).showMessage(
+          tr("Failed to open the input file \"%1\".").arg(QString::fromStdString(original_path)));
+    }
+    else
+    {
+      std::future<bool> good;
+
+      if (format == DiscIO::BlobType::PLAIN)
+      {
+        good = std::async(std::launch::async, [&] {
+          const bool good =
+              DiscIO::ConvertToPlain(blob_reader.get(), original_path, dst_path.toStdString(),
+                                     &CompressCB, &progress_dialog);
+          progress_dialog.Reset();
+          return good;
+        });
+      }
+      else if (format == DiscIO::BlobType::GCZ)
+      {
+        good = std::async(std::launch::async, [&] {
+          const bool good =
+              DiscIO::ConvertToGCZ(blob_reader.get(), original_path, dst_path.toStdString(),
+                                   file->GetPlatform() == DiscIO::Platform::WiiDisc ? 1 : 0,
+                                   block_size, &CompressCB, &progress_dialog);
+          progress_dialog.Reset();
+          return good;
+        });
+      }
+
+      progress_dialog.GetRaw()->exec();
+      if (!good.get())
+      {
+        QErrorMessage(this).showMessage(tr("Dolphin failed to complete the requested action."));
+        return;
+      }
+    }
+  }
+
+  ModalMessageBox::information(this, tr("Success"),
+                               tr("Successfully converted %n image(s).", "", m_files.size()));
+
+  close();
+}

Source/Core/DolphinQt/ConvertDialog.h

@@ -0,0 +1,44 @@
+// Copyright 2020 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+
+#include <QDialog>
+#include <QList>
+
+#include "DiscIO/Blob.h"
+
+class QCheckBox;
+class QComboBox;
+
+namespace UICommon
+{
+class GameFile;
+}
+
+class ConvertDialog final : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit ConvertDialog(QList<std::shared_ptr<const UICommon::GameFile>> files,
+                         QWidget* parent = nullptr);
+
+private slots:
+  void OnFormatChanged();
+  void Convert();
+
+private:
+  void AddToFormatComboBox(const QString& name, DiscIO::BlobType format);
+  void AddToBlockSizeComboBox(int size);
+
+  bool ShowAreYouSureDialog(const QString& text);
+
+  QComboBox* m_format;
+  QComboBox* m_block_size;
+  QCheckBox* m_scrub;
+  QList<std::shared_ptr<const UICommon::GameFile>> m_files;
+};

Source/Core/DolphinQt/DolphinQt.vcxproj

@@ -131,6 +131,7 @@
     <QtMoc Include="Config\PropertiesDialog.h" />
     <QtMoc Include="Config\SettingsWindow.h" />
     <QtMoc Include="Config\VerifyWidget.h" />
+    <QtMoc Include="ConvertDialog.h" />
     <QtMoc Include="DiscordHandler.h" />
     <QtMoc Include="DiscordJoinRequestDialog.h" />
     <QtMoc Include="FIFO\FIFOAnalyzer.h" />
@@ -212,6 +213,7 @@
     <ClCompile Include="$(QtMocOutPrefix)DualShockUDPClientWidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)ControllerInterfaceWindow.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)ControllersWindow.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)ConvertDialog.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)DiscordHandler.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)DiscordJoinRequestDialog.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)DoubleClickEventFilter.cpp" />
@@ -374,6 +376,7 @@
     <ClCompile Include="Config\PropertiesDialog.cpp" />
     <ClCompile Include="Config\SettingsWindow.cpp" />
     <ClCompile Include="Config\VerifyWidget.cpp" />
+    <ClCompile Include="ConvertDialog.cpp" />
     <ClCompile Include="Debugger\CodeViewWidget.cpp" />
     <ClCompile Include="Debugger\CodeWidget.cpp" />
     <ClCompile Include="Debugger\JITWidget.cpp" />

Source/Core/DolphinQt/GameList/GameList.cpp

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 #include <cmath>
-#include <future>
+#include <utility>
 
 #include <QDesktopServices>
 #include <QDir>
@@ -40,6 +40,7 @@
 #include "DiscIO/Enums.h"
 
 #include "DolphinQt/Config/PropertiesDialog.h"
+#include "DolphinQt/ConvertDialog.h"
 #include "DolphinQt/GameList/GameListModel.h"
 #include "DolphinQt/GameList/GridProxyModel.h"
 #include "DolphinQt/GameList/ListProxyModel.h"
@@ -53,8 +54,6 @@
 
 #include "UICommon/GameFile.h"
 
-static bool CompressCB(const std::string&, float, void*);
-
 GameList::GameList(QWidget* parent) : QStackedWidget(parent)
 {
   m_model = Settings::Instance().GetGameListModel();
@@ -257,35 +256,16 @@ void GameList::ShowContextMenu(const QPoint&)
 
   if (HasMultipleSelected())
   {
-    bool wii_saves = true;
-    bool compress = false;
-    bool decompress = false;
-
-    for (const auto& game : GetSelectedGames())
+    if (std::all_of(GetSelectedGames().begin(), GetSelectedGames().end(), [](const auto& game) {
+          return DiscIO::IsDisc(game->GetPlatform()) && game->IsVolumeSizeAccurate();
+        }))
     {
-      DiscIO::Platform platform = game->GetPlatform();
-
-      if (platform == DiscIO::Platform::GameCubeDisc || platform == DiscIO::Platform::WiiDisc)
-      {
-        const auto blob_type = game->GetBlobType();
-        if (blob_type == DiscIO::BlobType::GCZ)
-          decompress = true;
-        else if (blob_type == DiscIO::BlobType::PLAIN)
-          compress = true;
-      }
-
-      if (platform != DiscIO::Platform::WiiWAD && platform != DiscIO::Platform::WiiDisc)
-        wii_saves = false;
+      menu->addAction(tr("Convert Selected Files..."), this, &GameList::ConvertFile);
+      menu->addSeparator();
     }
 
-    if (compress)
-      menu->addAction(tr("Compress Selected ISOs..."), this, [this] { CompressISO(false); });
-    if (decompress)
-      menu->addAction(tr("Decompress Selected ISOs..."), this, [this] { CompressISO(true); });
-    if (compress || decompress)
-      menu->addSeparator();
-
-    if (wii_saves)
+    if (std::all_of(GetSelectedGames().begin(), GetSelectedGames().end(),
+                    [](const auto& game) { return DiscIO::IsWii(game->GetPlatform()); }))
     {
       menu->addAction(tr("Export Wii Saves"), this, &GameList::ExportWiiSave);
       menu->addSeparator();
@@ -306,15 +286,13 @@ void GameList::ShowContextMenu(const QPoint&)
       menu->addSeparator();
     }
 
-    if (platform == DiscIO::Platform::GameCubeDisc || platform == DiscIO::Platform::WiiDisc)
+    if (DiscIO::IsDisc(platform))
     {
       menu->addAction(tr("Set as &Default ISO"), this, &GameList::SetDefaultISO);
       const auto blob_type = game->GetBlobType();
 
-      if (blob_type == DiscIO::BlobType::GCZ)
-        menu->addAction(tr("Decompress ISO..."), this, [this] { CompressISO(true); });
-      else if (blob_type == DiscIO::BlobType::PLAIN)
-        menu->addAction(tr("Compress ISO..."), this, [this] { CompressISO(false); });
+      if (game->IsVolumeSizeAccurate())
+        menu->addAction(tr("Convert File..."), this, &GameList::ConvertFile);
 
       QAction* change_disc = menu->addAction(tr("Change &Disc"), this, &GameList::ChangeDisc);
 
@@ -481,157 +459,14 @@ void GameList::OpenWiki()
   QDesktopServices::openUrl(QUrl(url));
 }
 
-void GameList::CompressISO(bool decompress)
+void GameList::ConvertFile()
 {
-  auto files = GetSelectedGames();
-  const auto game = GetSelectedGame();
-
-  if (files.empty() || !game)
+  auto games = GetSelectedGames();
+  if (games.empty())
     return;
 
-  bool wii_warning_given = false;
-  for (QMutableListIterator<std::shared_ptr<const UICommon::GameFile>> it(files); it.hasNext();)
-  {
-    auto file = it.next();
-
-    if ((file->GetPlatform() != DiscIO::Platform::GameCubeDisc &&
-         file->GetPlatform() != DiscIO::Platform::WiiDisc) ||
-        (decompress && file->GetBlobType() != DiscIO::BlobType::GCZ) ||
-        (!decompress && file->GetBlobType() != DiscIO::BlobType::PLAIN))
-    {
-      it.remove();
-      continue;
-    }
-
-    if (!wii_warning_given && !decompress && file->GetPlatform() == DiscIO::Platform::WiiDisc)
-    {
-      ModalMessageBox wii_warning(this);
-      wii_warning.setIcon(QMessageBox::Warning);
-      wii_warning.setWindowTitle(tr("Confirm"));
-      wii_warning.setText(tr("Are you sure?"));
-      wii_warning.setInformativeText(tr(
-          "Compressing a Wii disc image will irreversibly change the compressed copy by removing "
-          "padding data. Your disc image will still work. Continue?"));
-      wii_warning.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-
-      if (wii_warning.exec() == QMessageBox::No)
-        return;
-
-      wii_warning_given = true;
-    }
-  }
-
-  QString dst_dir;
-  QString dst_path;
-
-  if (files.size() > 1)
-  {
-    dst_dir = QFileDialog::getExistingDirectory(
-        this,
-        decompress ? tr("Select where you want to save the decompressed images") :
-                     tr("Select where you want to save the compressed images"),
-        QFileInfo(QString::fromStdString(game->GetFilePath())).dir().absolutePath());
-
-    if (dst_dir.isEmpty())
-      return;
-  }
-  else
-  {
-    dst_path = QFileDialog::getSaveFileName(
-        this,
-        decompress ? tr("Select where you want to save the decompressed image") :
-                     tr("Select where you want to save the compressed image"),
-        QFileInfo(QString::fromStdString(game->GetFilePath()))
-            .dir()
-            .absoluteFilePath(
-                QFileInfo(QString::fromStdString(files[0]->GetFilePath())).completeBaseName())
-            .append(decompress ? QStringLiteral(".gcm") : QStringLiteral(".gcz")),
-        decompress ? tr("Uncompressed GC/Wii images (*.iso *.gcm)") :
-                     tr("Compressed GC/Wii images (*.gcz)"));
-
-    if (dst_path.isEmpty())
-      return;
-  }
-
-  for (const auto& file : files)
-  {
-    const auto original_path = file->GetFilePath();
-    if (files.size() > 1)
-    {
-      dst_path =
-          QDir(dst_dir)
-              .absoluteFilePath(QFileInfo(QString::fromStdString(original_path)).completeBaseName())
-              .append(decompress ? QStringLiteral(".gcm") : QStringLiteral(".gcz"));
-      QFileInfo dst_info = QFileInfo(dst_path);
-      if (dst_info.exists())
-      {
-        ModalMessageBox confirm_replace(this);
-        confirm_replace.setIcon(QMessageBox::Warning);
-        confirm_replace.setWindowTitle(tr("Confirm"));
-        confirm_replace.setText(tr("The file %1 already exists.\n"
-                                   "Do you wish to replace it?")
-                                    .arg(dst_info.fileName()));
-        confirm_replace.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-
-        if (confirm_replace.exec() == QMessageBox::No)
-          continue;
-      }
-    }
-
-    ParallelProgressDialog progress_dialog(
-        decompress ? tr("Decompressing...") : tr("Compressing..."), tr("Abort"), 0, 100, this);
-    progress_dialog.GetRaw()->setWindowModality(Qt::WindowModal);
-    progress_dialog.GetRaw()->setWindowTitle(tr("Progress"));
-
-    std::future<bool> good;
-
-    if (decompress)
-    {
-      if (files.size() > 1)
-      {
-        progress_dialog.GetRaw()->setLabelText(
-            tr("Decompressing...") + QLatin1Char{'\n'} +
-            QFileInfo(QString::fromStdString(original_path)).fileName());
-      }
-
-      good = std::async(std::launch::async, [&] {
-        const bool good = DiscIO::DecompressBlobToFile(original_path, dst_path.toStdString(),
-                                                       &CompressCB, &progress_dialog);
-        progress_dialog.Reset();
-        return good;
-      });
-    }
-    else
-    {
-      if (files.size() > 1)
-      {
-        progress_dialog.GetRaw()->setLabelText(
-            tr("Compressing...") + QLatin1Char{'\n'} +
-            QFileInfo(QString::fromStdString(original_path)).fileName());
-      }
-
-      good = std::async(std::launch::async, [&] {
-        const bool good =
-            DiscIO::CompressFileToBlob(original_path, dst_path.toStdString(),
-                                       file->GetPlatform() == DiscIO::Platform::WiiDisc ? 1 : 0,
-                                       16384, &CompressCB, &progress_dialog);
-        progress_dialog.Reset();
-        return good;
-      });
-    }
-
-    progress_dialog.GetRaw()->exec();
-    if (!good.get())
-    {
-      QErrorMessage(this).showMessage(tr("Dolphin failed to complete the requested action."));
-      return;
-    }
-  }
-
-  ModalMessageBox::information(this, tr("Success"),
-                               decompress ?
-                                   tr("Successfully decompressed %n image(s).", "", files.size()) :
-                                   tr("Successfully compressed %n image(s).", "", files.size()));
+  ConvertDialog dialog{std::move(games), this};
+  dialog.exec();
 }
 
 void GameList::InstallWAD()
@@ -953,17 +788,6 @@ void GameList::OnGameListVisibilityChanged()
   m_grid_proxy->invalidate();
 }
 
-static bool CompressCB(const std::string& text, float percent, void* ptr)
-{
-  if (ptr == nullptr)
-    return false;
-
-  auto* progress_dialog = static_cast<ParallelProgressDialog*>(ptr);
-
-  progress_dialog->SetValue(percent * 100);
-  return !progress_dialog->WasCanceled();
-}
-
 void GameList::OnSectionResized(int index, int, int)
 {
   auto* hor_header = m_list->horizontalHeader();

Source/Core/DolphinQt/GameList/GameList.h

@@ -64,7 +64,7 @@ private:
   void InstallWAD();
   void UninstallWAD();
   void ExportWiiSave();
-  void CompressISO(bool decompress);
+  void ConvertFile();
   void ChangeDisc();
   void NewTag();
   void DeleteTag();