Ignore my Siemens-S55 obexftp transport file and obexftp-mcextfs.log.

[extfs.d.git] / obexftp

diff --git a/obexftp b/obexftp
index fb183553744999328456220f9e64134296ee8424..1f4a0339b324b4e165a0a3f5fc4040a06fe4a143 100755 (executable)
--- a/obexftp
+++ b/obexftp
@@ -4,7 +4,7 @@
 ObexFTP Virtual FileSystem for Midnight Commander.
 
 Author: Oleg BroytMann <phd@phd.pp.ru>.
-Copyright (C) 2004 PhiloSoft Design.
+Copyright (C) 2004, 2005 PhiloSoft Design.
 License: GPL.
 
 Manipulate a cell phone's filesystem calling obexftp binary. This is a
@@ -66,11 +66,11 @@ into a temporary directory, usually /tmp, or /var/tmp, or whatever directory
 is named in $TMP environment variable.
 """
 
-__version__ = "1.2.1"
-__revision__ = "$Id: obexftp,v 1.18 2004/10/03 13:33:03 phd Exp $"
-__date__ = "$Date: 2004/10/03 13:33:03 $"[7:-2]
+__version__ = "1.2.2"
+__revision__ = "$Id$"
+__date__ = "$Date$"[7:-2]
 __author__ = "Oleg Broytmann <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2004 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2004, 2005 PhiloSoft Design"
 
 
 # Change this to suite your needs
@@ -79,7 +79,7 @@ obexftp_prog = "/usr/local/obex/bin/obexftp"
 
 import sys, os, shutil
 from time import sleep
-import xml.dom.minidom
+import xml.dom.minidom, locale
 from tempfile import mkstemp, mkdtemp, _candidate_tempdir_list
 
 
@@ -91,7 +91,7 @@ logger.setLevel(logging.ERROR)
 
 
 if len(sys.argv) < 3:
-   logger.error("""\
+   logger.critical("""\
 ObexFTP Virtual FileSystem for Midnight Commander version %s
 Author: %s
 %s
@@ -119,12 +119,15 @@ for tempdir in tempdirlist:
       break
 
 if not found:
-   logger.error("Cannot initialize error log file in directories %s" % str(tempdirlist))
+   logger.critical("Cannot initialize error log file in directories %s" % str(tempdirlist))
    sys.exit(1)
 
 logger.removeHandler(log_err_handler)
 logger.addHandler(logging.FileHandler(logfile_name))
 
+locale.setlocale(locale.LC_ALL, '')
+charset = locale.getpreferredencoding()
+
 
 # Parse ObexFTP XML directory listings
 
@@ -238,6 +241,7 @@ def recursive_list(directory='/'):
 
    for entry in directories + files:
       fullpath = "%s/%s" % (directory, entry.name)
+      fullpath = fullpath.encode(charset)
       if fullpath.startswith('//'): fullpath = fullpath[1:]
       print entry.perm, "1 user group", entry.size, entry.mtime, fullpath
 
@@ -312,7 +316,7 @@ mcobex_rmdir = mcobex_rm
 
 
 def transport_error(error_str):
-   logger.error("Error parsing the transport file: %s" % error_str)
+   logger.critical("Error parsing the transport file: %s" % error_str)
    sys.exit(1)
 
 def setup_transport():
@@ -344,7 +348,7 @@ def setup_transport():
          transport_error("too many arguments for 'irda' transport")
       return "-i"
    else:
-      logger.error("Unknown transport '%s'; expected 'bluetooth', 'tty' or 'irda'", transport)
+      logger.critical("Unknown transport '%s'; expected 'bluetooth', 'tty' or 'irda'", transport)
       sys.exit(1)
 
 
@@ -353,7 +357,7 @@ procname = "mcobex_" + command
 
 g = globals()
 if not g.has_key(procname):
-   logger.error("Unknown command %s", command)
+   logger.critical("Unknown command %s", command)
    sys.exit(1)