Changeset 116 for 05/devel/kombilo.py

Timestamp:

03/22/04 21:15:31 (5 years ago)

Author:

ug

Message:

Various encodings fixes

Files:

• 05/devel/kombilo.py (modified) (16 diffs)

05/devel/kombilo.py

@@ -4 +4 @@
 ##   Copyright (C) 2001-4 Ulrich Goertz (u@g0ertz.de)
 
-##   Kombilo 0.5j is a go database program.
+##   Kombilo 0.5k is a go database program.
 
 ##   This program is free software; you can redistribute it and/or modify
@@ -37 +37 @@
     t.pack()
 
-    t.insert(END, 'Kombilo 0.5j\n\n The Python Megawidgets (Pmw) library was not found. It is needed by Kombilo, ' + \
+    t.insert(END, 'Kombilo 0.5k\n\n The Python Megawidgets (Pmw) library was not found. It is needed by Kombilo, ' + \
              'so you have to install it before you can use Kombilo. See the Kombilo tutorial at ' + \
              'http://www.u-go.net/kombilo/tutorial#installation or the Pmw web site at ' + \
@@ -597 +597 @@
             enc = ''
         newRootNode = self.mster.gameinfo(rootNode, enc)
-        if backup != newRootNode:
+        if (not newRootNode is None) and backup != newRootNode:
             c.updateRootNode(newRootNode, gameNumber)
             try:
@@ -4026 +4026 @@
         self.statistics = {}
 
-        pbVar = self.pbVar.get()
-        pwVar = self.pwVar.get()
-        pVar  = self.pVar.get()
-        evVar = self.evVar.get()
+        pbVar = self.pbVar.get().encode('utf-8')
+        pwVar = self.pwVar.get().encode('utf-8')
+        pVar  = self.pVar.get().encode('utf-8')
+        evVar = self.evVar.get().encode('utf-8')
         frVar = self.frVar.get()
         toVar = self.toVar.get()
-        awVar = self.awVar.get()
+        awVar = self.awVar.get().encode('utf-8')
         refVar = self.referencedVar.get()
 
@@ -4132 +4132 @@
                         
                         if gameNumber == -1:         # no collection, so we get away without parsing the SGF file
+
+                            # is there an encoding tag?
+
+                            enc_begin = find(sgf, 'CA[')
+                            if enc_begin != -1:
+                                encoding = lower(strip(sgf[enc_begin+3: find(sgf, ']', enc_begin)]))
+                            else:
+                                encoding = db['encoding']
+
                             sgf = lower(sgf)
+                            if encoding != 'utf-8':
+                                try: sgf = sgf.decode(encoding, 'ignore').encode('utf-8', 'ignore')
+                                except: pass
+                                
                             if awVar and find(sgf, awVar) == -1: continue
 
@@ -4152 +4165 @@
                                     showwarning('Error', 'SGF error in file ' + filename)
                                     continue
+                            
                             node = c.getRootNode(gameNumber)
 
+                            encoding = c.encoding or db['encoding']
+                            
                             ok = 1
                             for var,tag in [(evVar,'EV')]:
+                                try: var = var.decode('utf-8', 'ignore').encode(encoding, 'ignore')
+                                except: pass
                                 if var and not (node.has_key(tag) and find(lower(node[tag][0]), var) != -1):
                                     ok = 0
@@ -4161 +4179 @@
 
                             if awVar:
+                                try: awVar = awVar.decode('utf-8', 'ignore').encode(encoding, 'ignore')
+                                except: pass
                                 c.game(gameNumber)
                                 s = lower(c.outputVar(c.currentN))
@@ -4204 +4224 @@
                         if gameNumber == -1:   
 
+                            # is there an encoding tag?
+
+                            enc_begin = find(sgf, 'CA[')
+                            if enc_begin != -1:
+                                encoding = lower(strip(sgf[enc_begin+3: find(sgf, ']', enc_begin)]))
+                            else:
+                                encoding = db['encoding']
+                                
+                            if encoding != 'utf-8':
+                                try: sgf = sgf.decode(encoding, 'ignore').encode('utf-8', 'ignore')
+                                except: pass
+
                             if awVar and find(sgf, awVar) == -1: continue
 
@@ -4224 +4256 @@
                                 
                             node = c.getRootNode(gameNumber)
+
+                            encoding = c.encoding or db['encoding']
                             
                             ok = 1
                             for var,tag in [(evVar,'EV')]:
+                                try: var = var.decode('utf-8', 'ignore').encode(encoding, 'ignore')
+                                except: pass
                                 if var and not (node.has_key(tag) and find(node[tag][0], var) != -1):
                                     ok = 0
@@ -4232 +4268 @@
 
                             if awVar:
+                                try: awVar = awVar.decode('utf-8', 'ignore').encode(encoding, 'ignore')
+                                except: pass
                                 c.game(gameNumber)
                                 s = c.outputVar(c.currentN)
@@ -5127 +5165 @@
 
 
-    def openViewer_external(self, filename, gameNumber, moveno):
+    def openViewer_external(self, filename, gameNumber, moveno, encoding = ''):
         if self.options.altViewerVar1.get():
                 
@@ -5167 +5205 @@
             window.protocol('WM_DELETE_WINDOW', viewer.quit)
 
-            apply(viewer.openFile, os.path.split(filename))
+            apply(viewer.openFile, os.path.split(filename) + (encoding,))
             viewer.changeCurrentFile(None, 1)
             viewer.delFile()
@@ -5196 +5234 @@
 
     def openViewer_internal(self, filename, gameNumber, moveno, encoding):
+
         apply(self.openFile, os.path.split(filename) + (encoding,))
 
@@ -5229 +5268 @@
         encoding = self.getEncoding(no, label)
         if not self.options.externalViewer.get():
-            self.openViewer_external(filename, gameNumber, moveno)
+            self.openViewer_external(filename, gameNumber, moveno, encoding)
         else:
             self.openViewer_internal(filename, gameNumber, moveno, encoding)
@@ -5240 +5279 @@
         encoding = self.getEncoding(no, label)
         if self.options.externalViewer.get():
-            self.openViewer_external(filename, gameNumber, moveno)           
+            self.openViewer_external(filename, gameNumber, moveno, encoding)           
         else: # don't open external viewer
             self.openViewer_internal(filename, gameNumber, moveno, encoding)
@@ -5961 +6000 @@
         t = []
         
-        t.append('Kombilo 0.5j - written by Ulrich Goertz (u@g0ertz.de)\n\n')
+        t.append('Kombilo 0.5k - written by Ulrich Goertz (u@g0ertz.de)\n\n')
         t.append('Kombilo is a go database program.\n')
         t.append('You can find more information on Kombilo and the newest ')