Added download of custom content

Rush · Rush · commit 228732649ded · 2014-09-09T21:18:00.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,9 @@
 [submodule "3rdparty/QtAwesome"]
 	path = 3rdparty/QtAwesome
 	url = git://github.com/gamecreature/QtAwesome
+[submodule "quazip"]
+	path = quazip
+	url = https://github.com/binaryking/quazip.git
+[submodule "3rdparty/quazip"]
+	path = 3rdparty/quazip
+	url = https://github.com/binaryking/quazip.git
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -9,6 +9,25 @@ add_library(QtAwesome OBJECT QtAwesome/QtAwesome/QtAwesome.cpp ${faresources})
 
 set_target_properties(QtAwesome PROPERTIES COMPILE_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
+
+
+
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip
+  ${CMAKE_CURRENT_BINARY_DIR}/quazip/quazip
+  ${ZLIB_INCLUDE_DIR}
+)
+
+file(GLOB SRCS "quazip/quazip/*.c" "quazip/quazip/*.cpp")
+file(GLOB PUBLIC_HEADERS "quazip/quazip/*.h")
+
+# Must be added to enable export macro
+ADD_DEFINITIONS(-DQUAZIP_BUILD)
+
+add_library(quazip OBJECT ${SRCS})
+#target_link_libraries(quazip Qt5::Core ${ZLIB_LIBRARY})
+
 set(3rdparty_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/QtAwesome/QtAwesome CACHE INTERNAL "")
 
 #target_link_libraries(QtAwesome Qt5::Widgets)
diff --git a/3rdparty/quazip b/3rdparty/quazip
@@ -0,0 +1 @@
+Subproject commit cf36e59d2ad38bac63447d02f1b1833276099ec0
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,16 +14,17 @@ set(CMAKE_AUTOMOC ON)
 find_package(Qt5Widgets)
 find_package(Qt5Network)
 find_package(PkgConfig)
+find_package(ZLIB)
 #find_package(Boost COMPONENTS system REQUIRED)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
 
 #pkg_check_modules(LIBTORRENT libtorrent-rasterbar)
 #string (REPLACE ";" " " LIBTORRENT_CFLAGS_STR "${LIBTORRENT_CFLAGS} -DBOOST_THREAD_USE_LIB")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBTORRENT_CFLAGS_STR}")
 
 if(CMAKE_BUILD_TYPE MATCHES Release)
-add_definitions(-DQT_NO_DEBUG_OUTPUT)
+#add_definitions(-DQT_NO_DEBUG_OUTPUT)
 endif()
 
 add_subdirectory(3rdparty)
@@ -41,19 +42,19 @@ else()
 	set(BUILD_TYPE "")
 endif()
 
-set(UTLauncher_VERSION "0.2.6" CACHE STRING "Version number" FORCE INTERNAL)
+set(UTLauncher_VERSION "0.3.0" CACHE STRING "Version number" FORCE INTERNAL)
 set_version_number(UTLauncher)
 
 add_definitions(-DNO_DOWNLOAD -DVERSION_MAJOR=${UTLauncher_VERSION_MAJOR} -DVERSION_MINOR=${UTLauncher_VERSION_MINOR} -DVERSION_PATCH=${UTLauncher_VERSION_PATCH})
-add_executable(UTLauncher ${BUILD_TYPE} ${resources} ${rc_srcs} main.cpp utlauncher.cpp download.cpp utsplash.cpp bootstrap.cpp serverbrowser.cpp configdialog.cpp $<TARGET_OBJECTS:QtAwesome>)
+add_executable(UTLauncher ${BUILD_TYPE} ${resources} ${rc_srcs} main.cpp utlauncher.cpp download.cpp utsplash.cpp bootstrap.cpp serverbrowser.cpp configdialog.cpp $<TARGET_OBJECTS:QtAwesome> $<TARGET_OBJECTS:quazip>)
 
 
 if(STATIC_BUILD_WIN32)
 	pkg_check_modules(QT5WIDGETS Qt5Widgets)
 	add_definitions(-DSTATIC_PLUGIN_WINDOWS)
-	target_link_libraries(UTLauncher Qt5::Widgets Qt5::QWindowsIntegrationPlugin Qt5::Network ${QT5WIDGETS_LDFLAGS})
+	target_link_libraries(UTLauncher Qt5::Widgets Qt5::QWindowsIntegrationPlugin Qt5::Network ${QT5WIDGETS_LDFLAGS} ${ZLIB_LIBRARY})
 else()
-	target_link_libraries(UTLauncher Qt5::Widgets Qt5::Network ${Boost_SYSTEM_LIBRARY})
+	target_link_libraries(UTLauncher Qt5::Widgets Qt5::Network ${Boost_SYSTEM_LIBRARY} ${ZLIB_LIBRARY})
 endif()
 
 install(TARGETS UTLauncher RUNTIME DESTINATION bin)
diff --git a/bootstrap.h b/bootstrap.h
@@ -10,6 +10,7 @@
 #include <QFileInfo>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QSettings>
 #include <QDir>
 #include <QFileDialog>
@@ -30,6 +31,8 @@ class Bootstrap : public QObject {
     QString releasePath;
     QString torrentFullFile;
     QSettings& settings;
+    QSet<QString> stockMaps;
+    
     
     QTimer bootstrapRedownloadTimer;
     
@@ -55,6 +58,10 @@ private slots:
         return motd;
     }
     
+    bool isStockMap(QString map) const {
+        return stockMaps.contains(map);
+    }
+    
     Bootstrap(QSettings& _settings, QObject* parent = nullptr) : QObject(parent), settings(_settings) {
         download.setTarget("https://utlauncher.rushbase.net/bootstrap.json");
 
@@ -85,6 +92,11 @@ private slots:
             downloadServers.download();
             
             bootstrapRedownloadTimer.singleShot(15*60000, &download, SLOT(download()));
+            stockMaps.clear();
+            for(auto stockMap : json.value("stockMaps").toArray()) {
+                auto mapString = stockMap.toString();
+                stockMaps.insert(mapString);
+            }
             
 #ifdef NO_DOWNLOAD
             emit ready();
diff --git a/download.cpp b/download.cpp
@@ -16,10 +16,12 @@ Download::~Download() {
 
 
 void Download::setTarget(const QString &t) {
+    
     this->target = t;
 }
 
 void Download::downloadFinished(QNetworkReply *data) {
+    
     emit done(data->readAll());
 }
 
@@ -29,6 +31,7 @@ void Download::download() {
     
     request.sslConfiguration().setProtocol(QSsl::AnyProtocol);
     
+    httpCode = 0;
     request.setRawHeader( "User-Agent" , QString("UTLauncher %1.%2.%3 / %4").arg(VERSION_MAJOR).arg(VERSION_MINOR).arg(VERSION_PATCH).arg(
 #if defined Q_OS_WINDOWS
 		"Windows"
@@ -42,14 +45,28 @@ void Download::download() {
 		).toUtf8() );
     QNetworkReply* reply = manager.get(request);
     QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(downloadProgress(qint64,qint64)));
+    
     if(receivers(SIGNAL(chunk(QByteArray)))) {
         connect(reply, &QNetworkReply::readyRead, [=] {
-            emit chunk(reply->readAll());
+            if(httpCode == 200)
+                emit chunk(reply->readAll());
         });
     }
+    QObject::connect(reply, &QNetworkReply::metaDataChanged, [=]() {
+        
+        auto statusCode = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute );
+        if ( statusCode.isValid() ) {
+            int replyCode = statusCode.toInt();
+            httpCode = replyCode;
+            if(replyCode != 200) {
+                emit error(replyCode, reply->readAll());
+                disconnect(this, SLOT(downloadProgress(qint64, qint64)));
+            }
+            return;
+        }
+    });
     QObject::connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
     QObject::connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(downloadSslErrors(QList<QSslError>)));
-    
 }
 
 
@@ -64,5 +81,5 @@ void Download::downloadError(QNetworkReply::NetworkError error) {
 }
 
 void Download::downloadProgress(qint64 recieved, qint64 total) {
-    qDebug() << recieved << total;
+    emit progress((double)recieved / total);
 }
diff --git a/download.h b/download.h
@@ -17,6 +17,7 @@ class Download : public QObject {
     void setTarget(const QString& t);
     
 private:
+    int httpCode;
     QNetworkAccessManager manager;
     QString target;
 
@@ -25,6 +26,7 @@ class Download : public QObject {
     
     void progress(double progress);
     void chunk(QByteArray chunk);
+    void error(int code, QByteArray data);
 
 public slots:
     void download();
diff --git a/main.cpp b/main.cpp
@@ -9,20 +9,22 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS
     QByteArray localMsg = msg.toLocal8Bit();
     switch (type) {
     case QtDebugMsg:
-        fprintf(stderr, "Debug: %s\n\0 (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Debug: %s\n (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
         break;
     case QtWarningMsg:
-        fprintf(stderr, "Warning: %s\n\0 (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Warning: %s\n (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
         break;
     case QtCriticalMsg:
-        fprintf(stderr, "Critical: %s\n\0 (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Critical: %s\n (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
         break;
     case QtFatalMsg:
-        fprintf(stderr, "Fatal: %s\n\0 (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        fprintf(stderr, "Fatal: %s\n (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
         abort();
     }
 }
 
+#include <QTextCodec>
+
 int main(int argc, char** argv)
 {
     qInstallMessageHandler(myMessageOutput);
@@ -31,9 +33,8 @@ int main(int argc, char** argv)
     QCoreApplication::setOrganizationDomain("codecharm.co.uk");
     QCoreApplication::setApplicationName("UTLauncher");
 
-//    QApplication::setDesktopSettingsAware(false);
     UTLauncher app(argc, argv);
-    
+        
     return app.exec();
 }
 
diff --git a/serverbrowser.h b/serverbrowser.h
diff --git a/utlauncher.cpp b/utlauncher.cpp
diff --git a/utlauncher.h b/utlauncher.h
