Merge pull request schodet#133 from feinstaub/nxtfilemgr1

Fixes for nxtfilemgr

nxt/telegram.py

@@ -71,7 +71,8 @@ def add_string(self, n_bytes, v):
         self.pkt.write(pack('%ds' % n_bytes, v.encode('windows-1252')))
 
     def add_filename(self, fname):
-        self.pkt.write(pack('20s', fname.encode('utf-8')))
+      self.pkt.write(pack('20s', fname.encode('windows-1252')))
+
 
     def add_s8(self, v):
         self.pkt.write(pack('<b', v))

scripts/nxtfilemgr

@@ -151,7 +151,7 @@ class NXTListing(Gtk.ListStore):
     def populate(self, brick, pattern):
         f = FileFinder(brick, pattern)
         for (fname_b, size) in f:
-            fname = fname_b.decode('utf-8')
+            fname = fname_b.decode('windows-1252')
             self.append((fname, str(size)))
 
 
@@ -282,8 +282,11 @@ class NXT_FileMgr(Gtk.Window):
             prot_version, fw_version = self.brick.get_firmware_version()
             print("Protocol version: %s.%s" % prot_version)
             if prot_version == PROTOCOL_VER:
-                brick_name, brick_hostid, brick_signal_strength, brick_user_flash = self.brick.get_device_info()
+                brick_name_b, brick_hostid, brick_signal_strength, brick_user_flash = self.brick.get_device_info()
                 connection_type = str(self.brick.sock)
+                brick_name_str = brick_name_b.decode('windows-1252')
+                print("brick_name_b = {0}, brick_name_str = {1}".format(brick_name_b, brick_name_str))
+
                 if DEBUG:
                     print("Brick Info: ", connection_type, brick_name, brick_hostid, brick_signal_strength, fw_version, brick_user_flash)
                 self.brick_info_str = "%s ==> %s [%s]\tFirmware: v%s.%s\tFreespace: %s" % (connection_type, brick_name, brick_hostid, fw_version[0], fw_version[1], brick_user_flash)