Integrate Path with Download

Author: noisecode3

src/FileManager.cpp

@@ -182,8 +182,8 @@ bool FileManager::extractZip(
         QString("%1%2%3").arg(m_levelDir.absolutePath(), m_sep, zipFilename);
     const QString& outputPath =
         QString("%1%2%3").arg(m_levelDir.absolutePath(), m_sep, outputFolder);
-    Path oPath(Path::resource);
-    oPath << outputFolder;
+
+    Path oPath = (Path(Path::resource) << outputFolder);
 
     qDebug() << "Unzipping file" << zipFilename << "to" << outputPath;
 

src/Model.cpp

@@ -22,7 +22,6 @@ bool Model::setupDirectories(const QString& level, const QString& game) {
     bool status = false;
 
     if (fileManager.setUpCamp(level, game) &&
-            downloader.setUpCamp(level) &&
             data.initializeDatabase(level) &&
             m_pyRunner.setUpCamp(level)) {
         Path::setProgramFilesPath();
@@ -400,12 +399,12 @@ void Model::getLevel(int id) {
     if (id > 0) {
         bool status = false;
         ZipData zipData = data.getDownload(id);
+        Path path(Path::resource);
+        path << zipData.m_fileName;
         downloader.setUrl(zipData.m_URL);
-        downloader.setSaveFile(zipData.m_fileName);
+        downloader.setSaveFile(path);
         // this if just slips up execution but has nothing to do with the error
 
-        Path path(Path::resource);
-        path << zipData.m_fileName;
 
         if (path.isFile()) {
             qWarning() << "File exists:" << path.get();

src/Network.cpp

@@ -11,12 +11,13 @@
  * GNU General Public License for more details.
  */
 
-#include "../src/Network.hpp"
 #include <curl/curl.h>
 #include <cstdio>
 #include <iostream>
 #include <vector>
 #include <string>
+#include "../src/Network.hpp"
+#include "../src/Path.hpp"
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 
@@ -79,66 +80,52 @@ std::string get_ssl_certificate(const std::string& host) {
     return cert_buffer;
 }
 
-bool Downloader::setUpCamp(const QString& levelDir) {
-    bool status = false;
-    QFileInfo levelPathInfo(levelDir);
-    if (levelPathInfo.isDir() == true) {
-        m_levelDir.setPath(levelDir);
-        status = true;
-    }
-    return status;
-}
-
 void Downloader::setUrl(QUrl url) {
     m_url = url;
 }
 
-void Downloader::setSaveFile(const QString& file) {
-    m_file = file;
+void Downloader::setSaveFile(Path file) {
+    m_saveFile = file;
 }
 
 int Downloader::getStatus() {
     return m_status;
 }
 
 void Downloader::run() {
-    if (m_url.isEmpty() || m_file.isEmpty() || m_levelDir.isEmpty()) {
+    if (m_url.isEmpty() || m_saveFile.getRoot() != Path::resource) {
         m_status = 3;  // object error
     } else {
+        m_status = 0;
         qDebug() << "m_url: " << m_url.toString();
-        qDebug() << "m_file: " << m_file;
-        qDebug() << "m_levelDir: " << m_levelDir.absolutePath();
-
-        QString urlString = m_url.toString();
-        QByteArray byteArray = urlString.toUtf8();
-        const char* url_cstring = byteArray.constData();
-
-        const QString filePath = QString("%1%2%3")
-            .arg(m_levelDir.absolutePath(), QDir::separator(), m_file);
-
-        qDebug() << "filePath: " << filePath;
-
-        QFileInfo fileInfo(filePath);
-
-        if (fileInfo.exists() && !fileInfo.isFile()) {
-            qDebug() << "Error: The zip path is not a regular file :"
-                << filePath;
+        qDebug() << "m_filePath: " << m_saveFile.get();
+
+        if (m_saveFile.isSymLink()) {
+            m_status = 5;  // symlink error
+        } else if (m_saveFile.exists() && !m_saveFile.isFile()) {
+            qDebug()
+                    << "Error: The zip path is not a regular file :"
+                                                            << m_saveFile.get();
             m_status = 2;  // file error
+
         } else {
-            QFile file(filePath);
+            QFile file(m_saveFile.get());
             if (!file.open(QIODevice::WriteOnly)) {  // flawfinder: ignore
-                qDebug() << "Error opening file for writing:" << filePath;
-                m_status = 2;
+                qDebug()
+                        << "Error opening file for writing:"
+                                                            << m_saveFile.get();
+                m_status = 4;  // opening error
             } else {
-                connect(&file, url_cstring);
+                QByteArray byteArray = m_url.toString().toUtf8();
+                const char* url_cstring = byteArray.constData();
+                runConnect(&file, url_cstring);
+                file.close();
             }
-
-            file.close();
         }
     }
 }
 
-void Downloader::connect(QFile *file, const std::string& url) {
+void Downloader::runConnect(QFile *file, const std::string& url) {
     CURL* curl = curl_easy_init();
     if (!curl) {
         std::cerr << "Failed to initialize CURL\n";

src/Network.hpp

@@ -22,6 +22,7 @@
 #include <QDebug>
 #include <curl/curl.h>
 #include <string>
+#include "../src/Path.hpp"
 
 class Downloader : public QObject {
     Q_OBJECT
@@ -34,28 +35,25 @@ class Downloader : public QObject {
     }
 
     void run();
-    bool setUpCamp(const QString& levelDir);
     void setUrl(QUrl url);
     int getStatus();
-    void setSaveFile(const QString& file);
+    void setSaveFile(Path filePath);
 
  signals:
     void networkWorkTickSignal();
     void networkWorkErrorSignal(int status);
 
  private:
     void saveToFile(const QByteArray& data, const QString& filePath);
-    void connect(QFile *file, const std::string& url);
+    void runConnect(QFile *file, const std::string& url);
     QUrl m_url;
-    QString m_file;
-    QDir m_levelDir;
+    Path m_saveFile;
     qint32 m_status;
     int m_lastEmittedProgress;
 
     Downloader() :
         m_url(""),
-        m_file(""),
-        m_levelDir(""),
+        m_saveFile(Path(Path::resource)),
         m_status(0),
         m_lastEmittedProgress(0) {
         curl_global_init(CURL_GLOBAL_DEFAULT);

src/Path.cpp

@@ -13,7 +13,7 @@
 #include "../src/Path.hpp"
 #include "../src/settings.hpp"
 
-Path::Path(Root root) {
+Path::Path(Root root) : m_status(0), m_root(root) {
     if (root == programFiles) {
         m_path.setFile(m_programFilesPath.path());
     } else if (root == resource) {
@@ -112,3 +112,17 @@ bool Path::validateSymLink() {
 
     return status;
 }
+
+QString Path::getRootString() {
+    QString path;
+    if (m_root == programFiles) {
+        path = m_programFilesPath.path();
+    } else if (m_root == resource) {
+        path = m_resourcePath.path();
+    }
+    return path;
+}
+
+Path::Root Path::getRoot() {
+    return m_root;
+}

src/Path.hpp

@@ -53,6 +53,8 @@ class Path {
     static bool setResourcePath();
     QString get();
     QString getDir();
+    QString getRootString();
+    Path::Root getRoot();
     bool exists();
     bool isFile();
     bool isDir();
@@ -61,7 +63,8 @@ class Path {
 
     Path& operator<<(const QString& subdir) {
         if (subdir != "..") {
-            const QString s = QString("%1%2%3").arg(m_path.absoluteFilePath(), m_sep, subdir);
+            const QString s = QString("%1%2%3")
+                    .arg(m_path.absoluteFilePath(), m_sep, subdir);
             m_path.setFile(s);
         }
         return *this;
@@ -71,6 +74,9 @@ class Path {
     static bool inHome(QString absoluteFilePath);
     static bool validate(const QFileInfo& fileInfo);
 
+    qint64 m_status;
+    Root m_root;
+
     QFileInfo m_path;
     inline static QDir m_programFilesPath;
     inline static QDir m_resourcePath;