Get charset from environment

diff --git a/obexftp b/obexftp
index 3eff7bfda4c17c5c7291d3a77a7ed18e178604a8..211fbf74f9529f118fa3e3f45a67d6d7a404ec69 100755 (executable)
--- a/obexftp
+++ b/obexftp
@@ -64,7 +64,7 @@ named in $TMP environment variable.
 
 """
 
-__version__ = "1.3.2"
+__version__ = "1.4.0"
 __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2004-2013 PhiloSoft Design"
 __license__ = "GPL"
@@ -76,9 +76,34 @@ obexftp_prog = "/usr/bin/obexftp"
 
 import sys, os, shutil
 from time import sleep
-import xml.dom.minidom, locale
+import xml.dom.minidom
 from tempfile import mkstemp, mkdtemp, _candidate_tempdir_list
 
+try:
+   import locale
+   use_locale = True
+except ImportError:
+   use_locale = False
+
+if use_locale:
+   # Get the default charset.
+   try:
+      lcAll = locale.getdefaultlocale()
+   except locale.Error, err:
+      print >>sys.stderr, "WARNING:", err
+      lcAll = []
+
+   if len(lcAll) == 2:
+      default_encoding = lcAll[1]
+   else:
+      try:
+         default_encoding = locale.getpreferredencoding()
+      except locale.Error, err:
+         print >>sys.stderr, "WARNING:", err
+         default_encoding = sys.getdefaultencoding()
+else:
+   default_encoding = sys.getdefaultencoding()
+
 
 import logging
 logger = logging.getLogger('obexftp-mcextfs')
@@ -123,7 +148,6 @@ 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,7 +262,7 @@ def recursive_list(directory='/'):
 
    for entry in directories + files:
       fullpath = "%s/%s" % (directory, entry.name)
-      fullpath = fullpath.encode(charset)
+      fullpath = fullpath.encode(default_encoding)
       if fullpath.startswith('//'): fullpath = fullpath[1:]
       print entry.perm, "1 user group", entry.size, entry.mtime, fullpath
 

diff --git a/obexftp-ANNOUNCE b/obexftp-ANNOUNCE
index 1f5190a71545a5591354301bccbcf544efe562d6..069ee296d017f230f76935354d56791c876e960a 100644 (file)
--- a/obexftp-ANNOUNCE
+++ b/obexftp-ANNOUNCE
@@ -6,6 +6,9 @@ WHAT IS IT
 binary.
 
 
+WHAT'S NEW in version 1.4.0 (2013-11-??)
+   Get charset from the environment.
+
 WHAT'S NEW in version 1.3.2 (2013-11-11)
    Documented the fact that the script can be put in $HOME/.mc/extfs.d.
 

diff --git a/torrent b/torrent
index ebaa7bf295dbaf3fc7950c331283697e7d81e60d..b02c90de0d4e1d33294dae16e6e849675c02f799 100755 (executable)
--- a/torrent
+++ b/torrent
@@ -27,14 +27,40 @@ year. The filesystem is, naturally, read-only.
 
 """
 
-__version__ = "1.1.1"
+__version__ = "1.2.0"
 __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2010-2013 PhiloSoft Design"
 __license__ = "GPL"
 
-import locale, sys, os
+
+import sys, os
 from eff_bdecode import decode
 
+try:
+   import locale
+   use_locale = True
+except ImportError:
+   use_locale = False
+
+if use_locale:
+   # Get the default charset.
+   try:
+      lcAll = locale.getdefaultlocale()
+   except locale.Error, err:
+      print >>sys.stderr, "WARNING:", err
+      lcAll = []
+
+   if len(lcAll) == 2:
+      default_encoding = lcAll[1]
+   else:
+      try:
+         default_encoding = locale.getpreferredencoding()
+      except locale.Error, err:
+         print >>sys.stderr, "WARNING:", err
+         default_encoding = sys.getdefaultencoding()
+else:
+   default_encoding = sys.getdefaultencoding()
+
 import logging
 logger = logging.getLogger('torrent-mcextfs')
 log_err_handler = logging.StreamHandler(sys.stderr)
@@ -53,9 +79,7 @@ This is not a program. Put the script in $HOME/.mc/extfs.d or
 )
     sys.exit(1)
 
-
 locale.setlocale(locale.LC_ALL, '')
-charset = locale.getpreferredencoding()
 
 
 def mctorrent_list():
@@ -87,27 +111,27 @@ def mctorrent_list():
             if 'path.utf-8' in file:
                 if name_utf8:
                     path = '/'.join([name_utf8] + file['path.utf-8'])
-                    if charset and (charset != 'utf-8'):
-                        path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+                    if default_encoding != 'utf-8':
+                        path = path.decode('utf-8', 'replace').encode(default_encoding, 'replace')
                 else:
                     _name_utf8 = name
                     if encoding and (encoding != 'utf-8'):
                         _name_utf8 = _name_utf8.decode(encoding, 'replace').encode('utf-8', 'replace')
                     path = '/'.join([_name_utf8] + file['path.utf-8'])
-                    if charset and (charset != 'utf-8'):
-                        path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+                    if default_encoding != 'utf-8':
+                        path = path.decode('utf-8', 'replace').encode(default_encoding, 'replace')
             else:
                 if name_utf8:
                     path = file['path']
                     if encoding and (encoding != 'utf-8'):
                         path = path.decode(encoding, 'replace').encode('utf-8', 'replace')
                     path = '/'.join([name_utf8] + path)
-                    if charset and (charset != 'utf-8'):
-                        path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+                    if default_encoding != 'utf-8':
+                        path = path.decode('utf-8', 'replace').encode(default_encoding, 'replace')
                 else:
                     path = '/'.join([name] + file['path'])
-                    if charset and encoding and (charset != encoding):
-                        path = path.decode(encoding, 'replace').encode(charset, 'replace')
+                    if encoding and (default_encoding != encoding):
+                        path = path.decode(encoding, 'replace').encode(default_encoding, 'replace')
             length = file['length']
             paths.append((path, length))
     else: # One-file torrent
@@ -115,10 +139,10 @@ def mctorrent_list():
             torrent_error('Unknown length')
         length = info['length']
         if name_utf8:
-            if charset and (charset != 'utf-8'):
-                name = name_utf8.decode('utf-8', 'replace').encode(charset, 'replace')
-        elif charset and encoding and (charset != encoding):
-            name = name.decode(encoding, 'replace').encode(charset, 'replace')
+            if default_encoding != 'utf-8':
+                name = name_utf8.decode('utf-8', 'replace').encode(default_encoding, 'replace')
+        elif encoding and (default_encoding != encoding):
+            name = name.decode(encoding, 'replace').encode(default_encoding, 'replace')
         paths = [(name, length)]
 
     meta = []
@@ -126,7 +150,7 @@ def mctorrent_list():
                 'created by', 'creation date', 'encoding', \
                 'nodes', 'publisher', 'publisher-url':
         if name == 'comment' and 'comment.utf-8' in torrent:
-            data = torrent['comment.utf-8'].decode('utf-8').encode(charset, 'replace')
+            data = torrent['comment.utf-8'].decode('utf-8').encode(default_encoding, 'replace')
             meta.append(('.META/' + name, len(data)))
         elif name in torrent:
             if name == 'announce-list':
@@ -163,7 +187,7 @@ def mctorrent_copyout():
                 'created by', 'creation date', 'encoding', \
                 'nodes', 'publisher', 'publisher-url':
         if name == 'comment' and 'comment.utf-8' in torrent:
-            data = torrent['comment.utf-8'].decode('utf-8').encode(charset, 'replace')
+            data = torrent['comment.utf-8'].decode('utf-8').encode(default_encoding, 'replace')
             meta.append(('.META/' + name, len(data)))
         elif torrent_filename == '.META/' + name:
             if name in torrent:

diff --git a/torrent-ANNOUNCE b/torrent-ANNOUNCE
index 6f232f5dcb96a4869f1c043770d4b37144f12a9c..1d55cc1820e728f670df7202f4bc4562a066e463 100644 (file)
--- a/torrent-ANNOUNCE
+++ b/torrent-ANNOUNCE
@@ -6,6 +6,9 @@ WHAT IS IT
 Midnight Commander.
 
 
+WHAT'S NEW in version 1.2.0 (2013-11-??)
+   Get charset from the environment.
+
 WHAT'S NEW in version 1.1.1 (2013-11-11)
    Documented the fact that the script can be put in $HOME/.mc/extfs.d.