Changeset 63

Timestamp:

02/12/04 21:25:12 (5 years ago)

Author:

ug

Message:

Encodings support in v.py

Files:

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

05/devel/kombilo.py

@@ -572 +572 @@
-        backup = copy(rootNode)
-
-
+
+
+
+
+
+
+
-        if backup != newRootNode:
-            c.updateRootNode(newRootNode, gameNumber)

05/devel/v.py

@@ -47 +47 @@
-
-try:
+    print 'do not use sgfpars'
+    aaa
-    from sgfpars import Node, Cursor, SGFError, SGFescape
-except:
@@ -927 +929 @@
-
-        currentGame = cursor.currentGame
-
+
-        try:
-            node = cursor.getRootNode(currentGame)
@@ -933 +935 @@
-        
-        t = []
-
-
+
+
+
-        else: t.append(' ?')
-
+
+
+
-            t.append(', ')
-node['WR'][0]
+s1
-
-        t.append(' - ')
-
-
+
+
-        else: t.append(' ?')
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        t.append('\n')
@@ -956 +969 @@
-        if node.has_key('DT'): t.append(node['DT'][0] + '\n')
-
-if node.has_key('GC'):
-    gc = node['GC'][0]
-gc
-gc
-gc
-gc
-
-t
+s1 = cursor.transcode('GC',node)
+if s1:
+s1
+s1
+s1
+s1
+
+s1
-
-        self.gameinfo.config(state=NORMAL)
@@ -1035 +1048 @@
-
-
+    def transcode(self, prop, node = None):
+        if type(node) == type({}):
+            d = node
+        elif node:
+            d = node.getData()
+        else: d = self.currentNode()
+        if not d.has_key(prop) or not d[prop]: return ''
+        s = d[prop][0]
+        if self.encoding:
+            try:
+                s = s.decode(self.encoding.lower()) # .encode('utf-8')
+            except:
+                pass        
+        return s
+
+
-    def updateTree(self, update=1):
-        self.SGFtreeCanv.canvas.delete('all')
@@ -1077 +1106 @@
-            s = '[' + `i` + '] '
-
+            
-            d = n.getData()
-if d.has_key('PW'): s += d['PW'][0]
+s += self.transcode('PW',n)
-            s += ' - '
-
-
+
+
+
-
-            self.mster.dataWindow.gamelist.insert(END, s)
@@ -1353 +1384 @@
-        try:
-
-
-
-
-
+
+
-            self.master.title(pw + ' - ' + pb)
-
@@ -1883 +1912 @@
-        self.comments.delete('1.0', END)
-        if c.has_key('C'):
-c['C'][0]
+self.cursor.transcode('C',c)
-
-        for type in ['CR', 'MA', 'SQ', 'TR']:
@@ -2273 +2302 @@
-        if not self.cursor: return
-
-
+
+
+
+
+
+
+
+
-        changed = 0
-
@@ -2406 +2442 @@
-        if not f: return
-        try:
-
+ 
-            file = open(f, 'w')
-            file.write(sgf_out)
@@ -2532 +2568 @@
-            self.gameinfoDict[key] = [self.gameinfoVars[key].get()]
-          
-
-
+
-
-        for key in keylist + ['GC']:
@@ -2541 +2576 @@
-        s = self.gameinfoOthersText.get('1.0', END)
-        try:
-.encode('utf-8', 'ignore')
+
-            for k in d.keys():
-                self.gameinfoDict[k] = d[k]
@@ -2552 +2587 @@
-            showwarning('SGF Error', "Parse error in 'Other SGF tags'")
-        else:
+
+            for k in self.gameinfoDict.keys():
+                try:
+                    self.gameinfoDict[k] = [ x.encode(self.gameinfoDictencoding)\
+                                             for x in self.gameinfoDict[k] ]
+                except:
+                    pass
+                
+            if not self.returnChanges: self.currentFileChanged()
+
+            
-            self.gameinfoWindow.destroy()
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        """ Open window with the game info of the current game."""
-
+        if encoding is None: encoding = self.cursor.encoding
-        if not data and not self.cursor:
-            return
@@ -2575 +2632 @@
-        self.gameinfoWindow = window
-        window.title('Game Info')
+
+        if encoding:
+            self.gameinfoDictencoding = encoding
+            for k in self.gameinfoDict.keys():
+                try:
+                    self.gameinfoDict[k] = [x.decode(encoding) for x in self.gameinfoDict[k]]
+                except:
+                    pass
+        else:
+            self.gameinfoDictencoding = 'utf-8'
-        
-        keylist = ['GC', 'PB', 'BR', 'PW', 'WR', 'EV', 'RE', 'DT', 'KM']
@@ -2622 +2689 @@
-        self.gameinfoOthersText.insert(END, self.gameinfoVars['others'].get())
-        
-window.destroy
+self.gameinfoCancel
-        Button(window, text="OK", command = self.gameinfoOK).pack(side=RIGHT)
-        
@@ -2637 +2704 @@
-
-            d = self.gameinfoDict
-if d.has_key('PW'): s += d['PW'][0]
+s += self.cursor.transcode('PW',d)
-            s += ' - '
-if d.has_key('PB'): s += d['PB'][0]
-d['RE'][0]
+s += self.cursor.transcode('PB',d)
+self.cursor.transcode('RE',d)
-
-            self.dataWindow.gamelist.delete(self.cursor.currentGame)