Merge pull request #16 from ModOrganizer2/dev/format-and-gh-actions

ModOrganizer2 · Jun 9, 2024 · 522bc53 · 522bc53
2 parents 6d89f9d + 288e1b9
commit 522bc53
Show file tree

Hide file tree

Showing 10 changed files with 219 additions and 184 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,41 @@
+---
+# We'll use defaults from the LLVM style, but with 4 columns indentation.
+BasedOnStyle: LLVM
+IndentWidth: 2
+---
+Language: Cpp
+DeriveLineEnding: false
+UseCRLF: true
+DerivePointerAlignment: false
+PointerAlignment: Left
+AlignConsecutiveAssignments: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Empty
+AlwaysBreakTemplateDeclarations: Yes
+AccessModifierOffset: -2
+AlignTrailingComments: true
+SpacesBeforeTrailingComments: 2
+NamespaceIndentation: Inner
+MaxEmptyLinesToKeep: 1
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: true
+  AfterControlStatement: false
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+ColumnLimit: 88
+ForEachMacros: ['Q_FOREACH', 'foreach']
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1 @@
+988523cac10641c510fd711d80d59c82d473f6a5
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cpp text eol=crlf
+*.h text eol=crlf
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,16 @@
+name: Build Installer Bundle Plugin
+
+on:
+  push:
+    branches: master
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    runs-on: windows-2022
+    steps:
+      - name: Build Installer Bundle Plugin
+        uses: ModOrganizer2/build-with-mob-action@master
+        with:
+          mo2-dependencies: cmake_common uibase
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -0,0 +1,16 @@
+name: Lint Installer Bundle Plugin
+
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Check format
+        uses: ModOrganizer2/check-formatting-action@master
+        with:
+          check-path: "."
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/src/installerbundle.cpp b/src/installerbundle.cpp
@@ -26,13 +26,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
+InstallerBundle::InstallerBundle() {}
 
-InstallerBundle::InstallerBundle()
-{
-}
-
-
-bool InstallerBundle::init(IOrganizer *organizer)
+bool InstallerBundle::init(IOrganizer* organizer)
 {
   m_Organizer = organizer;
   return true;
@@ -65,9 +61,10 @@ VersionInfo InstallerBundle::version() const
 
 QList<PluginSetting> InstallerBundle::settings() const
 {
-  return {
-    PluginSetting("auto_reinstall", "when reinstalling from an archive containing multiple mods, automatically select the previously installed", true)
-  };
+  return {PluginSetting("auto_reinstall",
+                        "when reinstalling from an archive containing multiple mods, "
+                        "automatically select the previously installed",
+                        true)};
 }
 
 unsigned int InstallerBundle::priority() const
@@ -80,13 +77,14 @@ bool InstallerBundle::isManualInstaller() const
   return false;
 }
 
-void InstallerBundle::onInstallationStart(QString const& archive, bool reinstallation, IModInterface* currentMod)
+void InstallerBundle::onInstallationStart(QString const& archive, bool reinstallation,
+                                          IModInterface* currentMod)
 {
   // We reset some field and fetch the previously installed file:
   m_InstallationFile = archive;
-  m_InstallerUsed = false;
-  m_SelectedFile = "";
-  m_PreviousFile = "";
+  m_InstallerUsed    = false;
+  m_SelectedFile     = "";
+  m_PreviousFile     = "";
 
   if (reinstallation && m_Organizer->pluginSetting(name(), "auto_reinstall").toBool()) {
     m_PreviousFile = currentMod->pluginSetting(name(), "archive", QString()).toString();
@@ -102,7 +100,8 @@ void InstallerBundle::onInstallationEnd(EInstallResult result, IModInterface* ne
   }
 }
 
-std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> InstallerBundle::findObjects(std::shared_ptr<const IFileTree> tree) const
+std::vector<std::shared_ptr<const MOBase::FileTreeEntry>>
+InstallerBundle::findObjects(std::shared_ptr<const IFileTree> tree) const
 {
   std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> entries;
   // Check if we have an archive:
@@ -112,11 +111,11 @@ std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> InstallerBundle::findO
   int nDirs = 0;
   for (auto entry : *tree) {
     if (entry->isFile()) {
-      if (managerExtensions.contains(entry->suffix(), FileNameComparator::CaseSensitivity)) {
+      if (managerExtensions.contains(entry->suffix(),
+                                     FileNameComparator::CaseSensitivity)) {
         entries.push_back(entry);
       }
-    }
-    else {
+    } else {
       nDirs++;
     }
   }
@@ -140,8 +139,9 @@ bool InstallerBundle::isArchiveSupported(std::shared_ptr<const IFileTree> tree)
   return !findObjects(tree).empty();
 }
 
-IPluginInstaller::EInstallResult InstallerBundle::install(
-  GuessedValue<QString>& modName, std::shared_ptr<IFileTree>& tree, QString&, int &modId)
+IPluginInstaller::EInstallResult
+InstallerBundle::install(GuessedValue<QString>& modName,
+                         std::shared_ptr<IFileTree>& tree, QString&, int& modId)
 {
   // Find a valid "object":
   auto entries = findObjects(tree);
@@ -152,23 +152,20 @@ IPluginInstaller::EInstallResult InstallerBundle::install(
   std::shared_ptr<const FileTreeEntry> entry = nullptr;
   if (entries.size() == 1) {
     entry = entries[0];
-  }
-  else {
+  } else {
     if (!m_PreviousFile.isEmpty()) {
       entry = tree->find(m_PreviousFile);
     }
 
     if (entry == nullptr) {
       MultiArchiveDialog dialog(entries, parentWidget());
       if (dialog.exec() == QDialog::Accepted) {
-        entry = dialog.selectedEntry();
+        entry          = dialog.selectedEntry();
         m_SelectedFile = entry->pathFrom(tree);
-      }
-      else {
+      } else {
         if (dialog.manualRequested()) {
           return IPluginInstaller::RESULT_MANUALREQUESTED;
-        }
-        else {
+        } else {
           return IPluginInstaller::RESULT_CANCELED;
         }
       }
@@ -183,13 +180,14 @@ IPluginInstaller::EInstallResult InstallerBundle::install(
 
   // Extract it:
   QString tempFile = manager()->extractFile(entry);
-  IPluginInstaller::EInstallResult res = manager()->installArchive(modName, tempFile, modId);
+  IPluginInstaller::EInstallResult res =
+      manager()->installArchive(modName, tempFile, modId);
   if (res == IPluginInstaller::RESULT_SUCCESS) {
     res = IPluginInstaller::RESULT_SUCCESSCANCEL;
   }
   return res;
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 Q_EXPORT_PLUGIN2(installerBundle, InstallerBundle)
 #endif