- Updated getPackageSize code.

PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=octopi
-pkgver=0.10.0
+pkgver=0.11.0
 pkgrel=1
 pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs"
 url="https://tintaescura.com/projects/octopi/"

notifier/mainwindow.cpp

@@ -20,6 +20,7 @@
 
 #include "mainwindow.h"
 #include "outputdialog.h"
+//#include "../src/alpmbackend.h"
 #include "../src/strconstants.h"
 #include "../src/uihelper.h"
 #include "../src/package.h"
@@ -608,8 +609,23 @@ void MainWindow::doSystemUpgrade()
       }
     }
 
+    //double retSize;
+
     for(const auto &target : qAsConst(*targets))
     {
+/*
+#ifdef ALPM_BACKEND
+      if (target.downloadSize == 0)
+      {
+        retSize=AlpmBackend::getPackageSize(target.name);
+        totalDownloadSize += retSize;
+      }
+      else
+        totalDownloadSize += target.downloadSize;
+#else
+      totalDownloadSize += target.downloadSize;
+#endif
+*/
       totalDownloadSize += target.downloadSize;
       list = list + target.name + QLatin1Char('-') + target.version + QLatin1Char('\n');
     }

src/alpmbackend.cpp

@@ -288,13 +288,12 @@ QStringList AlpmBackend::getOutdatedList()
 /*
  * Retrieves package download size
  */
-QString AlpmBackend::getPackageSize(const QString &pkgName)
+double AlpmBackend::getPackageSize(const QString &pkgName)
 {
   // create AlpmUtils instance
   AlpmUtils* alpm_utils = alpm_utils_new ("/etc/pacman.conf");
-
   alpm_list_t* i;
-  char size[20];
+  off_t pkgSize=0;
 
   std::string str = pkgName.toStdString();
   const char* p = str.c_str();
@@ -311,8 +310,7 @@ QString AlpmBackend::getPackageSize(const QString &pkgName)
 
     if (pkg && strcmp(alpm_pkg_get_name(pkg),pkgName.toLatin1().constData())==0)
     {
-      off_t pkgSize = alpm_pkg_get_size(pkg);
-      std::sprintf(size, "%ld", pkgSize);
+      pkgSize = alpm_pkg_get_size(pkg);
       break;
     }
   }
@@ -321,7 +319,7 @@ QString AlpmBackend::getPackageSize(const QString &pkgName)
   alpm_utils_free (alpm_utils); // this will free all alpm_pkgs but not the alpm_list
   alpm_list_free (founds);
 
-  return QString::fromUtf8(size);
+  return pkgSize;
 }
 
 /*

src/alpmbackend.h

@@ -34,7 +34,7 @@ class AlpmBackend
   static QStringList getUnrequiredList();
   static QStringList getForeignList();
   static QStringList getOutdatedList();
-  static QString getPackageSize(const QString &pkgName);
+  static double getPackageSize(const QString &pkgName);
   //static PackageInfoData getPackageInfo(const QString &pkgName, bool isForeign);
 };