fix : some functions moved to orangetool_utils.py

Author: sepandhaghighi

orangetool/orangetool_ram.py

@@ -2,27 +2,7 @@
 """Orangetool RAM functions."""
 import psutil
 from .orangetool_params import GENERAL_ERROR_MESSAGE
-
-
-def convert_bytes(num):
-    """
-    Convert num to idiomatic byte unit.
-
-    :param num: the input number.
-    :type num:int
-    :return: str
-    >>> convert_bytes(200)
-    '200.0 bytes'
-    >>> convert_bytes(6000)
-    '5.9 KB'
-    >>> convert_bytes(80000)
-    '78.1 KB'
-    """
-    for x in ['bytes', 'KB', 'MB', 'GB', 'TB']:
-        if num < 1024.0:
-            return "%3.1f %s" % (num, x)
-        num /= 1024.0
-
+from .orangetool_utils import convert_bytes
 
 def ram_total(convert=True):
     """

orangetool/orangetool_storage.py

@@ -3,8 +3,8 @@
 import subprocess as sub
 import os
 import string
-import random
 from .orangetool_params import GENERAL_ERROR_MESSAGE, ROOT_ERROR_MESSAGE
+from .orangetool_utils import random_generator
 
 
 def mount_status(device_name, debug=False):
@@ -105,23 +105,6 @@ def unmount_all(debug=False):
             print(str(e))
         return GENERAL_ERROR_MESSAGE
 
-
-def random_generator(number):
-    """
-    Generate random number.
-
-    :param number: random number digits
-    :type number: int
-    :return: random number as str
-    """
-    response = ""
-    i = 0
-    while(i < number):
-        i += 1
-        response += str(random.randint(0, 9))
-    return response
-
-
 def mount(device_name, mount_address=None, debug=False):
     """
     Mount memory devices by addresses.

orangetool/orangetool_system.py

@@ -2,6 +2,7 @@
 """Orangetool system functions."""
 import subprocess as sub
 from .orangetool_params import ORANGETOOL_VERSION, UPDATE_URL, GENERAL_ERROR_MESSAGE, ROOT_ERROR_MESSAGE
+from .orangetool_utils import time_convert
 import time
 import requests
 from art import tprint
@@ -53,38 +54,6 @@ def get_temp(zone=0, debug=False):
             print(str(e))
         return GENERAL_ERROR_MESSAGE
 
-
-def zero_insert(input_string):
-    """
-    Get a string as input if input is one digit add a zero.
-
-    :param input_string: input digit az string
-    :type input_string:str
-    :return: modified output as str
-    """
-    if len(input_string) == 1:
-        return "0" + input_string
-    return input_string
-
-
-def time_convert(input_string):
-    """
-    Convert input_string from sec to DD,HH,MM,SS Format.
-
-    :param input_string: input time string  in sec
-    :type input_string:str
-    :return: converted time as string
-    """
-    input_sec = float(input_string)
-    input_minute = input_sec // 60
-    input_sec = int(input_sec - input_minute * 60)
-    input_hour = input_minute // 60
-    input_minute = int(input_minute - input_hour * 60)
-    input_day = int(input_hour // 24)
-    input_hour = int(input_hour - input_day * 24)
-    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 time_control(mode="uptime",debug=False):
     """
     Return system time.

orangetool/orangetool_utils.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+"""Orangetool utils."""
+import random
+
+def zero_insert(input_string):
+    """
+    Get a string as input if input is one digit add a zero.
+
+    :param input_string: input digit az string
+    :type input_string:str
+    :return: modified output as str
+    """
+    if len(input_string) == 1:
+        return "0" + input_string
+    return input_string
+
+
+def time_convert(input_string):
+    """
+    Convert input_string from sec to DD,HH,MM,SS Format.
+
+    :param input_string: input time string  in sec
+    :type input_string:str
+    :return: converted time as string
+    """
+    input_sec = float(input_string)
+    input_minute = input_sec // 60
+    input_sec = int(input_sec - input_minute * 60)
+    input_hour = input_minute // 60
+    input_minute = int(input_minute - input_hour * 60)
+    input_day = int(input_hour // 24)
+    input_hour = int(input_hour - input_day * 24)
+    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 random_generator(number):
+    """
+    Generate random number.
+
+    :param number: random number digits
+    :type number: int
+    :return: random number as str
+    """
+    response = ""
+    i = 0
+    while(i < number):
+        i += 1
+        response += str(random.randint(0, 9))
+    return response
+
+def convert_bytes(num):
+    """
+    Convert num to idiomatic byte unit.
+
+    :param num: the input number.
+    :type num:int
+    :return: str
+    >>> convert_bytes(200)
+    '200.0 bytes'
+    >>> convert_bytes(6000)
+    '5.9 KB'
+    >>> convert_bytes(80000)
+    '78.1 KB'
+    """
+    for x in ['bytes', 'KB', 'MB', 'GB', 'TB']:
+        if num < 1024.0:
+            return "%3.1f %s" % (num, x)
+        num /= 1024.0