rbutil: allow checking bootloader installer capabilities

Instead of checking for certain hardcoded strings, fetch
the actual capability bitmask by instantiating an installer
and querying it.

Change-Id: I7883d9c1e90da37ee7c0189732ac626685adbfa1

5 files changed, 34 insertions, 10 deletions

diff --git a/utils/rbutilqt/base/bootloaderinstallbase.h b/utils/rbutilqt/base/bootloaderinstallbase.h
index 9a216a632c..0d9423a06f 100644
--- a/utils/rbutilqt/base/bootloaderinstallbase.h
+++ b/utils/rbutilqt/base/bootloaderinstallbase.h
@@ -67,8 +67,6 @@ class BootloaderInstallBase : public QObject
         //  be modified for new targets
         static QString postinstallHints(QString model);
 
-        //! returns the correct BootloaderInstaller object for the requested type
-        static BootloaderInstallBase* createBootloaderInstaller(QObject* parent,QString type);
     protected slots:
         void downloadReqFinished(int id, bool error);
         void downloadBlFinish(bool error);
diff --git a/utils/rbutilqt/base/bootloaderinstallhelper.cpp b/utils/rbutilqt/base/bootloaderinstallhelper.cpp
index c94ed29140..4a1b24883b 100644
--- a/utils/rbutilqt/base/bootloaderinstallhelper.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallhelper.cpp
@@ -77,6 +77,26 @@ BootloaderInstallBase* BootloaderInstallHelper::createBootloaderInstaller(QObjec
     }
 }
 
+BootloaderInstallBase::Capabilities
+    BootloaderInstallHelper::bootloaderInstallerCapabilities(QObject *parent, QString type)
+{
+    /* Note - this is a terrible pattern in general, but in this case
+     * it is a much simpler option to just allocate a class instance.
+     * This operation is rarely used, anyway. */
+
+    BootloaderInstallBase* bootloaderInstaller =
+        createBootloaderInstaller(parent, type);
+
+    BootloaderInstallBase::Capabilities caps = BootloaderInstallBase::Capabilities();
+
+    if(bootloaderInstaller) {
+        caps = bootloaderInstaller->capabilities();
+        delete bootloaderInstaller;
+    }
+
+    return caps;
+}
+
 
 //! @brief Return post install hints string.
 //! @param model model string
diff --git a/utils/rbutilqt/base/bootloaderinstallhelper.h b/utils/rbutilqt/base/bootloaderinstallhelper.h
index c89444d7a7..9b6fed0866 100644
--- a/utils/rbutilqt/base/bootloaderinstallhelper.h
+++ b/utils/rbutilqt/base/bootloaderinstallhelper.h
@@ -29,6 +29,7 @@ class BootloaderInstallHelper : public QObject
     Q_OBJECT
     public:
         static BootloaderInstallBase* createBootloaderInstaller(QObject* parent, QString type);
+        static BootloaderInstallBase::Capabilities bootloaderInstallerCapabilities(QObject *parent, QString type);
         static QString postinstallHints(QString model);
 };
 
diff --git a/utils/rbutilqt/base/bootloaderinstallipod.cpp b/utils/rbutilqt/base/bootloaderinstallipod.cpp
index f94813f99f..d08cc22339 100644
--- a/utils/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallipod.cpp
@@ -28,10 +28,6 @@
 BootloaderInstallIpod::BootloaderInstallIpod(QObject *parent)
         : BootloaderInstallBase(parent)
 {
-    (void)parent;
-    // initialize sector buffer. The sector buffer is part of the ipod_t
-    // structure, so a second instance of this class will have its own buffer.
-    ipod_alloc_buffer(&ipod, BUFFER_SIZE);
 }
 
 
@@ -45,11 +41,18 @@ BootloaderInstallIpod::~BootloaderInstallIpod()
 
 bool BootloaderInstallIpod::install(void)
 {
+    // initialize sector buffer. The sector buffer is part of the ipod_t
+    // structure, so a second instance of this class will have its own buffer.
+    if(ipod.sectorbuf == nullptr) {
+        ipod_alloc_buffer(&ipod, BUFFER_SIZE);
+    }
+
     if(ipod.sectorbuf == nullptr) {
         emit logItem(tr("Error: can't allocate buffer memory!"), LOGERROR);
         emit done(true);
         return false;
     }
+
     // save buffer pointer before cleaning up ipod_t structure
     unsigned char* sb = ipod.sectorbuf;
     memset(&ipod, 0, sizeof(struct ipod_t));
diff --git a/utils/rbutilqt/base/bootloaderinstallsansa.cpp b/utils/rbutilqt/base/bootloaderinstallsansa.cpp
index d4a2799f73..568bb82afa 100644
--- a/utils/rbutilqt/base/bootloaderinstallsansa.cpp
+++ b/utils/rbutilqt/base/bootloaderinstallsansa.cpp
@@ -27,10 +27,6 @@
 BootloaderInstallSansa::BootloaderInstallSansa(QObject *parent)
         : BootloaderInstallBase(parent)
 {
-    (void)parent;
-    // initialize sector buffer. The sector buffer is part of the sansa_t
-    // structure, so a second instance of this class will have its own buffer.
-    sansa_alloc_buffer(&sansa, BUFFER_SIZE);
 }
 
 
@@ -46,6 +42,12 @@ BootloaderInstallSansa::~BootloaderInstallSansa()
  */
 bool BootloaderInstallSansa::install(void)
 {
+    // initialize sector buffer. The sector buffer is part of the sansa_t
+    // structure, so a second instance of this class will have its own buffer.
+    if(sansa.sectorbuf == nullptr) {
+        sansa_alloc_buffer(&sansa, BUFFER_SIZE);
+    }
+
     if(sansa.sectorbuf == nullptr) {
         emit logItem(tr("Error: can't allocate buffer memory!"), LOGERROR);
         return false;