Merge pull request #9 from Holt59/new-filetree

Replace usage of FileNameString and Qt::CaseInsensitive.

.gitignore

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

CMakeLists.txt

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(diagnose_basic)
+set(project_type plugin)
+set(enable_warnings OFF)
+
+if(DEFINED DEPENDENCIES_DIR)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake)
+else()
+	include(../cmake_common/project.cmake)
+endif()
+add_subdirectory(src)

appveyor.yml

@@ -0,0 +1,32 @@
+version: 1.0.{build}
+skip_branch_with_pr: true
+image: Visual Studio 2019
+environment:
+  WEBHOOK_URL:
+    secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw=
+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: build\src\diagnose_basic.dll
+  name: diagnose_basic_dll
+- path: build\src\diagnose_basic.pdb
+  name: diagnose_basic_pdb
+- path: build\src\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,6 @@
+cmake_minimum_required(VERSION 3.16)
+if(DEFINED DEPENDENCIES_DIR)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake)
+else()
+	include(../../cmake_common/src.cmake)
+endif()

src/SConscript

@@ -9,6 +9,10 @@ env.AppendUnique(CPPDEFINES = [
     '_SCL_SECURE_NO_WARNINGS'
 ])
 
+# Boost produces very long names with msvc truncates. Doesn't seem to cause
+# problems.
+env.AppendUnique(CPPFLAGS = [ '-wd4503' ])
+
 env.AppendUnique(CPPPATH = [
     '${BOOSTPATH}'
 ])

src/diagnosebasic.h

@@ -67,6 +67,8 @@ private:
   bool nitpickInstalled() const;
   bool assetOrder() const;
   bool missingMasters() const;
+  bool alternateGame() const;
+  bool fileAttributes(const QString &executable) const;
 
 private:
 
@@ -74,9 +76,9 @@ 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_PROFILETWEAKS = 7;
   static const unsigned int PROBLEM_MISSINGMASTERS = 8;
+  static const unsigned int PROBLEM_ALTERNATE = 9;
 
   static const unsigned int NUM_CONTEXT_ROWS = 5;
 
@@ -124,14 +126,15 @@ private:
 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;
 
 };