Changeset 35 for storage

Timestamp:

07/10/06 16:22:28 (2 years ago)

Author:

ploum

Message:

You can now import a bookmark file

Files:

• storage/bookmarks_store.py (modified) (2 diffs)

storage/bookmarks_store.py

@@ -34 +34 @@
                 self.listing.connect("row-deleted", deleted_callback)
                 if os.path.exists(self.bmark_file) :
-                        f = open(self.bmark_file,mode='r')
-                        # sanitize the pretty XML
-                        stringed = f.read().replace('\n','').replace('\t','')
-                        doc = xml.dom.minidom.parseString(stringed)
-                        for bmark in doc.getElementsByTagName("bookmark") :
-                                title = bmark.getAttribute("title")
-                                self.listing.insert_before(None, [title, bmark.toxml()])
+                        if self.import_file(self.bmark_file) == 0 :
+                                print "Bookmarks not in a valid format."
+                                print "Please remove the %s file" %self.bmark_file
                 else :
                         doc = xml.dom.minidom.Document()
@@ -51 +47 @@
                         f.write(doc.toxml().encode("utf-8"))
                         f.close()
+        
+        def import_file(self,zefile) :
+                #programmation défensive needed ici !!!
+                # !!!!!!!!
+                f = open(zefile,mode='r')
+                # sanitize the pretty XML
+                stringed = f.read().replace('\n','').replace('\t','')
+                try :
+                        doc = xml.dom.minidom.parseString(stringed)
+                except :
+                        return 0
+                for bmark in doc.getElementsByTagName("bookmark") :
+                        title = bmark.getAttribute("title")
+                        self.listing.insert_before(None, [title, bmark.toxml()])
+                return 1