0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: allow telling the main process to import a zip

Browse Source 
This commit enhances the IPC message system and adds a new IPC command
in order to allow secondary MultiMC processes that were started by
executing MultiMC with the `--import` command-line option to tell the
main MutliMC process to open the "Import from zip" dialog window and
prefill the URL field with the specified URL.
This commit is contained in:
OverMighty 2020-02-09 16:17:41 +01:00
parent 060d6955e1
commit 381c12547f
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
application/MultiMC.cpp
View File

@ -284,13 +284,20 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
connect(m_peerInstance, &LocalPeer::messageReceived, this, &MultiMC::messageReceived); connect(m_peerInstance, &LocalPeer::messageReceived, this, &MultiMC::messageReceived);
if(m_peerInstance->isClient()) if(m_peerInstance->isClient())
{ {
int timeout = 2000;
if(m_instanceIdToLaunch.isEmpty()) if(m_instanceIdToLaunch.isEmpty())
{ {
m_peerInstance->sendMessage("activate", 2000); m_peerInstance->sendMessage("activate", timeout);
if(!m_zipToImport.isEmpty())
{
m_peerInstance->sendMessage("import " + m_zipToImport.toString(), timeout);
}
} }
else else
{ {
m_peerInstance->sendMessage(m_instanceIdToLaunch, 2000); m_peerInstance->sendMessage("launch " + m_instanceIdToLaunch, timeout);
} }
m_status = MultiMC::Succeeded; m_status = MultiMC::Succeeded;
return; return;
@ -820,9 +827,8 @@ void MultiMC::performMainStartupAction()
} }
if(!m_zipToImport.isEmpty()) if(!m_zipToImport.isEmpty())
{ {
qDebug() << "<> Importing instance from zip:" << m_zipToImport.toString(); qDebug() << "<> Importing instance from zip:" << m_zipToImport;
QList<QUrl> urls = { m_zipToImport }; m_mainWindow->droppedURLs({ m_zipToImport });
m_mainWindow->droppedURLs(urls);
} }
} }
@ -860,18 +866,40 @@ void MultiMC::messageReceived(const QString& message)
qDebug() << "Received message" << message << "while still initializing. It will be ignored."; qDebug() << "Received message" << message << "while still initializing. It will be ignored.";
return; return;
} }
if(message == "activate")
QStringList args = message.split(' ');
QString command = args.takeFirst();
if(command == "activate")
{ {
showMainWindow(); showMainWindow();
} }
else else if(command == "import")
{ {
auto inst = instances()->getInstanceById(message); if(args.isEmpty())
{
qWarning() << "Received" << command << "message without a zip path/URL.";
return;
}
m_mainWindow->droppedURLs({ QUrl(args.takeFirst()) });
}
else if(command == "launch")
{
if(args.isEmpty())
{
qWarning() << "Received" << command << "message without an instance ID.";
return;
}
auto inst = instances()->getInstanceById(args.takeFirst());
if(inst) if(inst)
{ {
launch(inst, true, nullptr); launch(inst, true, nullptr);
} }
} }
else
{
qWarning() << "Received invalid message" << message;
}
} }
void MultiMC::analyticsSettingChanged(const Setting&, QVariant value) void MultiMC::analyticsSettingChanged(const Setting&, QVariant value)