dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: add --import command-line option

Browse source 
When specified, opens the "Import from zip" dialog as soon as the main
window is shown, with the URL field prefilled with the argument given to
the option.

Closes #2998
This commit is contained in:
OverMighty 2020-02-05 00:29:23 +01:00
parent bc98181ec2
commit bc04d89c32
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
application/MultiMC.cpp
View file

@ -34,6 +34,7 @@
#include <QNetworkAccessManager>
#include <QTranslator>
#include <QLibraryInfo>
#include <QList>
#include <QStringList>
#include <QDebug>
#include <QStyleFactory>
@ -174,6 +175,10 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
parser.addSwitch("alive");
parser.addDocumentation("alive", "Write a small '" + liveCheckFile + "' file after MultiMC starts");
parser.addOption("import");
parser.addShortOpt("import", 'I');
parser.addDocumentation("import", "Import instance from specified zip (local path or URL)");
// parse the arguments
try
{
@ -207,6 +212,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
}
m_instanceIdToLaunch = args["launch"].toString();
m_liveCheck = args["alive"].toBool();
m_zipToImport = args["import"].toUrl();
QString origcwdPath = QDir::currentPath();
QString binPath = applicationDirPath();
@ -812,6 +818,12 @@ void MultiMC::performMainStartupAction()
showMainWindow(false);
qDebug() << "<> Main window shown.";
}
if (!m_zipToImport.isEmpty()) {
qDebug() << "<> Importing instance from zip:" << m_zipToImport.toString();
QList<QUrl> urls = { m_zipToImport };
m_mainWindow->droppedURLs(urls);
}
}
void MultiMC::showFatalErrorMessage(const QString& title, const QString& content)