added error messages to FileRenamer and a few more

fixes for shell functions changing names

16 files changed, 83 insertions, 58 deletions

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 35f60d7a..b4a7b57d 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1059,11 +1059,11 @@ void DownloadManager::openFile(int index)
 
   QDir path = QDir(m_OutputDirectory);
   if (path.exists(getFileName(index))) {
-    shell::OpenFile(getFilePath(index));
+    shell::Open(getFilePath(index));
     return;
   }
 
-  shell::ExploreFile(m_OutputDirectory);
+  shell::Explore(m_OutputDirectory);
   return;
 }
 
@@ -1077,18 +1077,18 @@ void DownloadManager::openInDownloadsFolder(int index)
   const auto path = getFilePath(index);
 
   if (QFile::exists(path)) {
-    shell::ExploreFile(path);
+    shell::Explore(path);
     return;
   }
   else {
     const auto unfinished = path + ".unfinished";
     if (QFile::exists(unfinished)) {
-      shell::ExploreFile(unfinished);
+      shell::Explore(unfinished);
       return;
     }
   }
 
-  shell::ExploreFile(m_OutputDirectory);
+  shell::Explore(m_OutputDirectory);
 }
 
 
diff --git a/src/filerenamer.cpp b/src/filerenamer.cpp
index a97d7742..7fc90eb2 100644
--- a/src/filerenamer.cpp
+++ b/src/filerenamer.cpp
@@ -1,4 +1,5 @@
 #include "filerenamer.h"
+#include <utility.h>
 #include <log.h>
 #include <QMessageBox>
 #include <QFileInfo>
@@ -37,10 +38,13 @@ FileRenamer::RenameResults FileRenamer::rename(const QString& oldName, const QSt
         log::debug("removing {}", newName);
 
         // user wants to replace the file, so remove it
-        if (!QFile(newName).remove()) {
-          log::warn("failed to remove '{}'", newName);
+        const auto r = shell::Delete(newName);
+
+        if (!r.success()) {
+          log::error("failed to remove '{}': {}", newName, r.toString());
+
           // removal failed, warn the user and allow canceling
-          if (!removeFailed(newName)) {
+          if (!removeFailed(newName, r)) {
             log::debug("canceling {}", oldName);
             // user wants to cancel
             return RESULT_CANCEL;
@@ -64,12 +68,15 @@ FileRenamer::RenameResults FileRenamer::rename(const QString& oldName, const QSt
   }
 
   // target either didn't exist or was removed correctly
+  const auto r = shell::Rename(oldName, newName);
 
-  if (!QFile::rename(oldName, newName)) {
-    log::warn("failed to rename '{}' to '{}'", oldName, newName);
+  if (!r.success()) {
+    log::error(
+      "failed to rename '{}' to '{}': {}",
+      oldName, newName, r.toString());
 
     // renaming failed, warn the user and allow canceling
-    if (!renameFailed(oldName, newName)) {
+    if (!renameFailed(oldName, newName, r)) {
       // user wants to cancel
       log::debug("canceling");
       return RESULT_CANCEL;
@@ -144,7 +151,7 @@ FileRenamer::RenameDecision FileRenamer::confirmReplace(const QString& newName)
   }
 }
 
-bool FileRenamer::removeFailed(const QString& name)
+bool FileRenamer::removeFailed(const QString& name, const shell::Result& r)
 {
   QMessageBox::StandardButtons buttons = QMessageBox::Ok;
   if (m_flags & MULTIPLE) {
@@ -153,8 +160,9 @@ bool FileRenamer::removeFailed(const QString& name)
   }
 
   const auto answer = QMessageBox::critical(
-    m_parent, QObject::tr("File operation failed"),
-    QObject::tr("Failed to remove \"%1\". Maybe you lack the required file permissions?").arg(name),
+    m_parent,
+    QObject::tr("File operation failed"),
+    QObject::tr("Failed to remove \"%1\": %2").arg(name).arg(r.toString()),
     buttons);
 
   if (answer == QMessageBox::Cancel) {
@@ -168,7 +176,8 @@ bool FileRenamer::removeFailed(const QString& name)
   return true;
 }
 
-bool FileRenamer::renameFailed(const QString& oldName, const QString& newName)
+bool FileRenamer::renameFailed(
+  const QString& oldName, const QString& newName, const shell::Result& r)
 {
   QMessageBox::StandardButtons buttons = QMessageBox::Ok;
   if (m_flags & MULTIPLE) {
@@ -177,9 +186,16 @@ bool FileRenamer::renameFailed(const QString& oldName, const QString& newName)
   }
 
   const auto answer = QMessageBox::critical(
-    m_parent, QObject::tr("File operation failed"),
-    QObject::tr("failed to rename %1 to %2").arg(oldName).arg(QDir::toNativeSeparators(newName)),
-    buttons);
+    m_parent,
+    QObject::tr("File operation failed"),
+    QObject::tr(
+      "Failed to rename file: %1.\r\n\r\n"
+      "Source:\r\n\"%2\"\r\n\r\n"
+      "Destination:\r\n\"%3\"")
+        .arg(r.toString())
+        .arg(QDir::toNativeSeparators(oldName))
+        .arg(QDir::toNativeSeparators(newName)),
+     buttons);
 
   if (answer == QMessageBox::Cancel) {
     // user wants to stop
diff --git a/src/filerenamer.h b/src/filerenamer.h
index cd57244c..5583ecbd 100644
--- a/src/filerenamer.h
+++ b/src/filerenamer.h
@@ -3,6 +3,8 @@
 
 #include <QWidget>
 
+namespace MOBase::shell { class Result; }
+
 /**
 * Renames individual files and handles dialog boxes to confirm replacements and
 * failures with the user
@@ -126,7 +128,7 @@ private:
   * @param name The name of the file that failed to be removed
   * @return true to continue, false to stop
   **/
-  bool removeFailed(const QString& name);
+  bool removeFailed(const QString& name, const MOBase::shell::Result& r);
 
   /**
   * renaming a file failed, ask the user to continue or cancel
@@ -134,7 +136,9 @@ private:
   * @param newName new filename
   * @return true to continue, false to stop
   **/
-  bool renameFailed(const QString& oldName, const QString& newName);
+  bool renameFailed(
+    const QString& oldName, const QString& newName,
+    const MOBase::shell::Result& r);
 };
 
 #endif // FILERENAMER_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8ab28d22..b29ae11c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3313,12 +3313,12 @@ void MainWindow::openExplorer_clicked()
   if (selection->hasSelection() && selection->selectedRows().count() > 1) {
     for (QModelIndex idx : selection->selectedRows()) {
       ModInfo::Ptr info = ModInfo::getByIndex(idx.data(Qt::UserRole + 1).toInt());
-      shell::ExploreFile(info->absolutePath());
+      shell::Explore(info->absolutePath());
     }
   }
   else {
     ModInfo::Ptr modInfo = ModInfo::getByIndex(m_ContextRow);
-    shell::ExploreFile(modInfo->absolutePath());
+    shell::Explore(modInfo->absolutePath());
   }
 }
 
@@ -3333,14 +3333,14 @@ void MainWindow::openPluginOriginExplorer_clicked()
         continue;
       }
       ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);
-      shell::ExploreFile(modInfo->absolutePath());
+      shell::Explore(modInfo->absolutePath());
     }
   }
   else {
     QModelIndex idx = selection->currentIndex();
     QString fileName = idx.data().toString();
     ModInfo::Ptr modInfo = ModInfo::getByIndex(ModInfo::getIndex(m_OrganizerCore.pluginList()->origin(fileName)));
-    shell::ExploreFile(modInfo->absolutePath());
+    shell::Explore(modInfo->absolutePath());
   }
 }
 
@@ -3355,7 +3355,7 @@ void MainWindow::openExplorer_activated()
 			std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
 
 			if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
-        shell::ExploreFile(modInfo->absolutePath());
+        shell::Explore(modInfo->absolutePath());
 			}
 
 		}
@@ -3376,7 +3376,7 @@ void MainWindow::openExplorer_activated()
         std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
 
         if (modInfo->isRegular() || (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())) {
-          shell::ExploreFile(modInfo->absolutePath());
+          shell::Explore(modInfo->absolutePath());
         }
       }
 		}
@@ -4344,61 +4344,61 @@ void MainWindow::disableVisibleMods()
 void MainWindow::openInstanceFolder()
 {
   QString dataPath = qApp->property("dataPath").toString();
-  shell::ExploreFile(dataPath);
+  shell::Explore(dataPath);
 }
 
 void MainWindow::openLogsFolder()
 {
 	QString logsPath = qApp->property("dataPath").toString() + "/" + QString::fromStdWString(AppConfig::logPath());
-  shell::ExploreFile(logsPath);
+  shell::Explore(logsPath);
 }
 
 void MainWindow::openInstallFolder()
 {
-  shell::ExploreFile(qApp->applicationDirPath());
+  shell::Explore(qApp->applicationDirPath());
 }
 
 void MainWindow::openPluginsFolder()
 {
 	QString pluginsPath = QCoreApplication::applicationDirPath() + "/" + ToQString(AppConfig::pluginPath());
-  shell::ExploreFile(pluginsPath);
+  shell::Explore(pluginsPath);
 }
 
 
 void MainWindow::openProfileFolder()
 {
-  shell::ExploreFile(m_OrganizerCore.currentProfile()->absolutePath());
+  shell::Explore(m_OrganizerCore.currentProfile()->absolutePath());
 }
 
 void MainWindow::openIniFolder()
 {
   if (m_OrganizerCore.currentProfile()->localSettingsEnabled())
   {
-    shell::ExploreFile(m_OrganizerCore.currentProfile()->absolutePath());
+    shell::Explore(m_OrganizerCore.currentProfile()->absolutePath());
   }
   else {
-    shell::ExploreFile(m_OrganizerCore.managedGame()->documentsDirectory());
+    shell::Explore(m_OrganizerCore.managedGame()->documentsDirectory());
   }
 }
 
 void MainWindow::openDownloadsFolder()
 {
-  shell::ExploreFile(m_OrganizerCore.settings().paths().downloads());
+  shell::Explore(m_OrganizerCore.settings().paths().downloads());
 }
 
 void MainWindow::openModsFolder()
 {
-  shell::ExploreFile(m_OrganizerCore.settings().paths().mods());
+  shell::Explore(m_OrganizerCore.settings().paths().mods());
 }
 
 void MainWindow::openGameFolder()
 {
-  shell::ExploreFile(m_OrganizerCore.managedGame()->gameDirectory());
+  shell::Explore(m_OrganizerCore.managedGame()->gameDirectory());
 }
 
 void MainWindow::openMyGamesFolder()
 {
-  shell::ExploreFile(m_OrganizerCore.managedGame()->documentsDirectory());
+  shell::Explore(m_OrganizerCore.managedGame()->documentsDirectory());
 }
 
 
@@ -5391,7 +5391,7 @@ void MainWindow::openDataOriginExplorer_clicked()
   const auto fullPath = m_ContextItem->data(0, Qt::UserRole).toString();
 
   log::debug("opening in explorer: {}", fullPath);
-  shell::ExploreFile(fullPath);
+  shell::Explore(fullPath);
 }
 
 void MainWindow::updateAvailable()
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 3a71b405..36559a75 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -547,7 +547,7 @@ void ConflictsTab::exploreItems(QTreeView* tree)
   // the menu item is only shown for a single selection, but handle all of them
   // in case this changes
   for_each_in_selection(tree, [&](const ConflictItem* item) {
-    shell::ExploreFile(item->fileName());
+    shell::Explore(item->fileName());
     return true;
   });
 }
diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index 207c792d..71ea9210 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -128,7 +128,7 @@ void FileTreeTab::onOpen()
     return;
   }
 
-  shell::OpenFile(m_fs->filePath(selection));
+  shell::Open(m_fs->filePath(selection));
 }
 
 void FileTreeTab::onPreview()
@@ -146,9 +146,9 @@ void FileTreeTab::onExplore()
   auto selection = singleSelection();
 
   if (selection.isValid()) {
-    shell::ExploreFile(m_fs->filePath(selection));
+    shell::Explore(m_fs->filePath(selection));
   } else {
-    shell::ExploreFile(mod().absolutePath());
+    shell::Explore(mod().absolutePath());
   }
 }
 
@@ -204,7 +204,7 @@ void FileTreeTab::onUnhide()
 
 void FileTreeTab::onOpenInExplorer()
 {
-  shell::ExploreFile(mod().absolutePath());
+  shell::Explore(mod().absolutePath());
 }
 
 bool FileTreeTab::deleteFile(const QModelIndex& index)
diff --git a/src/modinfodialogimages.cpp b/src/modinfodialogimages.cpp
index 9d347f57..c5b04538 100644
--- a/src/modinfodialogimages.cpp
+++ b/src/modinfodialogimages.cpp
@@ -547,7 +547,7 @@ void ImagesTab::showTooltip(QHelpEvent* e)
 void ImagesTab::onExplore()
 {
   if (auto* f=m_files.selectedFile()) {
-    MOBase::shell::ExploreFile(f->path());
+    shell::Explore(f->path());
   }
 }
 
diff --git a/src/modinfodialognexus.cpp b/src/modinfodialognexus.cpp
index 95e62328..59bfe930 100644
--- a/src/modinfodialognexus.cpp
+++ b/src/modinfodialognexus.cpp
@@ -95,7 +95,7 @@ void NexusTab::update()
 
   connect(
     page, &NexusTabWebpage::linkClicked,
-    [&](const QUrl& url){ shell::OpenLink(url); });
+    [&](const QUrl& url){ shell::Open(url); });
 
   ui->endorse->setEnabled(
     (mod().endorsedState() == ModInfo::ENDORSED_FALSE) ||
@@ -363,7 +363,7 @@ void NexusTab::onVisitNexus()
     const QString nexusLink = NexusInterface::instance(&plugin())
       ->getModURL(modID, mod().getGameName());
 
-    shell::OpenLink(QUrl(nexusLink));
+    shell::Open(QUrl(nexusLink));
   }
 }
 
@@ -412,6 +412,6 @@ void NexusTab::onVisitCustomURL()
 {
   const auto url = mod().parseCustomURL();
   if (url.isValid()) {
-    shell::OpenLink(url);
+    shell::Open(url);
   }
 }
diff --git a/src/motddialog.cpp b/src/motddialog.cpp
index ca1e60ad..eee80205 100644
--- a/src/motddialog.cpp
+++ b/src/motddialog.cpp
@@ -47,5 +47,5 @@ void MotDDialog::on_okButton_clicked()
 

 void MotDDialog::linkClicked(const QUrl &url)

 {

-  shell::OpenLink(url);

+  shell::Open(url);

 }

diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index c6ef7bc7..3cc1b7d9 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -286,7 +286,7 @@ void NexusSSOLogin::onMessage(const QString& s)
 
     // open browser
     const auto url = NexusSSOPage.arg(m_guid);
-    shell::OpenLink(url);
+    shell::Open(url);
 
     m_timeout.stop();
     setState(WaitingForBrowser);
diff --git a/src/overwriteinfodialog.cpp b/src/overwriteinfodialog.cpp
index fe1d8825..078bcfc9 100644
--- a/src/overwriteinfodialog.cpp
+++ b/src/overwriteinfodialog.cpp
@@ -229,7 +229,7 @@ void OverwriteInfoDialog::renameTriggered()
 

 void OverwriteInfoDialog::openFile(const QModelIndex &index)

 {

-  shell::OpenFile(m_FileSystemModel->filePath(index));

+  shell::Open(m_FileSystemModel->filePath(index));

 }

 

 

@@ -270,7 +270,7 @@ void OverwriteInfoDialog::createDirectoryTriggered()
 

 void OverwriteInfoDialog::on_explorerButton_clicked()

 {

-  shell::ExploreFile(m_ModInfo->absolutePath());

+  shell::Explore(m_ModInfo->absolutePath());

 }

 

 void OverwriteInfoDialog::on_filesView_customContextMenuRequested(const QPoint &pos)

diff --git a/src/problemsdialog.cpp b/src/problemsdialog.cpp
index 63d58295..ea23beec 100644
--- a/src/problemsdialog.cpp
+++ b/src/problemsdialog.cpp
@@ -112,5 +112,5 @@ void ProblemsDialog::startFix()
 

 void ProblemsDialog::urlClicked(const QUrl &url)

 {

-  shell::OpenLink(url);

+  shell::Open(url);

 }

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index 8887927a..5a70568e 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -341,11 +341,14 @@ void SelfUpdater::downloadCancel()
 void SelfUpdater::installUpdate()

 {

   const QString parameters = "/DIR=\"" + qApp->applicationDirPath() + "\" ";

+  const auto r = shell::Execute(m_UpdateFile.fileName(), parameters);

 

-  if (shell::Execute(m_UpdateFile.fileName(), parameters)) {

+  if (r.success()) {

     QCoreApplication::quit();

   } else {

-    reportError(tr("Failed to start %1").arg(m_UpdateFile.fileName()));

+    reportError(tr("Failed to start %1: %2")

+      .arg(m_UpdateFile.fileName())

+      .arg(r.toString()));

   }

 

   m_UpdateFile.remove();

diff --git a/src/settings.cpp b/src/settings.cpp
index 462cd92a..15bc801a 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1808,10 +1808,12 @@ void NexusSettings::registerAsNXMHandler(bool force)
   }
   parameters += " \"" + executable + "\"";
 
-  if (!shell::Execute(nxmPath, parameters)) {
+  const auto r = shell::Execute(nxmPath, parameters);
+
+  if (!r.success()) {
     QMessageBox::critical(
       nullptr, QObject::tr("Failed"),
-      QObject::tr("Failed to start the helper application"));
+      QObject::tr("Failed to start the helper application: %1").arg(r.toString()));
   }
 }
 
diff --git a/src/settingsdialognexus.cpp b/src/settingsdialognexus.cpp
index 826075c0..2021bdc1 100644
--- a/src/settingsdialognexus.cpp
+++ b/src/settingsdialognexus.cpp
@@ -49,7 +49,7 @@ public:
 
   void openBrowser()
   {
-    shell::OpenLink(QUrl("https://www.nexusmods.com/users/myaccount?tab=api"));
+    shell::Open(QUrl("https://www.nexusmods.com/users/myaccount?tab=api"));
   }
 
   void paste()
diff --git a/src/texteditor.cpp b/src/texteditor.cpp
index 0c0eb1cc..4a8080f4 100644
--- a/src/texteditor.cpp
+++ b/src/texteditor.cpp
@@ -199,7 +199,7 @@ void TextEditor::explore()
     return;
   }
 
-  MOBase::shell::ExploreFile(m_filename);
+  shell::Explore(m_filename);
 }
 
 void TextEditor::onModified(bool b)