mirror of
https://github.com/ModOrganizer2/modorganizer-installer_bundle.git
synced 2026-07-27 14:02:39 -07:00
Compare commits
32
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b23695116a | ||
|
|
522bc53e7b | ||
|
|
288e1b93c4 | ||
|
|
5995bce5e6 | ||
|
|
988523cac1 | ||
|
|
71b82656b1 | ||
|
|
6d89f9da86 | ||
|
|
12d509e2d6 | ||
|
|
3ab86a768b | ||
|
|
b13d9a43b0 | ||
|
|
4c9e004729 | ||
|
|
384c9a8483 | ||
|
|
047cc80b51 | ||
|
|
792e0a3cc3 | ||
|
|
85ecc1c134 | ||
|
|
5049593b77 | ||
|
|
2564071b0b | ||
|
|
328e05eb9b | ||
|
|
c5944960f7 | ||
|
|
fcda663540 | ||
|
|
0592d5293c | ||
|
|
1e34e24e33 | ||
|
|
50f0cf7266 | ||
|
|
ea3d31fe71 | ||
|
|
289663f1cd | ||
|
|
7fc63ddfd7 | ||
|
|
b3f9d0c575 | ||
|
|
2c7e8a417a | ||
|
|
aae2c898f0 | ||
|
|
9bb9c301c4 | ||
|
|
558a806ea8 | ||
|
|
1e1f77ce55 |
@@ -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']
|
||||
@@ -0,0 +1 @@
|
||||
988523cac10641c510fd711d80d59c82d473f6a5
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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: "."
|
||||
+8
-11
@@ -1,14 +1,11 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)
|
||||
project(installer_bundle)
|
||||
|
||||
SET(PROJ_NAME installer_bundle)
|
||||
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(${PROJ_NAME})
|
||||
|
||||
SET(DEPENDENCIES_DIR CACHE PATH "")
|
||||
|
||||
# hint to find qt in dependencies path
|
||||
LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
|
||||
|
||||
ADD_SUBDIRECTORY(src)
|
||||
add_subdirectory(src)
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
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\installer_bundle.dll
|
||||
name: installer_bundle_dll
|
||||
- path: build\src\installer_bundle.pdb
|
||||
name: installer_bundle_pdb
|
||||
- path: build\src\installer_bundle.lib
|
||||
name: installer_bundle_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
|
||||
+4
-62
@@ -1,63 +1,5 @@
|
||||
CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11)
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
CMAKE_POLICY(SET CMP0020 NEW)
|
||||
CMAKE_POLICY(SET CMP0043 NEW)
|
||||
|
||||
FILE(GLOB ${PROJ_NAME}_SRCS *.cpp)
|
||||
FILE(GLOB ${PROJ_NAME}_HDRS *.h)
|
||||
FILE(GLOB ${PROJ_NAME}_FORMS *.ui)
|
||||
|
||||
|
||||
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
SET(CMAKE_AUTOMOC ON)
|
||||
SET(CMAKE_AUTOUIC ON)
|
||||
FIND_PACKAGE(Qt5Widgets REQUIRED)
|
||||
QT5_WRAP_UI(${PROJ_NAME}_UIHDRS ${${PROJ_NAME}_FORMS})
|
||||
FIND_PACKAGE(Qt5LinguistTools)
|
||||
QT5_CREATE_TRANSLATION(${PROJ_NAME}_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/${PROJ_NAME}_en.ts)
|
||||
|
||||
SET(Boost_USE_STATIC_LIBS ON)
|
||||
SET(Boost_USE_MULTITHREADED ON)
|
||||
SET(Boost_USE_STATIC_RUNTIME OFF)
|
||||
FIND_PACKAGE(Boost)
|
||||
|
||||
IF (Boost_FOUND)
|
||||
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
|
||||
ENDIF (Boost_FOUND)
|
||||
|
||||
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")
|
||||
SET(lib_path "${project_path}/../../install/libs")
|
||||
|
||||
INCLUDE_DIRECTORIES(${project_path}/uibase/src)
|
||||
LINK_DIRECTORIES(${lib_path})
|
||||
|
||||
|
||||
ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS} ${${PROJ_NAME}_UIHDRS} ${${PROJ_NAME}_translations_qm})
|
||||
TARGET_LINK_LIBRARIES(${PROJ_NAME}
|
||||
Qt5::Widgets
|
||||
${Boost_LIBRARIES}
|
||||
uibase)
|
||||
|
||||
IF(MSVC)
|
||||
SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE")
|
||||
ELSE(MSVC)
|
||||
SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS "-std=c++11")
|
||||
ENDIF(MSVC)
|
||||
|
||||
IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "")
|
||||
SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO ${OPTIMIZE_COMPILE_FLAGS})
|
||||
ENDIF()
|
||||
IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "")
|
||||
SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS})
|
||||
ENDIF()
|
||||
|
||||
###############
|
||||
## Installation
|
||||
|
||||
INSTALL(TARGETS ${PROJ_NAME}
|
||||
RUNTIME DESTINATION bin/plugins)
|
||||
INSTALL(FILES $<TARGET_PDB_FILE:${PROJ_NAME}>
|
||||
DESTINATION pdb)
|
||||
add_library(installer_bundle SHARED)
|
||||
mo2_configure_plugin(installer_bundle WARNINGS OFF)
|
||||
mo2_install_target(installer_bundle)
|
||||
|
||||
@@ -4,9 +4,43 @@
|
||||
<context>
|
||||
<name>InstallerBundle</name>
|
||||
<message>
|
||||
<location filename="installerbundle.cpp" line="50"/>
|
||||
<location filename="installerbundle.cpp" line="44"/>
|
||||
<source>Bundle Installer</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="installerbundle.cpp" line="54"/>
|
||||
<source>Proxy-Installer to handle bundles containing the actual mod archive</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MultiArchiveDialog</name>
|
||||
<message>
|
||||
<location filename="multiarchivedialog.ui" line="14"/>
|
||||
<source>Bundled archives</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="multiarchivedialog.ui" line="20"/>
|
||||
<source>This archive contains multiple archives that can be installed separately. Please select the archive you want to extract and install.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="multiarchivedialog.ui" line="35"/>
|
||||
<location filename="multiarchivedialog.ui" line="38"/>
|
||||
<source>Opens a Dialog that allows custom modifications.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="multiarchivedialog.ui" line="41"/>
|
||||
<source>Manual</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="multiarchivedialog.ui" line="64"/>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
</TS>
|
||||
|
||||
+108
-50
@@ -22,16 +22,15 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <QtPlugin>
|
||||
|
||||
#include "multiarchivedialog.h"
|
||||
|
||||
using namespace MOBase;
|
||||
|
||||
InstallerBundle::InstallerBundle() {}
|
||||
|
||||
InstallerBundle::InstallerBundle()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
bool InstallerBundle::init(IOrganizer*)
|
||||
bool InstallerBundle::init(IOrganizer* organizer)
|
||||
{
|
||||
m_Organizer = organizer;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -40,6 +39,11 @@ QString InstallerBundle::name() const
|
||||
return "Bundle Installer";
|
||||
}
|
||||
|
||||
QString InstallerBundle::localizedName() const
|
||||
{
|
||||
return tr("Bundle Installer");
|
||||
}
|
||||
|
||||
QString InstallerBundle::author() const
|
||||
{
|
||||
return "Tannin";
|
||||
@@ -55,14 +59,12 @@ VersionInfo InstallerBundle::version() const
|
||||
return VersionInfo(1, 1, 0, VersionInfo::RELEASE_FINAL);
|
||||
}
|
||||
|
||||
bool InstallerBundle::isActive() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
QList<PluginSetting> InstallerBundle::settings() const
|
||||
{
|
||||
return QList<PluginSetting>();
|
||||
return {PluginSetting("auto_reinstall",
|
||||
"when reinstalling from an archive containing multiple mods, "
|
||||
"automatically select the previously installed",
|
||||
true)};
|
||||
}
|
||||
|
||||
unsigned int InstallerBundle::priority() const
|
||||
@@ -75,61 +77,117 @@ bool InstallerBundle::isManualInstaller() const
|
||||
return false;
|
||||
}
|
||||
|
||||
bool InstallerBundle::findObject(DirectoryTree const *tree) const
|
||||
void InstallerBundle::onInstallationStart(QString const& archive, bool reinstallation,
|
||||
IModInterface* currentMod)
|
||||
{
|
||||
for (;;) {
|
||||
DirectoryTree::const_leaf_iterator fileIter = tree->leafsBegin();
|
||||
// We reset some field and fetch the previously installed file:
|
||||
m_InstallationFile = archive;
|
||||
m_InstallerUsed = false;
|
||||
m_SelectedFile = "";
|
||||
m_PreviousFile = "";
|
||||
|
||||
//Really truly we should use the supported extensions from the installation
|
||||
//manager here
|
||||
if (tree->numNodes() == 0 && tree->numLeafs() == 1 &&
|
||||
(fileIter->getName().endsWith(".7z") ||
|
||||
fileIter->getName().endsWith(".zip") ||
|
||||
fileIter->getName().endsWith(".rar"))) {
|
||||
// nested archive
|
||||
m_found_dir = tree;
|
||||
m_found_leaf = fileIter;
|
||||
return true;
|
||||
if (reinstallation && m_Organizer->pluginSetting(name(), "auto_reinstall").toBool()) {
|
||||
m_PreviousFile = currentMod->pluginSetting(name(), "archive", QString()).toString();
|
||||
}
|
||||
}
|
||||
void InstallerBundle::onInstallationEnd(EInstallResult result, IModInterface* newMod)
|
||||
{
|
||||
if (result == EInstallResult::RESULT_SUCCESS && m_InstallerUsed) {
|
||||
newMod->setInstallationFile(m_InstallationFile);
|
||||
if (!m_SelectedFile.isEmpty()) {
|
||||
newMod->setPluginSetting(name(), "archive", m_SelectedFile);
|
||||
}
|
||||
|
||||
for (; fileIter != tree->leafsEnd(); ++fileIter) {
|
||||
if (fileIter->getName().endsWith(".fomod")) {
|
||||
m_found_dir = tree;
|
||||
m_found_leaf = fileIter;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
//Arguably this should also check the name of the directory we're looking at
|
||||
//is the same as the module name
|
||||
if (tree->numNodes() != 1) {
|
||||
return false;
|
||||
}
|
||||
tree = *(tree->nodesBegin());
|
||||
}
|
||||
}
|
||||
|
||||
bool InstallerBundle::isArchiveSupported(const DirectoryTree &tree) const
|
||||
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>>
|
||||
InstallerBundle::findObjects(std::shared_ptr<const IFileTree> tree) const
|
||||
{
|
||||
return findObject(&tree);
|
||||
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> entries;
|
||||
// Check if we have an archive:
|
||||
auto managerExtensions = manager()->getSupportedExtensions();
|
||||
|
||||
// Look for a file with a valid extension:
|
||||
int nDirs = 0;
|
||||
for (auto entry : *tree) {
|
||||
if (entry->isFile()) {
|
||||
if (managerExtensions.contains(entry->suffix(),
|
||||
FileNameComparator::CaseSensitivity)) {
|
||||
entries.push_back(entry);
|
||||
}
|
||||
} else {
|
||||
nDirs++;
|
||||
}
|
||||
}
|
||||
|
||||
if (!entries.empty()) {
|
||||
return entries;
|
||||
}
|
||||
|
||||
// Arguably this should also check the name of the directory we're looking at
|
||||
// is the same as the module name:
|
||||
if (nDirs != 1) {
|
||||
return {};
|
||||
}
|
||||
|
||||
// Retrieve the first folder which is the first item:
|
||||
return findObjects(tree->at(0)->astree());
|
||||
}
|
||||
|
||||
IPluginInstaller::EInstallResult InstallerBundle::install(GuessedValue<QString> &modName,
|
||||
DirectoryTree &tree,
|
||||
QString&, int &modId)
|
||||
bool InstallerBundle::isArchiveSupported(std::shared_ptr<const IFileTree> tree) const
|
||||
{
|
||||
if (! findObject(&tree)) {
|
||||
return !findObjects(tree).empty();
|
||||
}
|
||||
|
||||
IPluginInstaller::EInstallResult
|
||||
InstallerBundle::install(GuessedValue<QString>& modName,
|
||||
std::shared_ptr<IFileTree>& tree, QString&, int& modId)
|
||||
{
|
||||
// Find a valid "object":
|
||||
auto entries = findObjects(tree);
|
||||
if (entries.empty()) {
|
||||
return IPluginInstaller::RESULT_NOTATTEMPTED;
|
||||
}
|
||||
FileNameString name = m_found_dir->getFullPath(&(*m_found_leaf));
|
||||
QString tempFile = manager()->extractFile(name.toQString());
|
||||
IPluginInstaller::EInstallResult res = manager()->installArchive(modName, tempFile, modId);
|
||||
|
||||
std::shared_ptr<const FileTreeEntry> entry = nullptr;
|
||||
if (entries.size() == 1) {
|
||||
entry = entries[0];
|
||||
} 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();
|
||||
m_SelectedFile = entry->pathFrom(tree);
|
||||
} else {
|
||||
if (dialog.manualRequested()) {
|
||||
return IPluginInstaller::RESULT_MANUALREQUESTED;
|
||||
} else {
|
||||
return IPluginInstaller::RESULT_CANCELED;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (entry == nullptr) {
|
||||
return IPluginInstaller::RESULT_CANCELED;
|
||||
}
|
||||
|
||||
m_InstallerUsed = true;
|
||||
|
||||
// Extract it:
|
||||
QString tempFile = manager()->extractFile(entry);
|
||||
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
|
||||
|
||||
+88
-64
@@ -1,64 +1,88 @@
|
||||
/*
|
||||
Copyright (C) 2012 Sebastian Herbord. All rights reserved.
|
||||
|
||||
This file is part of Mod Organizer.
|
||||
|
||||
Mod Organizer 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.
|
||||
|
||||
Mod Organizer 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 Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef INSTALLERBUNDLE_H
|
||||
#define INSTALLERBUNDLE_H
|
||||
|
||||
|
||||
#include <iplugininstallersimple.h>
|
||||
|
||||
class InstallerBundle : public MOBase::IPluginInstallerSimple
|
||||
{
|
||||
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerSimple)
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
|
||||
Q_PLUGIN_METADATA(IID "org.tannin.InstallerBundle" FILE "installerbundle.json")
|
||||
#endif
|
||||
|
||||
public:
|
||||
|
||||
InstallerBundle();
|
||||
|
||||
virtual bool init(MOBase::IOrganizer *moInfo);
|
||||
virtual QString name() const;
|
||||
virtual QString author() const;
|
||||
virtual QString description() const;
|
||||
virtual MOBase::VersionInfo version() const;
|
||||
virtual bool isActive() const;
|
||||
virtual QList<MOBase::PluginSetting> settings() const;
|
||||
|
||||
virtual unsigned int priority() const;
|
||||
virtual bool isManualInstaller() const;
|
||||
|
||||
virtual bool isArchiveSupported(const MOBase::DirectoryTree &tree) const;
|
||||
virtual EInstallResult install(MOBase::GuessedValue<QString> &modName,
|
||||
MOBase::DirectoryTree &tree,
|
||||
QString &version, int &modID);
|
||||
|
||||
private:
|
||||
//Stash the results of findObject.
|
||||
//FIXME return a tuple?
|
||||
mutable MOBase::DirectoryTree const *m_found_dir;
|
||||
mutable MOBase::DirectoryTree::const_leaf_iterator m_found_leaf;
|
||||
bool findObject(MOBase::DirectoryTree const *tree) const;
|
||||
};
|
||||
|
||||
|
||||
#endif // INSTALLERBUNDLE_H
|
||||
/*
|
||||
Copyright (C) 2012 Sebastian Herbord. All rights reserved.
|
||||
|
||||
This file is part of Mod Organizer.
|
||||
|
||||
Mod Organizer 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.
|
||||
|
||||
Mod Organizer 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 Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef INSTALLERBUNDLE_H
|
||||
#define INSTALLERBUNDLE_H
|
||||
|
||||
#include <iplugininstallersimple.h>
|
||||
|
||||
class InstallerBundle : public MOBase::IPluginInstallerSimple
|
||||
{
|
||||
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerSimple)
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||
Q_PLUGIN_METADATA(IID "org.tannin.InstallerBundle" FILE "installerbundle.json")
|
||||
#endif
|
||||
|
||||
public:
|
||||
InstallerBundle();
|
||||
|
||||
virtual bool init(MOBase::IOrganizer* moInfo) override;
|
||||
virtual QString name() const override;
|
||||
virtual QString localizedName() const override;
|
||||
virtual QString author() const override;
|
||||
virtual QString description() const override;
|
||||
virtual MOBase::VersionInfo version() const override;
|
||||
virtual QList<MOBase::PluginSetting> settings() const override;
|
||||
|
||||
virtual unsigned int priority() const override;
|
||||
virtual bool isManualInstaller() const override;
|
||||
|
||||
virtual void onInstallationStart(QString const& archive, bool reinstallation,
|
||||
MOBase::IModInterface* currentMod) override;
|
||||
virtual void onInstallationEnd(EInstallResult result,
|
||||
MOBase::IModInterface* newMod) override;
|
||||
|
||||
virtual bool
|
||||
isArchiveSupported(std::shared_ptr<const MOBase::IFileTree> tree) const override;
|
||||
virtual EInstallResult install(MOBase::GuessedValue<QString>& modName,
|
||||
std::shared_ptr<MOBase::IFileTree>& tree,
|
||||
QString& version, int& modID) override;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief Find the entries that can be extracted from this archive.
|
||||
*
|
||||
* @param tree The tree to look the entry in.
|
||||
*
|
||||
* @return the entry, if one was found, or a null pointer.
|
||||
*/
|
||||
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>>
|
||||
findObjects(std::shared_ptr<const MOBase::IFileTree> tree) const;
|
||||
|
||||
private:
|
||||
MOBase::IOrganizer* m_Organizer;
|
||||
|
||||
// The archive being installed:
|
||||
QString m_InstallationFile;
|
||||
|
||||
// Indicates if this installer was used during the installation process:
|
||||
bool m_InstallerUsed;
|
||||
|
||||
// Contains the file installed (when multiple archives are present), or an
|
||||
// empty string:
|
||||
QString m_SelectedFile;
|
||||
|
||||
// Contains the file previously installed (when multiple archives are present), or an
|
||||
// empty string:
|
||||
QString m_PreviousFile;
|
||||
};
|
||||
|
||||
#endif // INSTALLERBUNDLE_H
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
#include "multiarchivedialog.h"
|
||||
#include "ui_multiarchivedialog.h"
|
||||
|
||||
using namespace MOBase;
|
||||
|
||||
MultiArchiveDialog::MultiArchiveDialog(
|
||||
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> entries, QWidget* parent)
|
||||
: QDialog(parent), ui(new Ui::MultiArchiveDialog), m_Manual(false),
|
||||
m_SelectedEntry(nullptr)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
auto layout = ui->middleLayout;
|
||||
for (auto& entry : entries) {
|
||||
QPushButton* button = new QPushButton(entry->name(), this);
|
||||
button->setStyleSheet("text-align: left; padding: 10px; font-weight: bold;");
|
||||
layout->addWidget(button);
|
||||
|
||||
connect(button, &QPushButton::clicked, [this, entry]() {
|
||||
m_SelectedEntry = entry;
|
||||
this->accept();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
MultiArchiveDialog::~MultiArchiveDialog()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MultiArchiveDialog::on_cancelBtn_clicked()
|
||||
{
|
||||
this->reject();
|
||||
}
|
||||
|
||||
void MultiArchiveDialog::on_manualBtn_clicked()
|
||||
{
|
||||
m_Manual = true;
|
||||
this->reject();
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
/*
|
||||
Copyright (C) 2012 Sebastian Herbord. All rights reserved.
|
||||
|
||||
This file is part of Mod Organizer.
|
||||
|
||||
Mod Organizer 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.
|
||||
|
||||
Mod Organizer 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 Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef BAINCOMPLEXINSTALLERDIALOG_H
|
||||
#define BAINCOMPLEXINSTALLERDIALOG_H
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
#include "ifiletree.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class MultiArchiveDialog;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
**/
|
||||
class MultiArchiveDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
/**
|
||||
* @brief Constructor
|
||||
*
|
||||
* @param tree the directory tree of the archive. The caller is resonsible to verify
|
||||
*this actually qualifies as a bain installer
|
||||
* @param modName proposed name for the mod. The dialog allows the user to change this
|
||||
* @param packageTXT path to the extracted package.txt file or an empty string if
|
||||
*there is none
|
||||
* @param parent parent widget
|
||||
**/
|
||||
explicit MultiArchiveDialog(
|
||||
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> entries,
|
||||
QWidget* parent);
|
||||
~MultiArchiveDialog();
|
||||
|
||||
/**
|
||||
* @return bool true if the user requested the manual dialog
|
||||
**/
|
||||
bool manualRequested() const { return m_Manual; }
|
||||
|
||||
/**
|
||||
* @return QString the (user-modified) name to be used for the mod
|
||||
**/
|
||||
auto selectedEntry() const { return m_SelectedEntry; }
|
||||
|
||||
private slots:
|
||||
|
||||
void on_manualBtn_clicked();
|
||||
void on_cancelBtn_clicked();
|
||||
|
||||
private:
|
||||
Ui::MultiArchiveDialog* ui;
|
||||
bool m_Manual;
|
||||
std::shared_ptr<const MOBase::FileTreeEntry> m_SelectedEntry;
|
||||
};
|
||||
|
||||
#endif // BAINCOMPLEXINSTALLERDIALOG_H
|
||||
@@ -0,0 +1,77 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MultiArchiveDialog</class>
|
||||
<widget class="QDialog" name="MultiArchiveDialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>424</width>
|
||||
<height>146</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Bundled archives</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>This archive contains multiple archives that can be installed separately. Please select the archive you want to extract and install.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="middleLayout"/>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QPushButton" name="manualBtn">
|
||||
<property name="toolTip">
|
||||
<string>Opens a Dialog that allows custom modifications.</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string>Opens a Dialog that allows custom modifications.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Manual</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="cancelBtn">
|
||||
<property name="text">
|
||||
<string>Cancel</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Reference in New Issue
Block a user