添加对 number 的支持

Author: zhenwei-li

src/com/dvsnier/config/cfg/configuration.py

@@ -1,15 +1,51 @@
 # -*- coding:utf-8 -*-
 
 import logging
+from numbers import Number
 import os
 import re
 
 from com.dvsnier.config.iconf import IConf
 
 
 class Configuration(IConf, object):
-    '''the Configuration class'''
+    '''
+        the Configuration class that provides the ability to parse configuration files
 
+        ## Illustration or Description
+
+        The types of data structures supported are as follows:
+
+        - str
+        - number
+        - list
+
+        The standard writing method of each data type is given below:
+
+        ### str types
+
+            At present, the system supports three formats by default:
+            - `key = value` # The first is recommendation
+            - `key = 'value'`
+            - `key = "value"`
+
+        ### number types
+
+            - `key = number`
+
+        ### list types
+
+            At present, it only supports the case that the content array is of the same type constraint, and the default is `str` generic:
+
+            - `key = ['value0', 'value1', ...]`
+            - `key = ['value0', "value1", ...]`
+            - `key = ["value0", "value1", ...]`
+    '''
+
+    __pattern_with_list = re.compile(r'(?<=\[).+?(?=\])')
+    __pattern_with_number_element = re.compile(r'\b\d+?\b')
+    __pattern_with_element = re.compile(r'((?<=\')[^,\b]+?(?=\'))|((?<=\")[^,\b]+?(?=\"))')
+    __pattern_with_element_strip = re.compile(r'(?<=\').+?(?=\')|(?<=\").+?(?=\")')
     _config = {}
 
     def __init__(self):
@@ -22,8 +58,6 @@ def obtain_config(self, config_file):
         logging.info('the start parsing the configuration file that is {}'.format(os.path.abspath(config_file)))
         with open(config_file) as file_handler:
             lines = file_handler.readlines()
-        pattern_with_list = re.compile(r'(?<=\[).+?(?=\])')
-        pattern_with_element = re.compile(r'((?<=\')[^,\b]+?(?=\'))|((?<=\")[^,\b]+?(?=\"))')
         for line in lines:
             if line.strip().startswith('#'):
                 continue  # ignore notes
@@ -37,32 +71,57 @@ def obtain_config(self, config_file):
                     key = line[:split_at].strip()
                     suspicious_value = line[split_at + 1:].strip()
                     # https://docs.python.org/zh-cn/2.7/library/re.html?
-                    # logging.debug('the key is {} and value is {}'.format(key, suspicious_value))
+                    logging.debug('the key is {} and value is {}'.format(key, suspicious_value))
                     if suspicious_value:
-                        match_with_immature_list = pattern_with_list.search(suspicious_value)
+                        match_with_immature_list = self.__pattern_with_list.search(suspicious_value)
+                        match_with_immature_digital = self.__pattern_with_number_element.search(suspicious_value)
                         if match_with_immature_list:  # list
-                            immature_list_str_value = match_with_immature_list.group()
-                            if immature_list_str_value:
-                                # match_with_element = pattern_with_element.findall(element_value)
-                                iterator_object_with_callback_type_is_match_object = pattern_with_element.finditer(
-                                    immature_list_str_value)
-                                if iterator_object_with_callback_type_is_match_object:
-                                    the_default_element_list_with_parsed = list()
-                                    for element_value in iterator_object_with_callback_type_is_match_object:
-                                        the_default_element_list_with_parsed.append(element_value.group())
-                                    self._config[key] = the_default_element_list_with_parsed
-                                else:
-                                    logging.warning(
-                                        'the value({}) corresponding to the current key({}) is illegal, parsing failed, then its parsing has been ignored.'
-                                        .format(suspicious_value, key))
-                                    continue  # ignore invaild split value
-                            else:
-                                logging.warning(
-                                    'the value({}) corresponding to the current key({}) is illegal, parsing failed, then its parsing has been ignored.'
-                                    .format(suspicious_value, key))
-                                continue  # ignore invaild split value
+                            self.__resolve_with_list(match_with_immature_list, key, suspicious_value)
+                        elif match_with_immature_digital:  # digital
+                            self.__resolve_with_digital(match_with_immature_digital, key, suspicious_value)
                         else:  # str
-                            self._config[key] = suspicious_value
+                            self.__resolve_with_str(key, suspicious_value)
                     else:
-                        self._config[key] = suspicious_value
+                        self.__resolve_with_str(key, suspicious_value)
         return self._config
+
+    def __resolve_with_list(self, match_with_immature_list, key, suspicious_value):
+        'the resolve list data structure'
+        immature_list_str_value = match_with_immature_list.group()
+        if immature_list_str_value:
+            iterator_object_with_callback_type_is_match_object = self.__pattern_with_element.finditer(
+                immature_list_str_value)
+            if iterator_object_with_callback_type_is_match_object:
+                the_default_element_list_with_parsed = list()
+                for element_value in iterator_object_with_callback_type_is_match_object:
+                    the_default_element_list_with_parsed.append(element_value.group())
+                self._config[key] = the_default_element_list_with_parsed
+            else:
+                # ignore invaild split value
+                logging.warning(
+                    'the value({}) corresponding to the current key({}) is illegal, parsing failed, then its parsing has been ignored.'
+                    .format(suspicious_value, key))
+        else:
+            # ignore invaild split value
+            logging.warning(
+                'the value({}) corresponding to the current key({}) is illegal, parsing failed, then its parsing has been ignored.'
+                .format(suspicious_value, key))
+
+    def __resolve_with_digital(self, match_with_immature_digital, key, suspicious_value):
+        'the resolve digital data structure'
+        element_value = match_with_immature_digital.group()
+        try:
+            if element_value and suspicious_value == element_value and isinstance(int(element_value), Number):
+                self._config[key] = int(element_value)
+            else:
+                self.__resolve_with_str(key, suspicious_value)
+        except ValueError:
+            self.__resolve_with_str(key, suspicious_value)
+
+    def __resolve_with_str(self, key, suspicious_value):
+        'the resolve str data structure'
+        match_with_immature_str = self.__pattern_with_element_strip.search(suspicious_value)
+        if match_with_immature_str:
+            self._config[key] = match_with_immature_str.group()
+        else:
+            self._config[key] = suspicious_value