added downloading progressbar

Author: MCredbear

MCinaBox_Qt.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 5.0.2, 2021-11-06T10:32:45. -->
+<!-- Written by QtCreator 5.0.2, 2021-11-07T23:27:27. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

checker.cpp

@@ -13,13 +13,18 @@
 
 checker::checker(QObject *parent){}
 
+int checker::to_pthread(){return pthread;}
+void checker::set_pthread(int i){pthread=i;}
+int checker::to_total(){return link_list.count();}
+int checker::to_downloaded(){return downloading-pthread;}
+
 void checker::run(){
     QEventLoop eventloop;
     check_game();
     check_library();
     check_asset();
     if (link_list.count() > 0){
-        downloaded = 0;
+        finished_pthread = 0;
         new_game_downloader new_game_downloader[pthread];
         for (downloading = 0; downloading < pthread; downloading++){
             new_game_downloader[downloading].index = downloading;
@@ -28,18 +33,33 @@ void checker::run(){
             new_game_downloader[downloading].path_list = &path_list;
             new_game_downloader[downloading].sha1_list = &sha1_list;
         }
+        downloading-=1;
+        emit fresh_downloaded();
+        for (int i=0; i < pthread; i++){
+            connect(&new_game_downloader[i],SIGNAL(finished()),this,SLOT(pthread_finished()));
+        }
+        for (int i=0; i < pthread; i++){
+            connect(&new_game_downloader[i],SIGNAL(completed_one()),this,SLOT(pthread_Completed_one()));
+        }
+        connect(this,SIGNAL(download_Completed()),&eventloop,SLOT(quit()));
         for (int i = 0; i < pthread; i++){
             new_game_downloader[i].start();
         }
-        connect(new_game_downloader,SIGNAL(finished()),this,SLOT(pthread_Completed()));
-        connect(this,SIGNAL(download_Completed()),&eventloop,SLOT(quit()));
         eventloop.exec();
+        link_list.clear();
+        path_list.clear();
+        sha1_list.clear();
     }
 }
 
-void checker::pthread_Completed(){
-    downloaded++;
-    if (downloaded == link_list.count()) emit download_Completed();
+void checker::pthread_Completed_one(){
+    qDebug()<<downloading<<"/"<<link_list.count();
+    emit fresh_downloaded();
+}
+
+void checker::pthread_finished(){
+    finished_pthread++;
+    if (finished_pthread == pthread) emit download_Completed();
 }
 
 void checker::check_game(){

checker.h

@@ -16,14 +16,22 @@ class checker : public QThread
     void check_library();
     void check_asset();
     QStringList link_list,path_list,sha1_list;
-    int downloaded;
+    Q_INVOKABLE int to_total();
     int downloading;
-    int pthread = 1;
+    Q_INVOKABLE int to_downloaded();
+    Q_PROPERTY(int pthread READ to_pthread WRITE set_pthread NOTIFY pthread_Changed)
+    int pthread = 30;
+    int to_pthread();
+    int finished_pthread;
+    void set_pthread(int i);
 public slots:
-    void pthread_Completed();
-
+    void pthread_Completed_one();
+    void pthread_finished();
 signals:
+    void fresh_downloaded();
     void download_Completed();
+
+    void pthread_Changed();
 };
 
 #endif // CHECKER_H

downloader.cpp

@@ -37,7 +37,8 @@ void new_game_downloader::run(){
                 file.write(buff);
                 file.close();
                 *downloading+=1;
-                index = *downloading; qDebug()<<index<<"/"<<link_list->count();
+                index = *downloading;
+                emit completed_one();
             }
             else{
                 qDebug()<<"hash error";

downloader.h

@@ -19,7 +19,7 @@ class new_game_downloader : public QThread
 public slots:
 
 signals:
-
+    void completed_one();
 };
 
 #endif // DOWNLOADER_H

downloader_icon.svg

@@ -96,8 +96,7 @@ void install_new_game::new_game_json_http_get_Completed(QNetworkReply* reply){
     game_json.open(QIODevice::WriteOnly);
     game_json.write(reply->readAll());
     game_json.close();
-    checker checker;
-    checker.game_name = new_game_name;
-    checker.run();
+    checker_p->game_name = new_game_name;
+    checker_p->run();
     game_version_manager_p->fresh_game_version_list();
 }

game_version_manager.cpp

@@ -29,8 +29,9 @@ class game_version_manager : public QThread
     void run();
     Q_INVOKABLE QString get_game_version_string(int i);
     Q_INVOKABLE int count_game_version_list();
+    Q_INVOKABLE void fresh_game_version_list();
 public slots:
-    void fresh_game_version_list();
+
 signals:
     void game_version_list_Changed();
 
@@ -56,6 +57,7 @@ class install_new_game : public QObject
     Q_INVOKABLE void get_new_game_list();
     Q_INVOKABLE void get_new_game_json();
     game_version_manager *game_version_manager_p;
+    checker *checker_p;
 public slots:
     void new_game_list_http_get_Completed(QNetworkReply* reply);
     void new_game_json_http_get_Completed(QNetworkReply* reply);

game_version_manager.h

@@ -59,9 +59,10 @@ int main(int argc, char *argv[])
     checker checker;
     //load game version list
     game_version_manager game_version_manager;
-    game_version_manager.start();
+    //game_version_manager.start();
     //get new game list
     install_new_game install_new_game;
+    install_new_game.checker_p = &checker;
     install_new_game.game_version_manager_p = &game_version_manager;
     QGuiApplication app(argc, argv);
 
@@ -78,6 +79,7 @@ int main(int argc, char *argv[])
     QQmlApplicationEngine engine;
 
     engine.rootContext()->setContextProperty("game_version_manager",&game_version_manager);
+    engine.rootContext()->setContextProperty("checker",&checker);
     engine.rootContext()->setContextProperty("user_manager",&user_manager);
     engine.rootContext()->setContextProperty("install_new_game",&install_new_game);