fix download file bug

Author: wangzhiyuan1

clipboard/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 project(clipboard VERSION 0.1 LANGUAGES CXX)
 
-set(CMAKE_OSX_ARCHITECTURES "x86_64")
+#set(CMAKE_OSX_ARCHITECTURES "x86_64")
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 

clipboard/CMakeLists.txt.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 7.0.2, 2022-06-12T17:29:31. -->
+<!-- Written by QtCreator 7.0.2, 2022-06-12T21:20:32. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -92,7 +92,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">x86-darwin-generic-mach_o-64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">x86-darwin-generic-mach_o-64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{aa14ffd8-ab35-4922-a504-dc79e8941360}</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -306,7 +306,7 @@
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_64bit-Release/clipboard.app/Contents/MacOS</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_64bit-Debug/clipboard.app/Contents/MacOS</value>
    </valuemap>
    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

clipboard/downfilehelper.cpp

@@ -11,13 +11,20 @@ DownFileHelper::DownFileHelper(QApplication *app, QString url, QString fileName)
     this->fileName = fileName;
     this->url = url;
     this->downloadMgr = new QNetworkAccessManager(app);
+
+    const QString downloadsFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
+    auto downloadFileName = QString(downloadsFolder + QDir::separator() + this->fileName);
+    this->currentFile = new QFile(downloadFileName);
+    if(!currentFile->open(QIODevice::ReadWrite)){
+       return;
+    }
     this->downloadFile();
 }
 
 DownFileHelper::~DownFileHelper() {
-    delete &fileName;
-    delete &url;
     delete downloadMgr;
+    delete downloadReply;
+    delete currentFile;
 }
 
 void DownFileHelper::downloadFile() {
@@ -26,6 +33,7 @@ void DownFileHelper::downloadFile() {
     QNetworkReply *reply = downloadMgr->get(request);
     downloadReply = reply;
     QObject::connect(reply, SIGNAL(readyRead()), this, SLOT(readingReadyBytesToFile()));
+    QObject::connect(downloadMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(downloadFinish(QNetworkReply*)));
 }
 
 
@@ -34,15 +42,15 @@ void DownFileHelper::readingReadyBytesToFile() {
     if (!pReply) {
         return;
     }
+    currentFile->skip(currentFile->size());
+    currentFile->write(pReply->readAll());
+}
 
-    const QString downloadsFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
-    auto fileName = QString(downloadsFolder + QDir::separator() + this->fileName);
-    auto avatorFile = QFile(fileName);
-    if(!avatorFile.open(QIODevice::Append)){
-       return;
+void DownFileHelper::downloadFinish(QNetworkReply * reply) {
+    if (currentFile) {
+        currentFile->close();
     }
-    avatorFile.write(pReply->readAll());
-    avatorFile.close();
+    this->disconnect();
 }
 
 

clipboard/downfilehelper.h

@@ -4,6 +4,7 @@
 #include <QString>
 #include <QNetworkAccessManager>
 #include <QApplication>
+#include <QtCore>
 
 class DownFileHelper : public QObject
 {
@@ -14,10 +15,13 @@ class DownFileHelper : public QObject
     ~DownFileHelper();
 private slots:
     void readingReadyBytesToFile();
+    void downloadFinish(QNetworkReply *reply);
 private:
     QString url, fileName;
     QNetworkAccessManager *downloadMgr;
     QNetworkReply *downloadReply;
+    QFile *currentFile;
+
     void downloadFile();
 };
 

clipboard/mainwindow.cpp

@@ -91,7 +91,13 @@ void MainWindow::loginWeb()
     if (nullptr == serverUrlAndHost)
         return;
     serverPath = new QString(serverUrlAndHost);
-    auto url = QUrl("http://" + *serverPath);
+    QUrl url;
+    if (this->token) {
+       url = QUrl("http://" + *serverPath + "?token=" + *this->token);
+    } else {
+       url = QUrl("http://" + *serverPath);
+    }
+
     QNetworkRequest req;
     req.setUrl(url);
     req.setHeader(QNetworkRequest::UserAgentHeader, "Clipb0ard");

clipboard/mainwindow.ui

@@ -63,7 +63,6 @@
     </rect>
    </property>
   </widget>
-  <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <resources/>
  <connections/>