Merge pull request #4 from saukko/key-value

Make it possible to query any key value pair from device data section.
sailfishos · Mar 19, 2013 · 1b138e8 · 1b138e8
2 parents 48836ac + dca2aa2
commit 1b138e8
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp
@@ -180,11 +180,20 @@ QString Ssu::repoUrl(QString repoName, bool rndRepo, QHash<QString, QString> rep
 
   if (!repoParameters.contains("arch"))
     repoParameters.insert("arch", settings->value("arch").toString());
-
+  
   repoParameters.insert("adaptation", settings->value("adaptation").toString());
   repoParameters.insert("deviceFamily", deviceInfo.deviceFamily());
   repoParameters.insert("deviceModel", deviceInfo.deviceModel());
 
+  QStringList keys;
+  keys << "chip" << "adaptation" << "vendor";
+
+  foreach(QString key, keys){
+    QString value;
+    if (deviceInfo.getValue(key,value))
+      repoParameters.insert(key, value);
+  }
+
   // Domain variables
   // first read all variables from default-domain
   var.resolveSection(repoSettings, "default-domain", &repoParameters);

diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp
@@ -27,15 +27,30 @@ QString SsuDeviceInfo::deviceFamily(){
 
   cachedFamily = "UNKNOWN";
 
-  if (boardMappings->contains("variants/" + model))
+  if (boardMappings->contains("variants/" + model)) {
     model = boardMappings->value("variants/" + model).toString();
+    cachedVariant = model;
+  }
 
   if (boardMappings->contains(model + "/family"))
     cachedFamily = boardMappings->value(model + "/family").toString();
 
   return cachedFamily;
 }
 
+QString SsuDeviceInfo::deviceVariant(){
+  if (!cachedVariant.isEmpty())
+    return cachedVariant;
+
+  cachedVariant = "";
+
+  if (boardMappings->contains("variants/" + deviceModel())) {
+    cachedVariant = boardMappings->value("variants/" + deviceModel()).toString();
+  }
+
+  return cachedVariant;
+}
+
 QString SsuDeviceInfo::deviceModel(){
   QDir dir;
   QFile procCpuinfo;
@@ -126,3 +141,15 @@ QString SsuDeviceInfo::deviceUid(){
 
   return IMEI;
 }
+
+bool SsuDeviceInfo::getValue(const QString& key, QString& value){
+  if (boardMappings->contains(deviceVariant()+"/"+key)){
+    value = boardMappings->value(deviceVariant()+"/"+key).toString();
+    return true;
+  }
+  else if (boardMappings->contains(deviceModel()+"/"+key)){
+    value = boardMappings->value(deviceModel()+"/"+key).toString();
+    return true;
+  }
+  return false;
+}
diff --git a/libssu/ssudeviceinfo.h b/libssu/ssudeviceinfo.h
@@ -20,6 +20,10 @@ class SsuDeviceInfo: public QObject {
      * Try to find the device family for the system this is running on
      */
     Q_INVOKABLE QString deviceFamily();
+    /**
+     * Try to find the device variant for the system this is running on.
+     */
+    Q_INVOKABLE QString deviceVariant();
     /**
      * Try to find out ond what kind of system this is running
      */
@@ -30,8 +34,10 @@ class SsuDeviceInfo: public QObject {
      */
     Q_INVOKABLE QString deviceUid();
 
+    bool getValue(const QString& key, QString& value);
+
   private:
     QSettings *boardMappings;
-    QString cachedFamily, cachedModel;
+    QString cachedFamily, cachedModel, cachedVariant;
 };
 #endif