Merge pull request #15 from Liderate/master

Clear m_PluginChildren to prevent stale entries.

.gitignore

@@ -0,0 +1,6 @@
+CMakeLists.txt.user
+edit
+*.bak
+/msbuild.log
+/*std*.log
+/*build

CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.16)
+
+if(DEFINED DEPENDENCIES_DIR)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
+else()
+	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
+endif()
+
+project(diagnose_basic)
+add_subdirectory(src)

appveyor.yml

@@ -0,0 +1,40 @@
+version: 1.0.{build}
+skip_branch_with_pr: true
+image: Visual Studio 2019
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw=
+build_script:
+- pwsh: >-
+    $ErrorActionPreference = 'Stop'
+
+    git clone --depth=1 --no-single-branch https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella
+
+    New-Item -ItemType Directory -Path c:\projects\modorganizer-build
+
+    cd c:\projects\modorganizer-umbrella
+    
+    ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH -eq $null) ? ($branch = $env:APPVEYOR_REPO_BRANCH) : ($branch = $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH)
+
+    git checkout $(git show-ref --verify --quiet refs/remotes/origin/${branch} || echo '-b') ${branch}
+
+    C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True ${env:APPVEYOR_PROJECT_NAME}
+    
+    if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode )  }
+artifacts:
+- path: vsbuild\src\RelWithDebInfo\diagnose_basic.dll
+  name: diagnose_basic_dll
+- path: vsbuild\src\RelWithDebInfo\diagnose_basic.pdb
+  name: diagnose_basic_pdb
+- path: vsbuild\src\RelWithDebInfo\diagnose_basic.lib
+  name: diagnose_basic_lib
+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: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stdout.log
+  - ps: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stderr.log
+  - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
+  - ps: ./send.ps1 failure $env:WEBHOOK_URL

src/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.16)
+
+add_library(diagnose_basic SHARED)
+mo2_configure_plugin(diagnose_basic WARNINGS OFF PRIVATE_DEPENDS boost)
+mo2_install_target(diagnose_basic)

src/diagnoseBasic.pro

@@ -1,32 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-04-05T21:08:10
-#
-#-------------------------------------------------
-
-TARGET = diagnoseBasic
-TEMPLATE = lib
-
-CONFIG += plugins
-CONFIG += dll
-
-DEFINES += DIAGNOSEBASIC_LIBRARY
-DEFINES += NOMINMAX
-
-# suppress a few warnings caused by boost vs vc++ paranoia
-DEFINES += _SCL_SECURE_NO_WARNINGS
-
-SOURCES += diagnosebasic.cpp
-
-HEADERS += diagnosebasic.h
-
-include(../plugin_template.pri)
-
-INCLUDEPATH += "$(BOOSTPATH)"
-
-#CONFIG += dll
-
-#DEFINES += INIEDITOR_LIBRARY
-
-OTHER_FILES += \
-    diagnosebasic.json

src/diagnosebasic.h

@@ -25,9 +25,12 @@ along with this plugin.  If not, see <http://www.gnu.org/licenses/>.
 #include <iplugindiagnose.h>
 #include <imoinfo.h>
 #include <imodlist.h>
+#include <QString>
+#include <QSet>
+#include <QRegularExpression>
 
 
-class DiagnoseBasic : public QObject, MOBase::IPlugin, MOBase::IPluginDiagnose
+class DiagnoseBasic : public QObject, public MOBase::IPlugin, public MOBase::IPluginDiagnose
 {
   Q_OBJECT
   Q_INTERFACES(MOBase::IPlugin MOBase::IPluginDiagnose)
@@ -64,6 +67,9 @@ private:
   bool invalidFontConfig() const;
   bool nitpickInstalled() const;
   bool assetOrder() const;
+  bool missingMasters() const;
+  bool alternateGame() const;
+  bool fileAttributes(const QString &executable) const;
 
 private:
 
@@ -71,11 +77,14 @@ private:
   static const unsigned int PROBLEM_OVERWRITE = 2;
   static const unsigned int PROBLEM_INVALIDFONT = 3;
   static const unsigned int PROBLEM_NITPICKINSTALLED = 4;
-  static const unsigned int PROBLEM_ASSETORDER = 5;
-  static const unsigned int PROBLEM_MODLISTBACKUP = 6;
+  static const unsigned int PROBLEM_PROFILETWEAKS = 7;
+  static const unsigned int PROBLEM_MISSINGMASTERS = 8;
+  static const unsigned int PROBLEM_ALTERNATE = 9;
 
   static const unsigned int NUM_CONTEXT_ROWS = 5;
 
+  static const QRegularExpression RE_LOG_FILE;
+
 private:
 
   struct ListElement {
@@ -83,6 +92,9 @@ private:
     QString modName;
     int pluginPriority;
     int modPriority;
+    int sortGroup;
+    bool avoidMove;
+    QSet<QString> relevantScripts;
   };
 
   struct Move {
@@ -95,14 +107,37 @@ private:
     Move(const ListElement &initItem, const ListElement &initReference, EType initType)
       : item(initItem), reference(initReference), type(initType) {}
   };
+
+  struct Sorter {
+    struct {
+      int operator()(const ListElement &lhs, const ListElement &rhs)
+      {
+        return lhs.modPriority < rhs.modPriority;
+      }
+    } minMod;
+
+    std::vector<Move> moves;
+
+    void operator()(std::vector<ListElement> modList);
+  private:
+    void sortGroup(std::vector<ListElement> modList);
+  };
+
+
   friend bool operator<(const Move &lhs, const Move &rhs);
 
+private:
+
+  void topoSort(std::vector<ListElement> &list) const;
+  bool checkEmpty(const QString &path) const;
+
 private:
 
   MOBase::IOrganizer *m_MOInfo;
   mutable QString m_ErrorMessage;
-  mutable std::vector <Move> m_SuggestedMoves;
   mutable QString m_NewestModlistBackup;
+  mutable std::set<QString> m_MissingMasters;
+  mutable std::map<QString, std::set<QString>> m_PluginChildren;
 
 };