feat(cpu): cpu name changes (#219)

Signed-off-by: Alan Grosz <lalogrosz@gmail.com>
glpi-project · Jun 20, 2019 · 7f996ca · 7f996ca
1 parent c8376ed
commit 7f996ca
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -45,11 +45,17 @@ reference:
       name: Validate running
       command: source ci/scripts/validate_running.sh
 
+  update_licenses: &update_licenses
+    run:
+      name: Update licenses
+      command: source ci/scripts/ci_licenses.sh
+
 jobs:
   build:
     <<: *android_config
     steps:
       - checkout
+      - *update_licenses
       - restore_cache:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "example_java/build.gradle" }}
       - run:
@@ -65,6 +71,7 @@ jobs:
     <<: *android_config
     steps:
       - checkout
+      - *update_licenses
       - *validate_running
       - *restore_gradle_cache
       - *ruby_dependencies
@@ -81,6 +88,7 @@ jobs:
     <<: *android_config
     steps:
       - checkout
+      - *update_licenses
       - *restore_gradle_cache
       - run:
           name: Setup environment
@@ -97,6 +105,7 @@ jobs:
     <<: *android_config
     steps:
       - checkout
+      - *update_licenses
       - *restore_gradle_cache
       - run:
           name: Setup environment

diff --git a/ci/scripts/ci_licenses.sh b/ci/scripts/ci_licenses.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+#  LICENSE
+#
+#  This file is part of Flyve MDM Inventory Library for Android.
+#
+#  Inventory Library for Android is a subproject of Flyve MDM.
+#  Flyve MDM is a mobile device management software.
+#
+#  Flyve MDM is free software: you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 3
+#  of the License, or (at your option) any later version.
+#
+#  Flyve MDM is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  ---------------------------------------------------------------------
+#  @copyright Copyright © 2018 Teclib. All rights reserved.
+#  @license   GPLv3 https://www.gnu.org/licenses/gpl-3.0.html
+#  @link      https://github.com/flyve-mdm/android-inventory-library/
+#  @link      http://flyve.org/android-inventory-library/
+#  @link      https://flyve-mdm.com/
+#  ---------------------------------------------------------------------
+#
+
+ # Manage sdk licenses
+yes | sdkmanager --licenses || if [ $? -ne '141' ]; then exit $?; fi;
diff --git a/inventory/src/main/java/org/flyve/inventory/Utils.java b/inventory/src/main/java/org/flyve/inventory/Utils.java
@@ -334,6 +334,15 @@ public static String getValueMapInfo(Map<String, String> mapInfo, String name) {
         return "";
     }
 
+    public static String getValueMapCase(Map<String, String> mapInfo, String name) {
+        for (String s : mapInfo.keySet()) {
+            if (s.equals(name)) {
+                return mapInfo.get(s);
+            }
+        }
+        return "";
+    }
+
     public static String getCatInfoMultiple(String path) {
         StringBuilder concatInfo = new StringBuilder();
         try {

diff --git a/inventory/src/main/java/org/flyve/inventory/categories/Cpus.java b/inventory/src/main/java/org/flyve/inventory/categories/Cpus.java
@@ -230,30 +230,22 @@ public String getModel() {
      */
 
     public String getCpuName() {
-        String cpuName = "N/A";
+        String value = "N/A";
         try {
-            FileReader fr = null;
-            BufferedReader br = null;
-            try {
-                File f = new File(CPUINFO);
-                fr = new FileReader(f);
-                br = new BufferedReader(fr, 8 * 1024);
-                String info = br.readLine();
-                cpuName = info.replaceAll("(.*):\\ (.*)", "$2");
-            } catch (IOException e) {
-                FlyveLog.e(e.getMessage());
-            } finally {
-                if (fr != null) {
-                    fr.close();
-                }
-                if (br != null) {
-                    br.close();
+            Map<String, String> cpuInfo = Utils.getCatMapInfo("/proc/cpuinfo");
+            String cpuName = Utils.getValueMapCase(cpuInfo, "Processor").trim();
+            if (!"".equals(cpuName)){
+                value = cpuName;
+            } else {
+                cpuName = Utils.getValueMapCase(cpuInfo, "model name").trim();
+                if (!"".equals(cpuName)){
+                    value = cpuName;
                 }
             }
         } catch (Exception ex) {
             FlyveLog.e(FlyveLog.getMessage(context, CommonErrorType.CPU_NAME, ex.getMessage()));
         }
-        return cpuName;
+        return value;
     }
 
     /**