equal
deleted
inserted
replaced
90 if not os.path.exists(self.Root): |
90 if not os.path.exists(self.Root): |
91 return "\"%s\" folder doesn't exist"%self.Root |
91 return "\"%s\" folder doesn't exist"%self.Root |
92 |
92 |
93 self.EDSFolder = os.path.join(self.Root, "eds") |
93 self.EDSFolder = os.path.join(self.Root, "eds") |
94 if not os.path.exists(self.EDSFolder): |
94 if not os.path.exists(self.EDSFolder): |
95 return "\"%s\" folder doesn't contain a \"eds\" folder"%self.Root |
95 os.mkdir(self.EDSFolder) |
|
96 #return "\"%s\" folder doesn't contain a \"eds\" folder"%self.Root |
96 |
97 |
97 files = os.listdir(self.EDSFolder) |
98 files = os.listdir(self.EDSFolder) |
98 for file in files: |
99 for file in files: |
99 filepath = os.path.join(self.EDSFolder, file) |
100 filepath = os.path.join(self.EDSFolder, file) |
100 if os.path.isfile(filepath) and os.path.splitext(filepath)[-1] == ".eds": |
101 if os.path.isfile(filepath) and os.path.splitext(filepath)[-1] == ".eds": |
160 if netname: |
161 if netname: |
161 masterpath = os.path.join(self.Root, "%s_master.od"%netname) |
162 masterpath = os.path.join(self.Root, "%s_master.od"%netname) |
162 else: |
163 else: |
163 masterpath = os.path.join(self.Root, "master.od") |
164 masterpath = os.path.join(self.Root, "master.od") |
164 if os.path.isfile(masterpath): |
165 if os.path.isfile(masterpath): |
165 self.Manager.OpenFileInCurrent(masterpath) |
166 return self.Manager.OpenFileInCurrent(masterpath) |
166 else: |
167 else: |
167 self.Manager.CreateNewNode("MasterNode", 0x00, "master", "", "None", "", "heartbeat", ["DS302"]) |
168 return self.Manager.CreateNewNode("MasterNode", 0x00, "master", "", "None", "", "heartbeat", ["DS302"]) |
168 return None |
|
169 |
169 |
170 def SaveMasterNode(self, netname = None): |
170 def SaveMasterNode(self, netname = None): |
171 if netname: |
171 if netname: |
172 masterpath = os.path.join(self.Root, "%s_master.od"%netname) |
172 masterpath = os.path.join(self.Root, "%s_master.od"%netname) |
173 else: |
173 else: |