New upstream version 2.0.9.17

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4047f77cf2dc6725fb9a3d630c54da82e7355254..410ea446493039835f69cab96c804db376b9b426 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="2.0.9.17"></a>
+## 2.0.9.17 (2019-02-26)
+
+
+
+
+<a name="2.0.9.16"></a>
+## 2.0.9.16 (2019-02-26)
+
+
+#### Bug Fixes
+
+*   deepin-os-release support cpu model and other info query ([cbeb47c9](https://github.com/linuxdeepin/dtkcore/commit/cbeb47c97e31d2b5dd3c198c60ee74332fecb293))
+
+
+
 <a name="2.0.9.15"></a>
 ## 2.0.9.15 (2019-01-25)
 

diff --git a/tools/deepin-os-release/main.cpp b/tools/deepin-os-release/main.cpp
index 387cf8d0af3172660b4c1001caa9b1c08b044494..779b9b0af035b84409fbe95628992dc1bfca5281 100644 (file)
--- a/tools/deepin-os-release/main.cpp
+++ b/tools/deepin-os-release/main.cpp
@@ -35,21 +35,21 @@ int main(int argc, char *argv[])
     Q_UNUSED(app)
 
     QCommandLineParser parser;
-    QCommandLineOption option_all("all");
-    QCommandLineOption option_deepin_type("deepin-type");
-    QCommandLineOption option_deepin_version("deepin-version");
-    QCommandLineOption option_deepin_edition("deepin-edition");
-    QCommandLineOption option_deepin_copyright("deepin-copyright");
-    QCommandLineOption option_product_type("product-type");
-    QCommandLineOption option_product_version("product-version");
-    QCommandLineOption option_computer_name("computer-name");
-    QCommandLineOption option_cpu_model("cpu-model");
-    QCommandLineOption optioin_memory_size("memory-size");
-    QCommandLineOption optioin_disk_size("disk-size");
+    QCommandLineOption option_all("all", "Print All Informations");
+    QCommandLineOption option_deepin_type("deepin-type", " ");
+    QCommandLineOption option_deepin_version("deepin-version", " ");
+    QCommandLineOption option_deepin_edition("deepin-edition", " ");
+    QCommandLineOption option_deepin_copyright("deepin-copyright", " ");
+    QCommandLineOption option_product_type("product-type", " ");
+    QCommandLineOption option_product_version("product-version", " ");
+    QCommandLineOption option_computer_name("computer-name", "Computer Name");
+    QCommandLineOption option_cpu_model("cpu-model", "CPU Model");
+    QCommandLineOption option_memory_size("memory-size", "Memory Size (GiB)");
+    QCommandLineOption option_disk_size("disk-size", "Disk Size (GiB)");
 
     parser.addOptions({option_all, option_deepin_type, option_deepin_version, option_deepin_edition,
                        option_deepin_copyright, option_product_type, option_product_version,
-                       option_computer_name, option_cpu_model, optioin_memory_size, optioin_disk_size});
+                       option_computer_name, option_cpu_model, option_memory_size, option_disk_size});
     parser.addHelpOption();
     parser.addVersionOption();
     parser.process(app);
@@ -87,6 +87,14 @@ int main(int argc, char *argv[])
             printf("%s", qPrintable(DSysInfo::productTypeString()));
         else if (parser.isSet(option_product_version))
             printf("%s", qPrintable(DSysInfo::productVersion()));
+        else if (parser.isSet(option_cpu_model))
+            printf("%s x %d", qPrintable(DSysInfo::cpuModelName()), QThread::idealThreadCount());
+        else if (parser.isSet(option_computer_name))
+            printf("%s", qPrintable(DSysInfo::computerName()));
+        else if (parser.isSet(option_memory_size))
+            printf("%f", DSysInfo::memoryTotalSize() / 1024.0 / 1024 / 1024);
+        else if (parser.isSet(option_disk_size))
+            printf("%f", DSysInfo::systemDiskSize() / 1024.0 / 1024 / 1024);
     }
 
     return 0;