Update version to 2.2.0beta8

This reverts commit 5ba369680d.

appveyor.yml

@@ -0,0 +1,28 @@
+version: 1.0.{build}
+skip_branch_with_pr: true
+image: Visual Studio 2017
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1VYoNNsKROB4s6VsQiL6qbLNLc4XQhc8Y9DhdU9Hfh49vhypcjUEQmMsENxnp+1hYMJctTqIYDunVSd767eez5wz6rKHqk+XOHmg5gyVNCV9u4DVcCZJSVe4UTKn1lc47H0=
+build_script:
+- cmd: >-
+    git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null
+
+    mkdir c:\projects\modorganizer-build -type directory
+
+    cd c:\projects\modorganizer-umbrella
+
+    C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME%
+artifacts:
+- path: vsbuild\src\RelWithDebInfo\ModOrganizer.exe
+  name: modorganizer_exe
+- path: vsbuild\src\RelWithDebInfo\ModOrganizer.pdb
+  name: modorganizer_pdb
+on_success:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 success $env:WEBHOOK_URL
+on_failure:
+  - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 failure $env:WEBHOOK_URL

readme.md

@@ -1,3 +1,5 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/23qmd9rufv9vpmg7?svg=true)](https://ci.appveyor.com/project/Modorganizer2/modorganizer)
+
 # Mod Organizer
 
 Mod Organizer (MO) is a tool for managing mod collections of arbitrary size. It is specifically designed for people who like to experiment with mods and thus need an easy and reliable way to install and uninstall them.
@@ -82,4 +84,3 @@ Here is a complete list:
 ### Unused Repositories
 * https://github.com/Modorganizer2/modorganizer-hookdll
 * https://github.com/TanninOne/modorganizer-tool_nmmimport
-

src/CMakeLists.txt

@@ -79,7 +79,6 @@ SET(organizer_SRCS
     previewgenerator.cpp
     previewdialog.cpp
     aboutdialog.cpp
-    json.cpp
     modflagicondelegate.cpp
     genericicondelegate.cpp
     organizerproxy.cpp
@@ -173,7 +172,6 @@ SET(organizer_HDRS
     previewgenerator.h
     previewdialog.h
     aboutdialog.h
-    json.h
     modflagicondelegate.h
     genericicondelegate.h
     organizerproxy.h
@@ -250,7 +248,8 @@ SOURCE_GROUP(Headers FILES ${organizer_HDRS})
 SOURCE_GROUP(UI FILES ${organizer_UIS})
 
 # MO projects
-SET(default_project_path "${CMAKE_SOURCE_DIR}/..")
+SET(dependency_project_path "${DEPENDENCIES_DIR}")
+SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super")
 GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
 
 SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
@@ -267,6 +266,7 @@ FIND_PACKAGE(Qt5Quick REQUIRED)
 FIND_PACKAGE(Qt5Network REQUIRED)
 FIND_PACKAGE(Qt5WinExtras REQUIRED)
 FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED)
+FIND_PACKAGE(Qt5WebSockets REQUIRED)
 FIND_PACKAGE(Qt5Qml REQUIRED)
 FIND_PACKAGE(Qt5LinguistTools)
 QT5_WRAP_UI(organizer_UIHDRS ${organizer_UIS})
@@ -296,7 +296,7 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/bsatk/src
                     ${project_path}/esptk/src
                     ${project_path}/archive/src
-                    ${project_path}/../usvfs/include
+                    ${dependency_project_path}/usvfs/include
                     ${project_path}/game_gamebryo/src/gamebryo
                     ${project_path}/game_gamebryo/src/creation
                     ${project_path}/game_features/src
@@ -325,12 +325,12 @@ ENDIF()
 ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS} ${organizer_translations_qm})
 TARGET_LINK_LIBRARIES(ModOrganizer
                       Qt5::Widgets Qt5::WinExtras Qt5::WebEngineWidgets Qt5::Quick
-                      Qt5::Qml Qt5::QuickWidgets Qt5::Network
+                      Qt5::Qml Qt5::QuickWidgets Qt5::Network Qt5::WebSockets
                       ${Boost_LIBRARIES}
                       zlibstatic
                       uibase esptk bsatk githubpp
                       ${usvfs_name}
-                      Dbghelp advapi32 Version Shlwapi liblz4)
+                      Dbghelp advapi32 Version Shlwapi liblz4 Crypt32)
 
 IF (MSVC)
   SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS "/std:c++latest")
@@ -368,12 +368,12 @@ SET(windeploy_parameters "--no-translations --plugindir qtplugins --libdir dlls
 INSTALL(
     CODE
     "EXECUTE_PROCESS(COMMAND
-        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters}
+        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets --websockets ${windeploy_parameters}
         WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
     )
     # run it a second time because on the first run it misses some files
     EXECUTE_PROCESS(COMMAND
-        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets ${windeploy_parameters}
+        ${qt5bin}/windeployqt.exe ModOrganizer.exe --webenginewidgets --websockets ${windeploy_parameters}
         WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
     )
     EXECUTE_PROCESS(COMMAND

src/credentialsdialog.cpp

@@ -32,16 +32,6 @@ CredentialsDialog::~CredentialsDialog()
   delete ui;
 }
 
-QString CredentialsDialog::username() const
-{
-  return ui->usernameEdit->text();
-}
-
-QString CredentialsDialog::password() const
-{
-  return ui->passwordEdit->text();
-}
-
 bool CredentialsDialog::store() const
 {
   return ui->rememberCheck->isChecked();

src/credentialsdialog.h

@@ -34,9 +34,6 @@ public:
   explicit CredentialsDialog(QWidget *parent = 0);
   ~CredentialsDialog();
 
-  QString username() const;
-  QString password() const;
-
   bool store() const;
   bool neverAsk() const;
 

src/directoryrefresher.cpp

@@ -178,10 +178,9 @@ void DirectoryRefresher::refresh()
   std::wstring dataDirectory = QDir::toNativeSeparators(game->dataDirectory().absolutePath()).toStdWString();
   m_DirectoryStructure->addFromOrigin(L"data", dataDirectory, 0);
 
-  // TODO what was the point of having the priority in this tuple? the list is already sorted by priority
+  std::sort(m_Mods.begin(), m_Mods.end(), [](auto lhs, auto rhs){return lhs.priority < rhs.priority;});
   auto iter = m_Mods.begin();
 
-  //TODO i is the priority here, where higher = more important. the input vector is also sorted by priority but inverted!
   for (int i = 1; iter != m_Mods.end(); ++iter, ++i) {
     try {
       addModToStructure(m_DirectoryStructure, iter->modName, i, iter->absolutePath, iter->stealFiles, iter->archives);

src/dlls.manifest.qt5

@@ -21,6 +21,7 @@
   <file name="Qt5Svg.dll"/>
   <file name="Qt5WebEngineCore.dll"/>
   <file name="Qt5WebEngineWidgets.dll"/>
+  <file name="Qt5WebSockets.dll"/>
   <file name="Qt5Widgets.dll"/>
   <file name="Qt5WinExtras.dll"/>
-</assembly>
+</assembly>

src/downloadlist.cpp

@@ -104,8 +104,9 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
             case DownloadManager::STATE_CANCELED: return tr("Canceled");
             case DownloadManager::STATE_PAUSED: return tr("Paused");
             case DownloadManager::STATE_ERROR: return tr("Error");
-            case DownloadManager::STATE_FETCHINGMODINFO: return tr("Fetching Info 1");
-            case DownloadManager::STATE_FETCHINGFILEINFO: return tr("Fetching Info 2");
+            case DownloadManager::STATE_FETCHINGMODINFO: return tr("Fetching Info");
+            case DownloadManager::STATE_FETCHINGFILEINFO: return tr("Fetching Info");
+            case DownloadManager::STATE_FETCHINGMODINFO_MD5: return tr("Fetching Info");
             case DownloadManager::STATE_READY: return tr("Downloaded");
             case DownloadManager::STATE_INSTALLED: return tr("Installed");
             case DownloadManager::STATE_UNINSTALLED: return tr("Uninstalled");
@@ -133,7 +134,7 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
         text += tr("Information missing, please select \"Query Info\" from the context menu to re-retrieve.");
       } else {
         const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(index.row());
-        return QString("%1 (ID %2) %3<br><span>%4</span>").arg(info->modName).arg(m_Manager->getModID(index.row())).arg(info->version.canonicalString()).arg(info->description);
+        return QString("%1 (ID %2) %3<br><span>%4</span>").arg(info->modName).arg(m_Manager->getModID(index.row())).arg(info->version.canonicalString()).arg(info->description.chopped(4096));
       }
       return text;
     }

src/downloadlistwidget.cpp

@@ -199,8 +199,8 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point)
 
     if (state >= DownloadManager::STATE_READY) {
       menu.addAction(tr("Install"), this, SLOT(issueInstall()));
-      if (m_Manager->isInfoIncomplete(m_ContextRow))
-        menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
+      if (m_Manager->isInfoIncomplete(m_ContextRow)) 
+        menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfoMd5()));
       else
         menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus()));
       menu.addAction(tr("Open File"), this, SLOT(issueOpenFile()));
@@ -252,6 +252,11 @@ void DownloadListWidget::issueQueryInfo()
   emit queryInfo(m_ContextRow);
 }
 
+void DownloadListWidget::issueQueryInfoMd5()
+{
+  emit queryInfoMd5(m_ContextRow);
+}
+
 void DownloadListWidget::issueDelete()
 {
   if (QMessageBox::question(nullptr, tr("Delete Files?"),

src/downloadlistwidget.h

@@ -78,6 +78,7 @@ public:
 signals:
   void installDownload(int index);
   void queryInfo(int index);
+  void queryInfoMd5(int index);
   void removeDownload(int index, bool deleteFile);
   void restoreDownload(int index);
   void cancelDownload(int index);
@@ -109,6 +110,7 @@ private slots:
   void issueRemoveFromViewCompleted();
   void issueRemoveFromViewUninstalled();
   void issueQueryInfo();
+  void issueQueryInfoMd5();
 
 private:
   DownloadManager *m_Manager;

src/executableslist.cpp

@@ -25,6 +25,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
+#include <QCoreApplication>
+
 
 #include <algorithm>
 
@@ -53,6 +55,17 @@ void ExecutablesList::init(IPluginGame const *game)
                             info.steamAppID());
     }
   }
+  ExecutableInfo explorerpp = ExecutableInfo("Explore Virtual Folder", QFileInfo(QCoreApplication::applicationDirPath() + "/explorer++/Explorer++.exe" ))
+      .withArgument(QString("\"%1\"").arg(QDir::toNativeSeparators(game->dataDirectory().absolutePath())));
+  
+  if (explorerpp.isValid()) {
+    addExecutableInternal(explorerpp.title(),
+      explorerpp.binary().absoluteFilePath(),
+      explorerpp.arguments().join(" "),
+      explorerpp.workingDirectory().absolutePath(),
+      explorerpp.steamAppID());
+  }
+  
 }
 
 void ExecutablesList::getExecutables(std::vector<Executable>::iterator &begin, std::vector<Executable>::iterator &end)

src/installationmanager.cpp

@@ -80,7 +80,8 @@ static T resolveFunction(QLibrary &lib, const char *name)
 
 InstallationManager::InstallationManager()
     : m_ParentWidget(nullptr),
-      m_SupportedExtensions({"zip", "rar", "7z", "fomod", "001"}) {
+      m_SupportedExtensions({"zip", "rar", "7z", "fomod", "001"}),
+      m_IsRunning(false) {
   QLibrary archiveLib(QCoreApplication::applicationDirPath() +
                       "\\dlls\\archive.dll");
   if (!archiveLib.load()) {
@@ -560,7 +561,7 @@ bool InstallationManager::ensureValidModName(GuessedValue<QString> &name) const
 
 bool InstallationManager::doInstall(GuessedValue<QString> &modName, QString gameName, int modID,
                                     const QString &version, const QString &newestVersion,
-                                    int categoryID, const QString &repository)
+                                    int categoryID, int fileCategoryID, const QString &repository)
 {
   if (!ensureValidModName(modName)) {
     return false;
@@ -640,6 +641,7 @@ bool InstallationManager::doInstall(GuessedValue<QString> &modName, QString game
   if (!settingsFile.contains("category")) {
     settingsFile.setValue("category", QString::number(categoryID));
   }
+  settingsFile.setValue("nexusFileStatus", fileCategoryID);
   settingsFile.setValue("installationFile", m_CurrentFile);
   settingsFile.setValue("repository", repository);
   settingsFile.setValue("url", m_URL);
@@ -664,6 +666,11 @@ bool InstallationManager::wasCancelled()
   return m_ArchiveHandler->getLastError() == Archive::ERROR_EXTRACT_CANCELLED;
 }
 
+bool InstallationManager::isRunning()
+{
+  return m_IsRunning;
+}
+
 
 void InstallationManager::postInstallCleanup()
 {
@@ -705,6 +712,9 @@ bool InstallationManager::install(const QString &fileName,
                                   bool &hasIniTweaks,
                                   int modID)
 {
+  m_IsRunning = true;
+  ON_BLOCK_EXIT([this]() { m_IsRunning = false; });
+
   QFileInfo fileInfo(fileName);
   if (m_SupportedExtensions.find(fileInfo.suffix()) == m_SupportedExtensions.end()) {
     reportError(tr("File format \"%1\" not supported").arg(fileInfo.suffix()));
@@ -720,6 +730,7 @@ bool InstallationManager::install(const QString &fileName,
   QString version = "";
   QString newestVersion = "";
   int categoryID = 0;
+  int fileCategoryID = 1;
   QString repository = "Nexus";
 
   QString metaName = fileName + ".meta";
@@ -738,6 +749,7 @@ bool InstallationManager::install(const QString &fileName,
         metaFile.value("category", 0).toInt());
     categoryID = CategoryFactory::instance().getCategoryID(categoryIndex);
     repository = metaFile.value("repository", "").toString();
+    fileCategoryID = metaFile.value("fileCategory", 1).toInt();
   }
 
   if (version.isEmpty()) {
@@ -815,7 +827,7 @@ bool InstallationManager::install(const QString &fileName,
             // the simple installer only prepares the installation, the rest
             // works the same for all installers
             if (!doInstall(modName, gameName, modID, version, newestVersion, categoryID,
-                           repository)) {
+                            fileCategoryID, repository)) {
               installResult = IPluginInstaller::RESULT_FAILED;
             }
           }
@@ -871,6 +883,7 @@ bool InstallationManager::install(const QString &fileName,
 
   reportError(tr("None of the available installer plugins were able to handle that archive.\n"
     "This is likely due to a corrupted or incompatible download or unrecognized archive format."));
+
   return false;
 }
 

src/installationmanager.h

@@ -89,6 +89,11 @@ public:
    **/
   bool wasCancelled();
 
+  /**
+   * @return true if an installation is currently in progress
+   **/
+  bool isRunning();
+
   /**
    * @brief retrieve a string describing the specified error code
    *
@@ -171,7 +176,7 @@ private:
   MOBase::DirectoryTree::Node *getSimpleArchiveBase(MOBase::DirectoryTree *dataTree);
 
   bool doInstall(MOBase::GuessedValue<QString> &modName, QString gameName,
-                 int modID, const QString &version, const QString &newestVersion, int categoryID, const QString &repository);
+                 int modID, const QString &version, const QString &newestVersion, int categoryID, int fileCategoryID, const QString &repository);
 
   //QString generateBackupName(const QString &directoryName) const;
 
@@ -202,6 +207,8 @@ private:
 
 private:
 
+  bool m_IsRunning;
+
   QWidget *m_ParentWidget;
 
   QString m_ModsDirectory;

src/json.h

@@ -1,94 +0,0 @@
-/**
- * QtJson - A simple class for parsing JSON data into a QVariant hierarchies and vice-versa.
- * Copyright (C) 2011  Eeli Reilin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file json.h
- */
-
-#ifndef JSON_H
-#define JSON_H
-
-#include <QVariant>
-#include <QString>
-
-
-/**
- * \namespace QtJson
- * \brief A JSON data parser
- *
- * Json parses a JSON data into a QVariant hierarchy.
- */
-namespace QtJson {
-    typedef QVariantMap JsonObject;
-    typedef QVariantList JsonArray;
-
-    /**
-     * Parse a JSON string
-     *
-     * \param json The JSON data
-     */
-    QVariant parse(const QString &json);
-
-    /**
-     * Parse a JSON string
-     *
-     * \param json The JSON data
-     * \param success The success of the parsing
-     */
-    QVariant parse(const QString &json, bool &success);
-
-    /**
-     * This method generates a textual JSON representation
-     *
-     * \param data The JSON data generated by the parser.
-     *
-     * \return QByteArray Textual JSON representation in UTF-8
-     */
-    QByteArray serialize(const QVariant &data);
-
-    /**
-     * This method generates a textual JSON representation
-     *
-     * \param data The JSON data generated by the parser.
-     * \param success The success of the serialization
-     *
-     * \return QByteArray Textual JSON representation in UTF-8
-     */
-    QByteArray serialize(const QVariant &data, bool &success);
-
-    /**
-     * This method generates a textual JSON representation
-     *
-     * \param data The JSON data generated by the parser.
-     *
-     * \return QString Textual JSON representation
-     */
-    QString serializeStr(const QVariant &data);
-
-    /**
-     * This method generates a textual JSON representation
-     *
-     * \param data The JSON data generated by the parser.
-     * \param success The success of the serialization
-     *
-     * \return QString Textual JSON representation
-     */
-    QString serializeStr(const QVariant &data, bool &success);
-}
-
-#endif //JSON_H

src/logbuffer.cpp

@@ -51,21 +51,24 @@ LogBuffer::~LogBuffer()
 void LogBuffer::logMessage(QtMsgType type, const QString &message)
 {
   if (type >= m_MinMsgType) {
-    Message msg = {type, QTime::currentTime(), message};
-    if (m_NumMessages < m_Messages.size()) {
-      beginInsertRows(QModelIndex(), static_cast<int>(m_NumMessages),
-                      static_cast<int>(m_NumMessages) + 1);
-    }
-    m_Messages.at(m_NumMessages % m_Messages.size()) = msg;
-    if (m_NumMessages < m_Messages.size()) {
-      endInsertRows();
-    } else {
-      emit dataChanged(createIndex(0, 0),
-                       createIndex(static_cast<int>(m_Messages.size()), 0));
-    }
-    ++m_NumMessages;
-    if (type >= QtCriticalMsg) {
-      write();
+    QStringList messagelist = message.split("\n");
+    for (auto split_message : messagelist) {
+      Message msg = {type, QTime::currentTime(), split_message};
+      if (m_NumMessages < m_Messages.size()) {
+        beginInsertRows(QModelIndex(), static_cast<int>(m_NumMessages),
+                        static_cast<int>(m_NumMessages) + 1);
+      }
+      m_Messages.at(m_NumMessages % m_Messages.size()) = msg;
+      if (m_NumMessages < m_Messages.size()) {
+        endInsertRows();
+      } else {
+        emit dataChanged(createIndex(0, 0),
+                         createIndex(static_cast<int>(m_Messages.size()), 0));
+      }
+      ++m_NumMessages;
+      if (type >= QtCriticalMsg) {
+        write();
+      }
     }
   }
 }
@@ -111,6 +114,8 @@ char LogBuffer::msgTypeID(QtMsgType type)
   switch (type) {
     case QtDebugMsg:
       return 'D';
+    case QtInfoMsg:
+      return 'I';
     case QtWarningMsg:
       return 'W';
     case QtCriticalMsg:
@@ -200,6 +205,7 @@ QVariant LogBuffer::data(const QModelIndex &index, int role) const
       if (index.column() == 1) {
         switch (m_Messages[msgIndex].type) {
           case QtDebugMsg:
+          case QtInfoMsg:
             return QIcon(":/MO/gui/information");
           case QtWarningMsg:
             return QIcon(":/MO/gui/warning");
@@ -215,6 +221,8 @@ QVariant LogBuffer::data(const QModelIndex &index, int role) const
         switch (m_Messages[msgIndex].type) {
           case QtDebugMsg:
             return "D";
+          case QtInfoMsg:
+            return "I";
           case QtWarningMsg:
             return "W";
           case QtCriticalMsg: