Skip empty mod dirs when evaluating overwrite

Fix SSE check in invalidFontConfig

CMakeLists.txt

@@ -1,12 +1,10 @@
 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)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
 else()
-	include(../cmake_common/project.cmake)
+	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
 endif()
+
+project(diagnose_basic)
 add_subdirectory(src)

src/CMakeLists.txt

@@ -1,6 +1,5 @@
 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()
+
+add_library(diagnose_basic SHARED)
+mo2_configure_plugin(diagnose_basic WARNINGS OFF PRIVATE_DEPENDS boost)
+mo2_install_target(diagnose_basic)

src/SConscript

@@ -1,24 +0,0 @@
-Import('qt_env')
-
-env = qt_env.Clone()
-
-env.AppendUnique(CPPDEFINES = [
-    'DIAGNOSEBASIC_LIBRARY',
-    'NOMINMAX',
-    # suppress a few warnings caused by boost vs vc++ paranoia
-    '_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}'
-])
-
-lib = env.SharedLibrary('diagnoseBasic', env.Glob('*.cpp'))
-env.InstallModule(lib)
-
-res = env['QT_USED_MODULES']
-Return('res')

src/diagnoseBasic.pro

@@ -1,35 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-04-05T21:08:10
-#
-#-------------------------------------------------
-
-TARGET = diagnoseBasic
-TEMPLATE = lib
-
-CONFIG += plugins
-CONFIG += dll
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-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\
-    SConscript

src/diagnosebasic.cpp

@@ -204,10 +204,22 @@ bool DiagnoseBasic::overwriteFiles() const
   //QString dirname(qApp->property("dataPath").toString() + "/overwrite");
   QString dirname(m_MOInfo->overwritePath());
   if (m_MOInfo->pluginSetting(name(), "ow_ignore_empty").toBool() ||
-      m_MOInfo->pluginSetting(name(), "ow_ignore_log").toBool()) {
+    m_MOInfo->pluginSetting(name(), "ow_ignore_log").toBool()) {
     return !checkEmpty(dirname);
   }
   QDir dir(dirname);
+  bool checkDirs = m_MOInfo->managedGame()->getModMappings().keys().size() > 1 || m_MOInfo->managedGame()->getModMappings().keys().first() != "";
+  if (checkDirs) {
+      bool empty = true;
+      for (auto dir : m_MOInfo->managedGame()->getModMappings().keys()) {
+          auto mapDir = QDir(dirname).filePath(dir);
+          if (QDir(mapDir).exists()) {
+              empty = QDir(mapDir).count() == 2; // account for . and ..
+          }
+          if (!empty) break;
+      }
+      return !empty;
+  }
   return dir.count() != 2; // account for . and ..
 }
 
@@ -256,6 +268,7 @@ bool DiagnoseBasic::missingMasters() const
   }
 
   m_MissingMasters.clear();
+  m_PluginChildren.clear();
   // for each required master in each esp, test if it's in the list of enabled masters.
   for (const QString &esp : esps) {
     QString baseName = QFileInfo(esp).fileName();
@@ -283,7 +296,7 @@ bool DiagnoseBasic::alternateGame() const
 
 bool DiagnoseBasic::invalidFontConfig() const
 {
-  if ((m_MOInfo->managedGame()->gameName() != "Skyrim") && (m_MOInfo->managedGame()->gameName() != "SkyrimSE"))  {
+  if ((m_MOInfo->managedGame()->gameName() != "Skyrim") && (m_MOInfo->managedGame()->gameShortName() != "SkyrimSE"))  {
     // this check is only for skyrim
     return false;
   }