From 0edb1e49fcc6e994f69dbbacc854ffeef1d77455 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Wed, 10 Apr 2013 21:33:39 +0300
Subject: [PATCH] Add model option to ssu, add -s (short) output for scripts to
 some options

---
 rndssucli/rndssucli.cpp | 32 +++++++++++++++++++++++++++++---
 rndssucli/rndssucli.h   |  1 +
 rpm/ssu.changes         |  3 +++
 rpm/ssu.spec            |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/rndssucli/rndssucli.cpp b/rndssucli/rndssucli.cpp
index 7d41626..56df18b 100644
--- a/rndssucli/rndssucli.cpp
+++ b/rndssucli/rndssucli.cpp
@@ -42,7 +42,10 @@ void RndSsuCli::handleResponse(){
 void RndSsuCli::optFlavour(QStringList opt){
   QTextStream qout(stdout);
 
-  if (opt.count() == 3){
+  if (opt.count() == 3 && opt.at(2) == "-s"){
+    qout << ssu.flavour();
+    state = Idle;
+  } else if (opt.count() == 3){
     qout << "Changing flavour from " << ssu.flavour()
          << " to " << opt.at(2) << endl;
     ssu.setFlavour(opt.at(2));
@@ -83,6 +86,9 @@ void RndSsuCli::optMode(QStringList opt){
         (deviceMode & Ssu::ReleaseMode) == Ssu::ReleaseMode)
       qout << "Both Release and RnD mode set, device is in RnD mode" << endl;
 
+    state = Idle;
+  } else if (opt.count() == 3 && opt.at(2) == "-s"){
+    qout << ssu.deviceMode();
     state = Idle;
   } else if (opt.count() == 3){
     qout << "Setting device mode from " << ssu.deviceMode()
@@ -97,6 +103,19 @@ void RndSsuCli::optMode(QStringList opt){
   }
 }
 
+void RndSsuCli::optModel(QStringList opt){
+  QTextStream qout(stdout);
+  SsuDeviceInfo deviceInfo;
+
+  if (opt.count() == 3 && opt.at(2) == "-s"){
+    qout << deviceInfo.deviceModel();
+    state = Idle;
+  } else if (opt.count() == 2){
+    qout << "Device model is: " << deviceInfo.deviceModel() << endl;
+    state = Idle;
+  }
+}
+
 void RndSsuCli::optModifyRepo(int action, QStringList opt){
   SsuRepoManager repoManager;
   QTextStream qout(stdout);
@@ -375,10 +394,14 @@ void RndSsuCli::optStatus(){
    */
   qout << "Device registration status: "
        << (ssu.isRegistered() ? "registered" : "not registered") << endl;
-  qout << "Device family: " << deviceInfo.deviceFamily() << endl;
   qout << "Device model: " << deviceInfo.deviceModel() << endl;
-  qout << "Device variant: " << deviceInfo.deviceVariant() << endl;
+  if (deviceInfo.deviceVariant() != "")
+    qout << "Device variant: " << deviceInfo.deviceVariant() << endl;
   qout << "Device UID: " << deviceInfo.deviceUid() << endl;
+  if ((ssu.deviceMode() & Ssu::RndMode) == Ssu::RndMode)
+    qout << "Release (rnd): " << ssu.release(true) << " (" << ssu.flavour() << ")" << endl;
+  else
+    qout << "Release: " << ssu.release() << endl;
 }
 
 void RndSsuCli::optUpdateCredentials(QStringList opt){
@@ -456,6 +479,8 @@ void RndSsuCli::run(){
     optFlavour(arguments);
   else if (arguments.at(1) == "mode" || arguments.at(1) == "m")
     optMode(arguments);
+  else if (arguments.at(1) == "model" || arguments.at(1) == "mo")
+    optModel(arguments);
   else if (arguments.at(1) == "release" || arguments.at(1) == "re")
     optRelease(arguments);
   else if (arguments.at(1) == "update" || arguments.at(1) == "up")
@@ -510,6 +535,7 @@ void RndSsuCli::usage(){
        << "\tregister, r   \tregister this device" << endl
        << "\tupdate, up    \tupdate repository credentials" << endl
        << "\t      [-f]    \tforce update" << endl
+       << "\tmodel, mo     \tprint name of device model (like N9)" << endl
        << endl;
   qout.flush();
   QCoreApplication::exit(1);
diff --git a/rndssucli/rndssucli.h b/rndssucli/rndssucli.h
index 15cbe16..61bb155 100644
--- a/rndssucli/rndssucli.h
+++ b/rndssucli/rndssucli.h
@@ -32,6 +32,7 @@ class RndSsuCli: public QObject {
     void uidWarning(QString message="");
     void optFlavour(QStringList opt);
     void optMode(QStringList opt);
+    void optModel(QStringList opt);
     void optModifyRepo(int action, QStringList opt);
     void optRegister();
     void optRelease(QStringList opt);
diff --git a/rpm/ssu.changes b/rpm/ssu.changes
index ffe6809..a74623b 100644
--- a/rpm/ssu.changes
+++ b/rpm/ssu.changes
@@ -1,3 +1,6 @@
+* Wed Apr 10 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.31.5
+- Add model option to ssu, add -s (short) output for scripts to some options
+
 * Wed Apr 10 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.31.4
 - Allow arbitrary argument order for ssu ar
 
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index 6f86f3e..be876f5 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -1,5 +1,5 @@
 Name: ssu
-Version: 0.31.4
+Version: 0.31.5
 Release: 1
 Summary: SSU enabler for RND
 Group: System/Base