完善下载页面按钮的功能

gui/page/spkpageappdetails.cpp

@@ -163,8 +163,8 @@ namespace SpkUi
     mBtnDownload = new QPushButton;
     mBtnDownload->setText(tr("Download"));
 
-    mBtnInstall = new QPushButton;
-    mBtnInstall->setText(tr("Install"));
+//    mBtnInstall = new QPushButton;
+//    mBtnInstall->setText(tr("Install"));
 
     mBtnUninstall = new QPushButton;
     mBtnUninstall->setText(tr("Uninstall"));
@@ -177,7 +177,7 @@ namespace SpkUi
 
     mBottomBarLay->addStretch();
     mBottomBarLay->addWidget(mBtnDownload);
-    mBottomBarLay->addWidget(mBtnInstall);
+//    mBottomBarLay->addWidget(mBtnInstall);
     mBottomBarLay->addWidget(mBtnUninstall);
     mBottomBarLay->addWidget(mBtnRequestUpdate);
     mBottomBarLay->addWidget(mBtnReport);

gui/page/spkpagedownloads.cpp

@@ -1,6 +1,8 @@
 
 
 #include "page/spkpagedownloads.h"
+#include "pkgs/spkpkgmgrbase.h"
+#include "spkuimsg.h"
 #include "spkutils.h"
 
 SpkUi::SpkPageDownloads::SpkPageDownloads(QWidget *parent) :
@@ -27,6 +29,8 @@ SpkUi::SpkPageDownloads::SpkPageDownloads(QWidget *parent) :
 
   connect(mDownloadMgr, &SpkDownloadMgr::DownloadStopped,
           this, &SpkPageDownloads::DownloadStopped, Qt::QueuedConnection);
+  connect(PKG, &SpkPkgMgrBase::ReportInstallResult,
+          this, &SpkPageDownloads::InstallationEnded);
 }
 
 SpkUi::SpkPageDownloads::~SpkPageDownloads()
@@ -53,31 +57,24 @@ void SpkUi::SpkPageDownloads::AddDownloadTask(QString name, QString pkgName, QSt
   // Add a new download entry into the UI
   auto entry = new SpkDownloadEntry;
   auto iconData = RES->CacheLookup(pkgName, SpkResource::ResourceType::AppIcon, 0);
+  auto id = mNextDownloadId;
   QPixmap icon;
   if(iconData.status != SpkResource::ResourceStatus::Ready || !icon.loadFromData(iconData.data))
     icon.load(":/icons/broken-icon.svg");
-  entry->SetBasicInfo(name, icon);
+  entry->SetBasicInfo(name, icon, mDownloadMgr->GetDestFilePath(path));
   entry->SetStatus(SpkDownloadEntry::Waiting);
-  auto id = mNextDownloadId;
+  entry->setProperty("entryId", id);
+  entry->setProperty("path", path);
 
   mNextDownloadId++;
 
   mEntries[id] = entry;
   mLayEntries->addWidget(entry);
 
-  if(mCurrentStatus != Idle)
-    mWaitingDownloads.enqueue({ id, path }); // Queue download task for future
-  else
-  {
-    mCurrentStatus = Waiting;
-    if(!mDownloadMgr->StartNewDownload(path, id)) // Initiate a download task when idle
-    {
-      // If fails to start then try next one. Emitting this signal causes
-      // SpkPageDownloads::DownloadStopped to be activated and thus tries next item in queue
-      emit mDownloadMgr->DownloadStopped(SpkDownloadMgr::FailNoVaibleServer, id);
-    }
-  }
+  connect(entry, &SpkDownloadEntry::Action,
+          this, &SpkPageDownloads::EntryAction);
 
+  NewDownloadTask(id, path);
 }
 
 void SpkUi::SpkPageDownloads::DownloadStopped(SpkDownloadMgr::TaskResult status, int id)
@@ -89,21 +86,34 @@ void SpkUi::SpkPageDownloads::DownloadStopped(SpkDownloadMgr::TaskResult status,
       break;
 
     case SpkDownloadMgr::FailCannotCreateFile:
-      mEntries[id]->SetStatus(SpkDownloadEntry::Failed,
+      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
                               tr("Cannot create download file. Download failed."));
       break;
 
     case SpkDownloadMgr::FailNoVaibleServer:
-      mEntries[id]->SetStatus(SpkDownloadEntry::Failed,
+      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
                               tr("Connection unstable or server failure. Download failed."));
       break;
 
+    case SpkDownloadMgr::FailCancel:
+      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
+                              tr("This download was cancelled."));
+      break;
+
     case SpkDownloadMgr::Fail:
-      mEntries[id]->SetStatus(SpkDownloadEntry::Failed,
+      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
                               tr("Unknown error. Download failed."));
       break;
   }
 
+  if(status == SpkDownloadMgr::Success)
+    SpkUiMessage::SendDesktopNotification(
+          tr("App \"%1\" downloaded, and ready to install.").arg(mEntries[id]->GetTaskName()));
+  else if(status != SpkDownloadMgr::FailCancel)
+    SpkUiMessage::SendDesktopNotification(
+          tr("Error occurred downloading \"%1\".").arg(mEntries[id]->GetTaskName()));
+
+
   // Continue next download task
   if(!mWaitingDownloads.isEmpty())
   {
@@ -116,3 +126,85 @@ void SpkUi::SpkPageDownloads::DownloadStopped(SpkDownloadMgr::TaskResult status,
     mCurrentStatus = Idle;
   }
 }
+
+void SpkUi::SpkPageDownloads::EntryAction(SpkDownloadEntry::EntryAction act)
+{
+  SpkDownloadEntry *entry = static_cast<SpkDownloadEntry*>(sender());
+  auto id = entry->property("entryId").toInt();
+  switch(act)
+  {
+    case SpkDownloadEntry::AbortDownload:
+      mDownloadMgr->CancelCurrentDownload(); // Only one task at a time so simply abort download
+      break;
+
+    case SpkDownloadEntry::RetryDownload:
+      mLayEntries->removeWidget(entry); // Move to list tail
+      mLayEntries->addWidget(entry);
+      NewDownloadTask(id, entry->property("path").toString());
+      entry->SetStatus(SpkDownloadEntry::Waiting);
+      break;
+
+    case SpkDownloadEntry::StartInstall:
+      switch(PKG->ExecuteInstallation(entry->GetFilePath(), id))
+      {
+        case SpkPkgMgrBase::Succeeded:
+          entry->SetStatus(SpkDownloadEntry::Installing);
+          break;
+
+        case SpkPkgMgrBase::Failed:
+          entry->SetStatus(SpkDownloadEntry::InstallFailed,
+                           tr("Failed to start installation."));
+          break;
+
+        default: break;
+      }
+
+      break;
+
+    case SpkDownloadEntry::RemoveEntry:
+      mLayEntries->removeWidget(entry);
+      mEntries.remove(id);
+      for(auto i = mWaitingDownloads.begin(); i != mWaitingDownloads.end(); i++)
+      {
+        if(i->first == id)
+        {
+          mWaitingDownloads.erase(i);
+          break;
+        }
+      }
+      entry->setVisible(false);
+      entry->deleteLater();
+      break;
+  }
+}
+
+void SpkUi::SpkPageDownloads::InstallationEnded(int id,
+                                                SpkPkgMgrBase::PkgInstallResult result,
+                                                int exitCode)
+{
+  if(result == SpkPkgMgrBase::Succeeded)
+  {
+    mEntries[id]->SetStatus(SpkDownloadEntry::Installed);
+  }
+  else
+  {
+    mEntries[id]->SetStatus(SpkDownloadEntry::InstallFailed,
+                            tr("Install failed, exit code: %1.").arg(exitCode));
+  }
+}
+
+void SpkUi::SpkPageDownloads::NewDownloadTask(int id, QString downloadPath)
+{
+  if(mCurrentStatus != Idle)
+    mWaitingDownloads.enqueue({ id, downloadPath }); // Queue download task for future
+  else
+  {
+    mCurrentStatus = Waiting;
+    if(!mDownloadMgr->StartNewDownload(downloadPath, id)) // Initiate a download task when idle
+    {
+      // If fails to start then try next one. Emitting this signal causes
+      // SpkPageDownloads::DownloadStopped to be activated and thus tries next item in queue
+      emit mDownloadMgr->DownloadStopped(SpkDownloadMgr::FailNoVaibleServer, id);
+    }
+  }
+}