Merge pull request #252 from LePresidente/new_vfs_library

Update master to latest stable code.

1 files changed, 74 insertions, 57 deletions

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index e327e55a..a4fde093 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -88,7 +88,8 @@ DownloadManager::DownloadInfo *DownloadManager::DownloadInfo::createFromMeta(con
   QString fileName = QFileInfo(filePath).fileName();

 

   if (fileName.endsWith(UNFINISHED)) {

-    info->m_FileName = fileName.mid(0, fileName.length() - strlen(UNFINISHED));

+    info->m_FileName = fileName.mid(

+        0, fileName.length() - static_cast<int>(strlen(UNFINISHED)));

     info->m_State = STATE_PAUSED;

   } else {

     info->m_FileName = fileName;

@@ -471,7 +472,7 @@ void DownloadManager::addNXMDownload(const QString &url)
 void DownloadManager::removeFile(int index, bool deleteFile)

 {

   if (index >= m_ActiveDownloads.size()) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("remove: invalid download index %1").arg(index));

   }

 

   DownloadInfo *download = m_ActiveDownloads.at(index);

@@ -538,7 +539,7 @@ void DownloadManager::refreshAlphabeticalTranslation()
 void DownloadManager::restoreDownload(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("restore: invalid download index: %1").arg(index));

   }

 

   DownloadInfo *download = m_ActiveDownloads.at(index);

@@ -557,21 +558,39 @@ void DownloadManager::removeDownload(int index, bool deleteFile)
     emit aboutToUpdate();

 

     if (index < 0) {

-      DownloadState minState = index < -1 ? STATE_INSTALLED : STATE_READY;

-      index = 0;

-      for (QVector<DownloadInfo*>::iterator iter = m_ActiveDownloads.begin(); iter != m_ActiveDownloads.end();) {

-        if ((*iter)->m_State >= minState) {

-          removeFile(index, deleteFile);

-          delete *iter;

-          iter = m_ActiveDownloads.erase(iter);

-        } else {

-          ++iter;

-          ++index;

-        }

-      }

+		if (index == -1) {

+			DownloadState minState = STATE_READY;

+			index = 0;

+			for (QVector<DownloadInfo*>::iterator iter = m_ActiveDownloads.begin(); iter != m_ActiveDownloads.end();) {

+				if ((*iter)->m_State >= minState) {

+					removeFile(index, deleteFile);

+					delete *iter;

+					iter = m_ActiveDownloads.erase(iter);

+				}

+				else {

+					++iter;

+					++index;

+				}

+			}

+		}

+		else {

+			DownloadState minState = STATE_INSTALLED;

+			index = 0;

+			for (QVector<DownloadInfo*>::iterator iter = m_ActiveDownloads.begin(); iter != m_ActiveDownloads.end();) {

+				if ((*iter)->m_State == minState) {

+					removeFile(index, deleteFile);

+					delete *iter;

+					iter = m_ActiveDownloads.erase(iter);

+				}

+				else {

+					++iter;

+					++index;

+				}

+			}

+		}

     } else {

       if (index >= m_ActiveDownloads.size()) {

-        reportError(tr("invalid index %1").arg(index));

+        reportError(tr("remove: invalid download index %1").arg(index));

         return;

       }

 

@@ -589,7 +608,7 @@ void DownloadManager::removeDownload(int index, bool deleteFile)
 void DownloadManager::cancelDownload(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    reportError(tr("invalid index %1").arg(index));

+    reportError(tr("cancel: invalid download index %1").arg(index));

     return;

   }

 

@@ -602,7 +621,7 @@ void DownloadManager::cancelDownload(int index)
 void DownloadManager::pauseDownload(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    reportError(tr("invalid index %1").arg(index));

+    reportError(tr("pause: invalid download index %1").arg(index));

     return;

   }

 

@@ -622,7 +641,7 @@ void DownloadManager::pauseDownload(int index)
 void DownloadManager::resumeDownload(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    reportError(tr("invalid index %1").arg(index));

+    reportError(tr("resume: invalid download index %1").arg(index));

     return;

   }

   DownloadInfo *info = m_ActiveDownloads[index];

@@ -633,7 +652,7 @@ void DownloadManager::resumeDownload(int index)
 void DownloadManager::resumeDownloadInt(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    reportError(tr("invalid index %1").arg(index));

+    reportError(tr("resume (int): invalid download index %1").arg(index));

     return;

   }

   DownloadInfo *info = m_ActiveDownloads[index];

@@ -673,7 +692,7 @@ DownloadManager::DownloadInfo *DownloadManager::downloadInfoByID(unsigned int id
 void DownloadManager::queryInfo(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    reportError(tr("invalid index %1").arg(index));

+    reportError(tr("query: invalid download index %1").arg(index));

     return;

   }

   DownloadInfo *info = m_ActiveDownloads[index];

@@ -693,19 +712,14 @@ void DownloadManager::queryInfo(int index)
     QString ignore;

     NexusInterface::interpretNexusFileName(fileName, ignore, info->m_FileInfo->modID, true);

     if (info->m_FileInfo->modID < 0) {

-      QString modIDString;

-      while (modIDString.isEmpty()) {

-        modIDString = QInputDialog::getText(nullptr, tr("Please enter the nexus mod id"), tr("Mod ID:"), QLineEdit::Normal,

-                                            QString(), nullptr, 0, Qt::ImhFormattedNumbersOnly);

-        if (modIDString.isNull()) {

-          // canceled

-          return;

-        } else if (modIDString.contains(QRegExp("[^0-9]"))) {

-          qDebug("illegal character in mod-id");

-          modIDString.clear();

-        }

-      }

-      info->m_FileInfo->modID = modIDString.toInt(nullptr, 10);

+      bool ok = false;

+      int modId = QInputDialog::getInt(

+          nullptr, tr("Please enter the nexus mod id"), tr("Mod ID:"), 1, 1,

+          std::numeric_limits<int>::max(), 1, &ok);

+      // careful now: while the dialog was displayed, events were processed.

+      // the download list might have changed and our info-ptr invalidated.

+      m_ActiveDownloads[index]->m_FileInfo->modID = modId;

+      return;

     }

   }

   info->m_ReQueried = true;

@@ -726,7 +740,7 @@ int DownloadManager::numPendingDownloads() const
 std::pair<int, int> DownloadManager::getPendingDownload(int index)

 {

   if ((index < 0) || (index >= m_PendingDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("get pending: invalid download index %1").arg(index));

   }

 

   return m_PendingDownloads.at(index);

@@ -735,7 +749,7 @@ std::pair<int, int> DownloadManager::getPendingDownload(int index)
 QString DownloadManager::getFilePath(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("get path: invalid download index %1").arg(index));

   }

 

   return m_OutputDirectory + "/" + m_ActiveDownloads.at(index)->m_FileName;

@@ -756,24 +770,27 @@ QString DownloadManager::getFileTypeString(int fileType)
 QString DownloadManager::getDisplayName(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("display name: invalid download index %1").arg(index));

   }

 

   DownloadInfo *info = m_ActiveDownloads.at(index);

 

+  QTextDocument doc;

   if (!info->m_FileInfo->name.isEmpty()) {

-    return QString("%1 (%2, v%3)").arg(info->m_FileInfo->name)

+    doc.setHtml(info->m_FileInfo->name);

+    return QString("%1 (%2, v%3)").arg(doc.toPlainText())

                                   .arg(getFileTypeString(info->m_FileInfo->fileCategory))

                                   .arg(info->m_FileInfo->version.displayString());

   } else {

-    return info->m_FileName;

+    doc.setHtml(info->m_FileName);

+    return doc.toPlainText();

   }

 }

 

 QString DownloadManager::getFileName(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("file name: invalid download index %1").arg(index));

   }

 

   return m_ActiveDownloads.at(index)->m_FileName;

@@ -782,7 +799,7 @@ QString DownloadManager::getFileName(int index) const
 QDateTime DownloadManager::getFileTime(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("file time: invalid download index %1").arg(index));

   }

 

   DownloadInfo *info = m_ActiveDownloads.at(index);

@@ -796,7 +813,7 @@ QDateTime DownloadManager::getFileTime(int index) const
 qint64 DownloadManager::getFileSize(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("file size: invalid download index %1").arg(index));

   }

 

   return m_ActiveDownloads.at(index)->m_TotalSize;

@@ -806,7 +823,7 @@ qint64 DownloadManager::getFileSize(int index) const
 int DownloadManager::getProgress(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("progress: invalid download index %1").arg(index));

   }

 

   return m_ActiveDownloads.at(index)->m_Progress;

@@ -816,7 +833,7 @@ int DownloadManager::getProgress(int index) const
 DownloadManager::DownloadState DownloadManager::getState(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("state: invalid download index %1").arg(index));

   }

 

   return m_ActiveDownloads.at(index)->m_State;

@@ -826,7 +843,7 @@ DownloadManager::DownloadState DownloadManager::getState(int index) const
 bool DownloadManager::isInfoIncomplete(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("infocomplete: invalid download index %1").arg(index));

   }

 

   DownloadInfo *info = m_ActiveDownloads.at(index);

@@ -841,7 +858,7 @@ bool DownloadManager::isInfoIncomplete(int index) const
 int DownloadManager::getModID(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("mod id: invalid download index %1").arg(index));

   }

   return m_ActiveDownloads.at(index)->m_FileInfo->modID;

 }

@@ -849,7 +866,7 @@ int DownloadManager::getModID(int index) const
 bool DownloadManager::isHidden(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("ishidden: invalid download index %1").arg(index));

   }

   return m_ActiveDownloads.at(index)->m_Hidden;

 }

@@ -858,7 +875,7 @@ bool DownloadManager::isHidden(int index) const
 const ModRepositoryFileInfo *DownloadManager::getFileInfo(int index) const

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("file info: invalid download index %1").arg(index));

   }

 

   return m_ActiveDownloads.at(index)->m_FileInfo;

@@ -868,7 +885,7 @@ const ModRepositoryFileInfo *DownloadManager::getFileInfo(int index) const
 void DownloadManager::markInstalled(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("mark installed: invalid download index %1").arg(index));

   }

 

   DownloadInfo *info = m_ActiveDownloads.at(index);

@@ -883,7 +900,7 @@ void DownloadManager::markInstalled(int index)
 void DownloadManager::markUninstalled(int index)

 {

   if ((index < 0) || (index >= m_ActiveDownloads.size())) {

-    throw MyException(tr("invalid index"));

+    throw MyException(tr("mark uninstalled: invalid download index %1").arg(index));

   }

 

   DownloadInfo *info = m_ActiveDownloads.at(index);

@@ -1062,7 +1079,9 @@ void DownloadManager::nxmDescriptionAvailable(int, QVariant userData, QVariant r
   DownloadInfo *info = downloadInfoByID(userData.toInt());

   if (info == nullptr) return;

   info->m_FileInfo->categoryID = result["category_id"].toInt();

-  info->m_FileInfo->modName = result["name"].toString().trimmed();

+  QTextDocument doc;

+  doc.setHtml(result["name"].toString().trimmed());

+  info->m_FileInfo->modName = doc.toPlainText();

   info->m_FileInfo->newestVersion.parse(result["version"].toString());

   if (info->m_FileInfo->fileID != 0) {

     setState(info, STATE_READY);

@@ -1120,7 +1139,7 @@ void DownloadManager::nxmFilesAvailable(int, QVariant userData, QVariant resultD
 

   bool found = false;

 

-  foreach(QVariant file, result) {

+  for (QVariant file : result) {

     QVariantMap fileInfo = file.toMap();

     QString fileName = fileInfo["uri"].toString();

     QString fileNameVariant = fileName.mid(0).replace(' ', '_');

@@ -1131,12 +1150,10 @@ void DownloadManager::nxmFilesAvailable(int, QVariant userData, QVariant resultD
       if (!info->m_FileInfo->version.isValid()) {

         info->m_FileInfo->version = info->m_FileInfo->newestVersion;

       }

-      //Nexus has HTMLd these so unhtml them if necessary

+      // we receive some names html-encoded. This is used to decode it

       QTextDocument doc;

-      doc.setHtml(info->m_FileInfo->modName);

+      doc.setHtml(fileInfo["modName"].toString());

       info->m_FileInfo->modName = doc.toPlainText();

-      doc.setHtml(info->m_FileInfo->name);

-      info->m_FileInfo->name = doc.toPlainText();

       info->m_FileInfo->fileCategory = convertFileCategory(fileInfo["category_id"].toInt());

       info->m_FileInfo->fileTime = matchDate(fileInfo["date"].toString());

       info->m_FileInfo->fileID = fileInfo["id"].toInt();

@@ -1152,7 +1169,7 @@ void DownloadManager::nxmFilesAvailable(int, QVariant userData, QVariant resultD
       emit showMessage(tr("No matching file found on Nexus! Maybe this file is no longer available or it was renamed?"));

     } else {

       SelectionDialog selection(tr("No file on Nexus matches the selected file by name. Please manually choose the correct one."));

-      foreach(QVariant file, result) {

+      for (QVariant file : result) {

         QVariantMap fileInfo = file.toMap();

         selection.addChoice(fileInfo["uri"].toString(), "", file);

       }