Changeset 218

Timestamp:

03/30/11 11:17:26 (14 years ago)

Author:

tim

Message:

converted hive's .get_root() method into the 'root' property which is cached and better validated for user friendliness

Files:

• test/pyregfi-smoketest.py (modified) (3 diffs)
• trunk/python/pyregfi/__init__.py (modified) (4 diffs)

test/pyregfi-smoketest.py

@@ -18 +18 @@
     while p != None:
         path.append(p.name)
-        if p.is_root():
-            break
-        else:
-            p = p.get_parent()
+        p = p.get_parent()
     path.reverse()
     del path[0]
@@ -130 +127 @@
 # to access various base structure attributes.
 def recurseKeyTally(hive):
-    root = hive.get_root()
-    checkValues(root)
-    recurseTree(root, checkValues)
+    checkValues(hive.root)
+    recurseTree(hive.root, checkValues)
     print("  Key stat: %f" % recurseKey_stat)
     print("  Value stat: %f" % recurseValue_stat)
@@ -143 +139 @@
 
 #tests = [("iterTallyNames",iterTallyNames),("iterParentWalk",iterParentWalk),("iterTallyData",iterTallyData),]
-tests = [("recurseKeyTally",recurseKeyTally),]
+tests = [("recurseKeyTally",recurseKeyTally),("iterParentWalk",iterParentWalk),]
 
 files = []

trunk/python/pyregfi/__init__.py

@@ -322 +322 @@
 
     def get_parent(self):
+        if self.is_root():
+            return None
         parent_base = regfi.regfi_get_parentkey(self._hive.file, self._base)
         if parent_base:
             return Key(self._hive, parent_base)
-
         return None
 
     def is_root(self):
-        return (self._hive.get_root() == self)
+        return (self._hive.root == self)
 
 
@@ -408 +409 @@
     file = None
     raw_file = None
-    
+    _root = None
+
     def __init__(self, fh):
         # The fileno method may not exist, or it may throw an exception
@@ -426 +428 @@
 
     def __getattr__(self, name):
+        if name == "root":
+            if self._root == None:
+                self._root = Key(self, regfi.regfi_get_rootkey(self.file))
+            return self._root
+
         return getattr(self.file.contents, name)
     
@@ -435 +442 @@
     def __iter__(self):
         return HiveIterator(self)
-
-    def get_root(self):
-        return Key(self, regfi.regfi_get_rootkey(self.file))