Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 15:52:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for windows

Browse source
This commit is contained in:
Anthony J. Thibault 2015-11-06 15:33:06 -08:00
parent 086b064527
commit 9a484ff00d
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/cache-extract/CMakeLists.txt
View file

@ -3,4 +3,5 @@ set(TARGET_NAME cache-extract)
setup_hifi_project() setup_hifi_project()
link_hifi_libraries() link_hifi_libraries()
copy_dlls_beside_windows_executable()

22
tools/cache-extract/src/CacheExtractApp.cpp
View file

@ -14,6 +14,7 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QDir> #include <QDir>
#include <QtNetwork/QAbstractNetworkCache> #include <QtNetwork/QAbstractNetworkCache>
#include <QDataStream>
// extracted from qnetworkdiskcache.cpp // extracted from qnetworkdiskcache.cpp
#define CACHE_VERSION 8 #define CACHE_VERSION 8
@ -21,19 +22,18 @@ enum {
CacheMagic = 0xe8, CacheMagic = 0xe8,
CurrentCacheVersion = CACHE_VERSION CurrentCacheVersion = CACHE_VERSION
}; };
#define DATA_DIR QLatin1String("data")
CacheExtractApp::CacheExtractApp(int& argc, char** argv) : CacheExtractApp::CacheExtractApp(int& argc, char** argv) :
QCoreApplication(argc, argv) QCoreApplication(argc, argv)
{ {
QString myDataLoc = QStandardPaths::writableLocation(QStandardPaths::DataLocation); QString myDataLoc = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
int lastSlash = myDataLoc.lastIndexOf(QDir::separator()); int lastSlash = myDataLoc.lastIndexOf("/");
QString cachePath = myDataLoc.leftRef(lastSlash).toString() + QDir::separator() + QString cachePath = myDataLoc.leftRef(lastSlash).toString() + "/" +
"High Fidelity" + QDir::separator() + "Interface" + QDir::separator() + "High Fidelity" + "/" + "Interface" + "/" +
DATA_DIR + QString::number(CACHE_VERSION) + QLatin1Char('/'); "data" + QString::number(CACHE_VERSION) + "/";
QString outputPath = myDataLoc.leftRef(lastSlash).toString() + QDir::separator() + QString outputPath = myDataLoc.leftRef(lastSlash).toString() + "/" +
"High Fidelity" + QDir::separator() + "Interface" + QDir::separator() + "extracted"; "High Fidelity" + "/" + "Interface" + "/" + "extracted";
qDebug() << "Searching cachePath = " << cachePath << "..."; qDebug() << "Searching cachePath = " << cachePath << "...";
@ -60,9 +60,9 @@ CacheExtractApp::CacheExtractApp(int& argc, char** argv) :
MyMetaData metaData; MyMetaData metaData;
if (extractFile(fileList.at(i), metaData, contents)) { if (extractFile(fileList.at(i), metaData, contents)) {
QString outFileName = outputPath + metaData.url.path(); QString outFileName = outputPath + metaData.url.path();
int lastSlash = outFileName.lastIndexOf(QDir::separator()); int lastSlash = outFileName.lastIndexOf("/");
QString outDirName = outFileName.leftRef(lastSlash).toString(); QString outDirName = outFileName.leftRef(lastSlash).toString();
QDir dir(outputPath); QDir dir;
dir.mkpath(outDirName); dir.mkpath(outDirName);
QFile out(outFileName); QFile out(outFileName);
if (out.open(QIODevice::WriteOnly)) { if (out.open(QIODevice::WriteOnly)) {
@ -70,6 +70,9 @@ CacheExtractApp::CacheExtractApp(int& argc, char** argv) :
out.close(); out.close();
qDebug().noquote() << metaData.url.toDisplayString(); qDebug().noquote() << metaData.url.toDisplayString();
} }
else {
qCritical() << "Error opening outputFile = " << outFileName;
}
} else { } else {
qCritical() << "Error extracting = " << fileList.at(i); qCritical() << "Error extracting = " << fileList.at(i);
} }
@ -123,4 +126,5 @@ QDataStream &operator>>(QDataStream& in, MyMetaData& metaData) {
in >> metaData.saveToDisk; in >> metaData.saveToDisk;
in >> metaData.attributes; in >> metaData.attributes;
in >> metaData.rawHeaders; in >> metaData.rawHeaders;
return in;
} }