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

Merge pull request #248 from MultiMC/feature_fix_ftb_lib

Browse Source 
Fix FTB local libraries bug
This commit is contained in:
Petr Mrázek 2014-05-03 15:47:57 +02:00
commit de48f102bd
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
logic/OneSixLibrary.cpp
View File

@ -148,22 +148,23 @@ QStringList OneSixLibrary::files()
{
QString cooked_storage = storage;
cooked_storage.replace("${arch}", "32");
retval.append(PathCombine("libraries", cooked_storage));
retval.append(cooked_storage);
cooked_storage = storage;
cooked_storage.replace("${arch}", "64");
retval.append(PathCombine("libraries", cooked_storage));
retval.append(cooked_storage);
}
else
retval.append(PathCombine("libraries", storage));
retval.append(storage);
return retval;
}
bool OneSixLibrary::filesExist()
bool OneSixLibrary::filesExist(const QDir &base)
{
auto libFiles = files();
for(auto file: libFiles)
{
QFileInfo info(file);
QFileInfo info(base, file);
QLOG_WARN() << info.absoluteFilePath() << "doesn't exist";
if (!info.exists())
return false;
}

3
logic/OneSixLibrary.h
View File

@ -19,6 +19,7 @@
#include <QStringList>
#include <QMap>
#include <QJsonObject>
#include <QDir>
#include <memory>
#include "logic/net/URLConstants.h"
@ -142,6 +143,6 @@ public:
QString hint() const;
bool extractTo(QString target_dir);
bool filesExist();
bool filesExist(const QDir &base);
QStringList files();
};

2
logic/OneSixUpdate.cpp
View File

@ -274,7 +274,7 @@ void OneSixUpdate::jarlibStart()
{
if (lib->hint() == "local")
{
if(!lib->filesExist())
if(!lib->filesExist(m_inst->librariesPath()))
brokenLocalLibs.append(lib);
continue;
}