# HG changeset patch
# User lbessard
# Date 1185463070 -7200
# Node ID ef2541ff1e68957c267e101875044bc877f8f8fb
# Parent  6e9f24fd1b98ddc36205f133f36b57d28b72c9e5
Adding verification for the project opened

diff -r 6e9f24fd1b98 -r ef2541ff1e68 Beremiz.py
--- a/Beremiz.py	Wed Jul 25 17:58:18 2007 +0200
+++ b/Beremiz.py	Thu Jul 26 17:17:50 2007 +0200
@@ -439,26 +439,33 @@
         if dialog.ShowModal() == wxID_OK:
             projectpath = dialog.GetPath()
             dialog.Destroy()
-            if os.path.isdir(projectpath):
+            try:
+                if os.path.isdir(projectpath):
+                    raise Exception
                 self.BusManagers = {}
                 configpath = os.path.join(projectpath, ".project")
-                if os.path.isfile(configpath):
-                    file = open(configpath, "r")
-                    for bus_id, bus_type, bus_name in [line.strip().split(" ") for line in file.readlines() if line.strip() != ""]:
-                        if bus_type == "CanFestival":
-                            id = int(bus_id, 16)
-                            manager = NodeManager(os.path.join(base_folder, "CanFestival-3", "objdictgen"))
-                            nodelist = NodeList(manager)
-                            result = nodelist.LoadProject(projectpath, bus_name)
-                            if not result:
-                                self.BusManagers[id] = {"Name" : bus_name, "Type" : bus_type, "NodeList" : nodelist, "Editor" : None}
-                            else:
-                                message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
-                                message.ShowModal()
-                                message.Destroy()
+                if not os.path.isfile(configpath):
+                    raise
+                file = open(configpath, "r")
+                lines = [line.strip() for line in file.readlines() if line.strip() != ""]
+                if line[0] != "Beremiz":
+                    file.close()
+                    raise Exception
+                for bus_id, bus_type, bus_name in [line.split(" ") for line in lines]:
+                    id = int(bus_id, 16)
+                    if bus_type == "CanFestival":
+                        manager = NodeManager(os.path.join(base_folder, "CanFestival-3", "objdictgen"))
+                        nodelist = NodeList(manager)
+                        result = nodelist.LoadProject(projectpath, bus_name)
+                        if not result:
+                            self.BusManagers[id] = {"Name" : bus_name, "Type" : bus_type, "NodeList" : nodelist, "Editor" : None}
                         else:
-                            self.BusManagers[id] = {"Name" : bus_name, "Type" : bus_type}
-                    file.close()
+                            message = wxMessageDialog(self, result, "Error", wxOK|wxICON_ERROR)
+                            message.ShowModal()
+                            message.Destroy()
+                    else:
+                        self.BusManagers[id] = {"Name" : bus_name, "Type" : bus_type}
+                file.close()
                 self.PLCManager = PLCControler()
                 plc_file = os.path.join(projectpath, "plc.xml")
                 if os.path.isfile(plc_file):
@@ -478,6 +485,10 @@
                 self.RefreshBusList()
                 self.RefreshButtons()
                 self.RefreshMainMenu()
+            except Exception:
+                message = wxMessageDialog(self, "\"%s\" folder is not a valid Beremiz project"%projectpath, "Error", wxOK|wxICON_ERROR)
+                message.ShowModal()
+                message.Destroy()
         event.Skip()
     
     def OnCloseProjectMenu(self, event):