Changeset 33 for storage

Timestamp:

07/09/06 17:28:56 (2 years ago)

Author:

ploum

Message:

#12 Cannot rename a bookmark
+ sanitize XML stuff (prettyXML is really nasty)

Files:

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

storage/bookmarks_store.py

@@ -12 +12 @@
 # this class represent the whole bookmarks list
 class bookmarks_store :
+
         # bts_name is a string arg. It will be used to have
         # differents bookmarks for differents protocols.
@@ -22 +23 @@
                 # 4- advanced search
                 self.listing = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+                def reorder_callback(treemodel, path, iter, new_order):
+                        print "reordering"
+                        self.sync_file()
+                self.listing.connect("rows-reordered", reorder_callback)
                 if os.path.exists(bmark_file) :
-                        doc = xml.dom.minidom.parse(bmark_file)
+                        f = open(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")
@@ -35 +43 @@
                         #then we create the file
                         f = open(bmark_file, mode='a+')
-                        f.write(doc.toprettyxml())
+                        f.write(doc.toxml().encode("utf-8"))
                         f.close()
 
@@ -56 +64 @@
                 self.listing.remove(to_delete)
                 self.sync_file()
+        
+        def rename(self, to_rename, new_name) :
+                self.listing[to_rename][0]=new_name
+                self.sync_file()
 
         def sync_file(self) :
@@ -64 +76 @@
                         doc2 = xml.dom.minidom.parseString(i[1])
                         bmark = doc2.getElementsByTagName("bookmark")[0]
+                        bmark.setAttribute("title",i[0].strip())
                         store.appendChild(bmark)
                 #it's maybe not optimal to open/close the file each time we sync
@@ -69 +82 @@
                 # might be changed in the future.
                 f = open(bmark_file, mode='w+')
-                f.write(doc.toprettyxml())
+                f.write(doc.toprettyxml().encode("utf-8"))
                 f.close()
                 
@@ -77 +90 @@
         # constructor take the path to the bug in the store.
         def __init__(self,path) :
-                bug = ''
-                search = ''
-                product = ''
-                title = ''
+                zbug = 0
+                zsearch = ''
+                zproduct = ''
+                ztitle = ''
                 zetuple = path.get_selection().get_selected()
-                #method = zetuple[0].get_value(zetuple[1],1)
                 string = zetuple[0].get_value(zetuple[1],1)
                 doc2 = xml.dom.minidom.parseString(string)
                 bmark = doc2.getElementsByTagName("bookmark")[0]
-                method =  int(bmark.getAttribute("type"))
-                if method == 1:
+                zmethod =  int(bmark.getAttribute("type"))
+                if zmethod == 1:
                         # besoin de programmation défensive ici FIXME
                         #bug = int(zetuple[0].get_value(zetuple[1],2))
                         element = bmark.getElementsByTagName("bug")[0]
-                        bug = int(element.childNodes[0].nodeValue)
-                elif method == 2:
+                        zbug = int(element.childNodes[0].nodeValue)
+                elif zmethod == 2:
                         s_element = bmark.getElementsByTagName("search")[0]
-                        search = s_element.childNodes[0].nodeValue
-                elif method == 3:
+                        zsearch = s_element.childNodes[0].nodeValue
+                elif zmethod == 3:
                         s_element = bmark.getElementsByTagName("search")
                         p_element = bmark.getElementsByTagName("product")[0]
-                        product = p_element.childNodes[0].nodeValue
+                        zproduct = p_element.childNodes[0].nodeValue
                         if len(s_element) == 0 :
-                                search = None
+                                zsearch = None
                         else :  
-                                search = s_element[0].childNodes[0].nodeValue
-                self.bug = str(bug)
-                self.method = method
-                self.search = search
-                self.product = product
+                                zsearch = s_element[0].childNodes[0].nodeValue
+                self.bug = str(zbug)
+                self.method = zmethod
+                self.search = zsearch
+                self.product = zproduct
                 self.title = bmark.getAttribute("title")