[gentoo-commits] proj/R_overlay:master commit in: roverlay/

["André Erdmann" <dywi@mailerd.de>]

commit:     d0fa945b8c81fedbcc02dc3f1e3e824a5b7170cc
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun  1 16:19:03 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun  1 16:19:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=d0fa945b

config: faster lookup

---
 roverlay/config.py |   74 ++++++++++++++++++++++++++++++++++++++++++---------
 roverlay/const.py  |   15 +++-------
 2 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/roverlay/config.py b/roverlay/config.py
index b0bf7a3..41a98bf 100644
--- a/roverlay/config.py
+++ b/roverlay/config.py
@@ -4,6 +4,7 @@
 
 import sys
 import shlex
+import copy
 
 try:
 	import configparser
@@ -81,13 +82,36 @@ class ConfigTree:
 
 		self.parser = dict()
 
-		self._config = const.clone() if import_const else None
+		self._config = const.clone() if import_const else dict ()
 		self._const_imported = import_const
 		self._field_definitions = None
 
 	# --- end of __init__ (...) ---
 
 
+	def _findpath ( self, path, root=None, create=False ):
+		if path is None:
+			return root
+		elif isinstance ( path, str ):
+			path = path.split ( '.' ) if key else []
+
+		config_position = self._config if root is None else root
+
+		for k in path:
+			if not k in config_position:
+				if create:
+					config_position [k] = dict ()
+
+				else:
+					return None
+
+			config_position = config_position [k]
+
+		return config_position
+
+	# --- end of _findpath (...) ---
+
+
 	def get ( self, key, fallback_value=None ):
 		"""Searches for key in the ConfigTree and returns its value.
 		Searches in const if ConfigTree does not contain the requested key and
@@ -98,19 +122,10 @@ class ConfigTree:
 		* fallback_value --
 		"""
 		if self._config:
-			config_path = key.split ( '.' )
-			config_path.reverse ()
-
-			config_position = self._config
-			while len ( config_path ) and config_position:
-				next_key = config_path.pop ()
-				if next_key in config_position:
-					config_position = config_position [next_key]
-				else:
-					config_position = None
+			config_value = self._findpath ( key )
 
-			if config_position:
-				return config_position
+			if config_value:
+				return config_value
 
 		if self._const_imported:
 			return fallback_value
@@ -119,6 +134,39 @@ class ConfigTree:
 
 	# --- end of get (...) ---
 
+	def load_config ( self, config_file, start_section='' ):
+		"""Loads a config file and integrates its content into the config tree.
+		Older config entries may be overwritten.
+
+		arguments:
+		config_file   -- path to the file that should be read
+		start_section -- relative root in the config tree as str or ref
+		"""
+
+		config_root = None
+		if start_section:
+			if isinstance ( start_section, str ):
+				config_root = self._findpath ( start_section, None, True )
+			elif isinstance ( start_section, dict ):
+				config_root = start_section
+			else
+				raise Exception ("bad usage")
+
+		# load file
+
+		try:
+			fh = open ( config_file, 'r' )
+			reader = shlex.shlex ( fh )
+			if fh:
+				fh.close ()
+
+			# <TODO>
+
+		except IOError as ioerr:
+			raise
+
+	# --- end of load_config (...) ---
+
 	def load_field_definition ( self, def_file, lenient=False ):
 		"""Loads a field definition file. Please see the example file for format
 		details.

diff --git a/roverlay/const.py b/roverlay/const.py
index 32630cf..527939b 100644
--- a/roverlay/const.py
+++ b/roverlay/const.py
@@ -31,21 +31,16 @@ _CONSTANTS = dict (
 
 def lookup ( key, fallback_value=None ):
 	path = key.split ( '.' )
-	path.reverse ()
 
 	const_position = _CONSTANTS
 
-	while len ( path ) and const_position:
-		next_key = path.pop ()
-		if next_key in const_position:
-			const_position = const_position [next_key]
+	for k in path:
+		if k in const_position:
+			const_position = const_position [k]
 		else:
-			const_position = None
+			return fallback_value
 
-	if const_position:
-		return const_position
-	else:
-		return fallback_value
+	return const_position
 
 def clone ( ):
 	return copy.deepcopy ( _CONSTANTS )