third part of filter code from cli submodule isolated

Author: s-m-e

src/loggedfs/cli.py

@@ -29,12 +29,10 @@
 # IMPORT
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-from collections import OrderedDict
+import click
 
 from .core import loggedfs_factory
-
-import click
-import xmltodict
+from .filter import parse_filters
 
 
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -96,36 +94,15 @@ def __process_config__(
 	fuse_allowother_bool
 	):
 
-	def proc_filter_item(in_item):
-		return {
-			'extension': in_item['@extension'],
-			'uid': in_item['@uid'],
-			'action': in_item['@action'],
-			'retname': in_item['@retname']
-			}
-
-	def proc_filter_list(in_list):
-		if in_list is None:
-			return []
-		if not isinstance(in_list, list):
-			return [proc_filter_item(in_list)]
-		return [proc_filter_item(item) for item in in_list]
-
-	config_dict = OrderedDict({
-		'@logEnabled': True,
-		'@printProcessName': True,
-		'includes': {},
-		'excludes': {}
-		})
-
-	config_file = None
 	if config_fh is not None:
-		config_file = config_fh.name
-		config_dict.update(xmltodict.parse(config_fh.read())['loggedFS'])
+		config_xml_str = config_fh.read()
 		config_fh.close()
+		config_file = config_fh.name
+	else:
+		config_file = '[None]'
+		config_xml_str = None
 
-	for f_type in ['includes', 'excludes']:
-		config_dict[f_type] = proc_filter_list(config_dict[f_type].get(f_type[:-1], None))
+	config_dict = parse_filters(config_xml_str)
 
 	return {
 		'log_includes': config_dict['includes'],

src/loggedfs/filter.py

@@ -29,13 +29,56 @@
 # IMPORT
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+from collections import OrderedDict
 import re
 
+import xmltodict
+
 
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # ROUTINES
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+def new_filter():
+
+	return {
+		'@logEnabled': True,
+		'@printProcessName': True,
+		'includes': {},
+		'excludes': {}
+		}
+
+
+def parse_filters(config_xml_str = None):
+
+	config_dict = new_filter()
+
+	if config_xml_str is not None:
+		config_dict.update(xmltodict.parse(config_xml_str)['loggedFS'])
+
+	for f_type in ['includes', 'excludes']:
+		config_dict[f_type] = _parse_filter_list_(config_dict[f_type].get(f_type[:-1], None))
+
+	return config_dict
+
+
+def _parse_filter_item_(in_item):
+	return {
+		'extension': in_item['@extension'],
+		'uid': in_item['@uid'],
+		'action': in_item['@action'],
+		'retname': in_item['@retname']
+		}
+
+
+def _parse_filter_list_(in_list):
+	if in_list is None:
+		return []
+	if not isinstance(in_list, list):
+		return [_parse_filter_item_(in_list)]
+	return [_parse_filter_item_(item) for item in in_list]
+
+
 def compile_filters(include_list, exclude_list):
 
 	if len(include_list) == 0: