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

Work on new assets system. Working legacy assets importer, disabled assets downloading for now

Browse Source
This commit is contained in:
Sky 2013-12-08 02:58:44 +00:00
parent 613699b362
commit 6d438b2ef3
8 changed files with 238 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -384,6 +384,14 @@ logic/NagUtils.cpp
logic/SkinUtils.h
logic/SkinUtils.cpp
# Assets
logic/assets/AssetsIndex.h
logic/assets/AssetsIndex.cpp
logic/assets/AssetsUtils.h
logic/assets/AssetsUtils.cpp
logic/assets/Assets.h
logic/assets/Assets.cpp
)

6
gui/MainWindow.cpp
View File

@ -84,6 +84,8 @@
#include "logic/LegacyInstance.h"
#include "logic/assets/AssetsUtils.h"
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow)
{
MultiMCPlatform::fixWM_CLASS(this);
@ -243,7 +245,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
SLOT(assetsFilesProgress(int, int, int)));
connect(assets_downloader, SIGNAL(failed()), SLOT(assetsFailed()));
connect(assets_downloader, SIGNAL(finished()), SLOT(assetsFinished()));
assets_downloader->start();
//assets_downloader->start();
}
const QString currentInstanceId = MMC->settings()->get("SelectedInstance").toString();
@ -267,6 +269,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
// removing this looks stupid
view->setFocus();
AssetsUtils::migrateOldAssets();
}
MainWindow::~MainWindow()

14
logic/assets/Assets.cpp Normal file
View File

@ -0,0 +1,14 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

16
logic/assets/Assets.h Normal file
View File

@ -0,0 +1,16 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once

20
logic/assets/AssetsIndex.cpp Normal file
View File

@ -0,0 +1,20 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "AssetsIndex.h"
AssetObject::AssetObject(QString hash, qint64 size) : hash(hash), size(size)
{
}

39
logic/assets/AssetsIndex.h Normal file
View File

@ -0,0 +1,39 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <QString>
#include <QMap>
class AssetObject;
class AssetsIndex
{
public:
QMap<QString, AssetObject> objects;
bool isVirtual;
};
class AssetObject
{
public:
AssetObject(QString hash, qint64 size);
bool equals(AssetObject* other);
QString getHashCode();
QString hash;
qint64 size;
};

115
logic/assets/AssetsUtils.cpp Normal file
View File

@ -0,0 +1,115 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <QDir>
#include <QDirIterator>
#include <QCryptographicHash>
#include "AssetsUtils.h"
#include "MultiMC.h"
namespace AssetsUtils
{
void migrateOldAssets()
{
QDir assets_dir("assets");
if(!assets_dir.exists()) return;
assets_dir.setFilter(QDir::AllEntries | QDir::NoDotAndDotDot);
int base_length = assets_dir.path().length();
QList<QString> blacklist = {"indexes", "objects", "virtual"};
if(!assets_dir.exists("objects")) assets_dir.mkdir("objects");
QDir objects_dir("assets/objects");
QDirIterator iterator(assets_dir, QDirIterator::Subdirectories);
int successes = 0;
int failures = 0;
while (iterator.hasNext()) {
QString currentDir = iterator.next();
currentDir = currentDir.remove(0, base_length+1);
bool ignore = false;
for(QString blacklisted : blacklist)
{
if(currentDir.startsWith(blacklisted)) ignore = true;
}
if (!iterator.fileInfo().isDir() && !ignore) {
QString filename = iterator.filePath();
QFile input(filename);
input.open(QIODevice::ReadOnly | QIODevice::WriteOnly);
QString sha1sum = QCryptographicHash::hash(input.readAll(), QCryptographicHash::Sha1)
.toHex()
.constData();
QString object_name = filename.remove(0, base_length+1);
QLOG_DEBUG() << "Processing" << object_name << ":" << sha1sum << input.size();
QString object_tlk = sha1sum.left(2);
QString object_tlk_dir = objects_dir.path() + "/" + object_tlk;
QDir tlk_dir(object_tlk_dir);
if(!tlk_dir.exists()) objects_dir.mkdir(object_tlk);
QString new_filename = tlk_dir.path() + "/" + sha1sum;
QFile new_object(new_filename);
if(!new_object.exists())
{
bool rename_success = input.rename(new_filename);
QLOG_DEBUG() << " Doesn't exist, copying to" << new_filename << ":" << QString::number(rename_success);
if(rename_success) successes++;
else failures++;
}
else
{
input.remove();
QLOG_DEBUG() << " Already exists, deleting original and not copying.";
}
}
}
if(successes + failures == 0) {
QLOG_DEBUG() << "No legacy assets needed importing.";
}
else
{
QLOG_DEBUG() << "Finished copying legacy assets:" << successes << "successes and" << failures << "failures.";
QDirIterator cleanup_iterator(assets_dir);
while (cleanup_iterator.hasNext()) {
QString currentDir = cleanup_iterator.next();
currentDir = currentDir.remove(0, base_length+1);
bool ignore = false;
for(QString blacklisted : blacklist)
{
if(currentDir.startsWith(blacklisted)) ignore = true;
}
if (cleanup_iterator.fileInfo().isDir() && !ignore) {
QString path = cleanup_iterator.filePath();
QDir folder(path);
QLOG_DEBUG() << "Cleaning up legacy assets folder:" << path;
folder.removeRecursively();
}
}
}
}
}

21
logic/assets/AssetsUtils.h Normal file
View File

@ -0,0 +1,21 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
namespace AssetsUtils
{
void migrateOldAssets();
}