Changeset 42

Timestamp:

04/21/06 15:48:06 (3 years ago)

Author:

klattimer

Message:

#18 Started integrating [Source:Resources/contrib/alex/xml/parser.py alex's parser.py] testcase into [Source:src/prefs.py prefs.py] more code is required there though (check comments).

Files:

• src/prefs.py (modified) (1 diff)
• src/queue.py (modified) (2 diffs)
• src/utils.py (modified) (1 diff)

src/prefs.py

@@ -1 @@
-
-
+, sys
+
-from xml.sax.handler import ContentHandler
-from xml.sax import parse
-
-preferences = list()
+repositories = list()
+
+class ParsePreferences( ContentHandler ):
+    in_conf_file = False
+    in_repo_list = False
+
+    def __init__ ( self, prefs, repos ):
+        self.prefs = prefs
+        self.repos = repos
+        self.data = []
+        
+    def startElement( self, name, attrs ):
+        if name == "winedoors":
+            self.in_conf_file = True
+        elif name == "repositories" and self.in_conf_file:
+            self.in_repo_list = True
+        elif name == "repo" and self.in_repo_list:
+            # Erm I think hehehe
+            text = ''.join( self.data )
+            self.repos.append( [attrs.get( 'uri' ), text ] )
+        elif name == "wineroot" and self.in_conf_file:
+            text = ''.join( self.data )
+            preferences.append( ["wineroot", text] )
+                    
+    def characters ( self, string ):
+        if self.in_conf_file and self.in_repo_list:
+            self.repo.append( string )
+        elif self.in_conf_file:
+            self.prefs.append( string )
+                
+    def endElement( self, name ):
+        if name == "winedoors":
+            self.in_conf_file = False
+        elif name == "repositories" and self.in_conf_file:
+            self.in_repo_list = False
-
-class Preferences:
+    #def SetPref(self, name, value):
+    #def AddRepo():...
+    #def DefaultPreferences(self):
+        # Check queue.py -> CreateWinedrive
-    def LoadPreferences( self ):
+        handler = ParsePreferences(preferences, repositories)
+        parser = make_parser()
+        parser.setContentHandler(handler)
+        parser.parse(wineroot+"/wine)
-        return
-    def SavePreferences( self ):

src/queue.py

@@ -86 +86 @@
-        os.symlink( utils.wineroot+"/installer-cache", utils.wineroot+"/dosdevices/e:" )
-        os.system( "winecfg -D" )
-
-
+
-        if not os.path.isdir( utils.wineroot ):
-            return -1
@@ -93 +92 @@
-        name = ui.window['en_name'].get_text()
-        company = ui.window['en_company'].get_text()
+        # TODO: Should add the configuration for wine doors into this file
+        ## deprecated this old thing - os.system( "echo \"wine doors managed wine drive\" > "+utils.wineroot+"/winedoors" )
+        os.mkdir( utils.wineroot+"/winedoors" )
+        prefs = Preferences()
+        prefs.DefaultPreferences()
+        prefs.SetPref("name", name)
+        prefs.SetPref("company", company)
+        prefs.SetPref("wineroot", wineroot)
+        prefs.SetPref("cdpath", utils.GetCD())
+        prefs.SavePreferences()
+        
-        if os.path.isfile( utils.wineroot+"/system.reg" ):
-            lines = [ line.replace( "Change preferred owner in ~/.wine/system.reg", 

src/utils.py

@@ -141 +141 @@
-def CheckWinedrive():
-    print "* Checking wine drive: " + wineroot
-file
+dir
-        return True
-    else: