Changeset 32 for storage

Timestamp:

07/09/06 14:53:14 (2 years ago)

Author:

ploum

Message:

#11 Bookmarks are not stored

Files:

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

storage/bookmarks_store.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import sys, string, xml.dom.minidom
+import sys, string, xml.dom.minidom, os
 try:
         import gtk
@@ -8 +8 @@
         sys.exit(1)
 
+bmark_file="bookmarks.xml"
+
 # this class represent the whole bookmarks list
 class bookmarks_store :
@@ -13 +15 @@
         # differents bookmarks for differents protocols.
         def __init__(self, bts_name) :
-                #listing is : Title of the bookmarks, number of the search method, arguments of the search
+                #listing is : Title of the bookmarks, description of the search
                 # search method :
                 # 1- bug number
@@ -19 +21 @@
                 # 3- package search
                 # 4- advanced search
-                self.listing = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_INT, gobject.TYPE_STRING)
-                # essai temporaire
-                # normalement ici on lit le fichier de préférences
-                self.listing.insert_before(None, ["Evo 2 results", 2, "<?xml version=\"1.0\" ?>\n<bookmark title=\"(evolution) imap filter\" type=\"3\"><search>imap filter</search><product>evolution</product></bookmark>"])
-                self.listing.insert_before(None, ["many results", 2, "<?xml version=\"1.0\" ?>\n<bookmark title=\"microsoft has majority\" type=\"2\"><search>microsoft has majority</search></bookmark>"])
-                self.listing.insert_before(None, ["Evo's bugs", 3, "<?xml version=\"1.0\" ?>\n<bookmark title=\"(evolution)\" type=\"3\"><product>evolution</product></bookmark>"])
-                self.listing.insert_before(None, ["Bug #42", 1, "<?xml version=\"1.0\" ?>\n<bookmark title=\"bug #42\" type=\"1\"><bug>42</bug></bookmark>"])
-                self.listing.insert_before(None, ["Content in +text mode", 1, "<?xml version=\"1.0\" ?>\n<bookmark title=\"bug #51835\" type=\"1\"><bug>51835</bug></bookmark>"])
-                self.listing.insert_before(None, ["Search in bugs+text", 1, "<?xml version=\"1.0\" ?>\n<bookmark title=\"bug #51836\" type=\"1\"><bug>51836</bug></bookmark>"])
+                self.listing = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+                if os.path.exists(bmark_file) :
+                        doc = xml.dom.minidom.parse(bmark_file)
+                        for bmark in doc.getElementsByTagName("bookmark") :
+                                title = bmark.getAttribute("title")
+                                self.listing.insert_before(None, [title, bmark.toxml()])
+                else :
+                        doc = xml.dom.minidom.Document()
+                        store = doc.createElement("store")
+                        doc.appendChild(store)
+                        #here we can put hardcoded default
+                        #
+                        #then we create the file
+                        f = open(bmark_file, mode='a+')
+                        f.write(doc.toprettyxml())
+                        f.close()
 
         
@@ -33 +42 @@
                 return self.listing
 
-        def add(self,title,searchMethod, args) :
+        def add(self,args) :
                 #TODO : do not forget to also add the bookmarks to
                 #the stored bookmarks. (sync with storage)
-                self.listing.insert_before(None, [title, searchMethod, args])
+                doc2 = xml.dom.minidom.parseString(args)
+                bmark = doc2.getElementsByTagName("bookmark")[0]
+                title = bmark.getAttribute("title")
+                self.listing.insert_before(None, [title, args])
+                self.sync_file()
 
         def delete(self, to_delete) :
@@ -42 +55 @@
                 #the stored bookmarks. (sync with storage)
                 self.listing.remove(to_delete)
+                self.sync_file()
+
+        def sync_file(self) :
+                doc = xml.dom.minidom.Document()
+                store = doc.createElement("store")
+                doc.appendChild(store)
+                for i in self.listing :
+                        doc2 = xml.dom.minidom.parseString(i[1])
+                        bmark = doc2.getElementsByTagName("bookmark")[0]
+                        store.appendChild(bmark)
+                #it's maybe not optimal to open/close the file each time we sync
+                # but I'm not sure that those operations are so frequent
+                # might be changed in the future.
+                f = open(bmark_file, mode='w+')
+                f.write(doc.toprettyxml())
+                f.close()
+                
 
 # this is a lonely bookmark in the store
@@ -52 +82 @@
                 title = ''
                 zetuple = path.get_selection().get_selected()
-                method = zetuple[0].get_value(zetuple[1],1)
-                string = zetuple[0].get_value(zetuple[1],2)
+                #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"))
+                method =  int(bmark.getAttribute("type"))
                 if method == 1:
                         # besoin de programmation défensive ici FIXME
@@ -73 +103 @@
                         else :  
                                 search = s_element[0].childNodes[0].nodeValue
-                self.bug = bug
+                self.bug = str(bug)
                 self.method = method
                 self.search = search
                 self.product = product
-                self.title = zetuple[0].get_value(zetuple[1],0)
+                self.title = bmark.getAttribute("title")
 
         def get_method(self) :