fix : uptime and idletime functions updated

Author: sepandhaghighi

orangetool/orangetool_system.py

@@ -85,24 +85,38 @@ def time_convert(input_string):
     return zero_insert(str(input_day)) + " days, " + zero_insert(str(input_hour)) + " hour, " + \
         zero_insert(str(input_minute)) + " minutes, " + zero_insert(str(input_sec)) + " seconds"
 
-
-def uptime(debug=False):
+def time_control(mode="uptime",debug=False):
     """
-    Return system uptime.
+    Return system time.
 
+    :param mode: time mode (uptime / idle)
+    :type mode: str
     :param debug: flag for using debug mode
     :type debug:bool
-    :return: system uptime as string
+    :return: system time as string
     """
+    index = 0
+    if mode  in ["idle","idletime"]:
+        index = 1
     try:
         command = open("/proc/uptime")
         response = command.read()
-        return time_convert(response[:-1].split(" ")[0])
+        return time_convert(response[:-1].split(" ")[index])
     except Exception as e:
         if debug:
             print(str(e))
         return GENERAL_ERROR_MESSAGE
 
+def uptime(debug=False):
+    """
+    Return system uptime.
+
+    :param debug: flag for using debug mode
+    :type debug:bool
+    :return: system uptime as string
+    """
+    time_control(mode="uptime",debug=debug)
+
 
 def idletime(debug=False):
     """
@@ -112,14 +126,7 @@ def idletime(debug=False):
     :type debug:bool
     :return: system idle as string
     """
-    try:
-        command = open("/proc/uptime")
-        response = command.read()
-        return time_convert(response[:-1].split(" ")[1])
-    except Exception as e:
-        if debug:
-            print(str(e))
-        return GENERAL_ERROR_MESSAGE
+    time_control(mode="idle", debug=debug)
 
 
 def version():