Changeset 463

Timestamp:

05/16/08 11:14:07 (8 months ago)

Author:

jmowery

Message:

incremental check-in for new storage
added some node functionality

Files:

• branches/trunk-pmd-intproto/server/storage.py (modified) (5 diffs)

branches/trunk-pmd-intproto/server/storage.py

@@ -228 +228 @@
-        def add_node(self, id):
-                '''Add a node with the given id to the store if not already present. Create entries for each known file with an applied time of 0 for that node.'''
+                
-                raise NotImplementedError
-
@@ -677 +678 @@
-        def add_node(self, id):
-                '''Add a new node to this Layer; all controlled files have the default time of 0 until sent to the node.'''
-
+
+
+
+
+
+
+
+
-
-        #TODO should there be a remove node?
@@ -730 +738 @@
-class NodeLayerData:
-        '''Represents the data stored on disk about the status of files sent to this node relative to a single Layer.'''
-name = ''  # Name
+path = ''  # Path
-        group_name = ''  # Group name for the layer
-        config_path = '' # path to the file containing the on disk record of the state of the Node's files for this layer
-        config = ConfigParser.ConfigParser() # parser object for the file config_path
-
+        def __init__(self, id, layer_path):
+                assert is_controlled(layer_path)
+                self.layer_path = layer_path
+                l = Layer(layer_path)
+                self.group_name = l.name
+                self.config_path = os.path.join(l.storage.nodes_dir, id)
+                self.config.add_section('entries')
+                if l.storage.path == l.root:
+                        self.config.add_section('general')
+                        self.config.add_section('bools')
+                self.config.read(self.config_path)
+
+        def write(self):
+                node_data_file = open(self.config_path, 'w')
+                self.config.write(node_data_file)
+                node_date_file.close()
+
-class Node:
-        '''The node object holds all storage relevant data about a single node connected to the store.'''
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        def __del__(self):
@@ -763 +793 @@
-        def write(self):
-                '''Write the data back to disk.'''
-
+
+
+
-
-        def set_file_status(self, name, layer, version, local=True)
@@ -770 +802 @@
-        def update(self):
-                '''Update all fields and write the node to disk if modified. This function should be called regularly and whenever the Node will go out of scope.'''
-
+
+
+
+
+
+
+
+
+
+
+
-
-        def classify(self, classification=''):
-                '''Place this node in the group specified by classification; if empty, attempt to determine from the store how the node is classified.'''
+                if not classification:
+                        l = Layer(self.root)
+                        if self.id not in l.list_nodes(): #only possible on initial addition of a node
+                                self.layers[self.root] = NodeLayerData(self.id, self.root)
+                                self.layers[self.root].write() #create empty config to be filled in by layer.add_node()
+                                return
-                raise NotImplementedError
-