Merge branch 'master' of /home/phd/lib/xsetbg

[xsetbg.git] / print-filename.py

diff --git a/print-filename.py b/print-filename.py
index 583f54a3b669aeeabe9795bd820e597528a8e16f..91088c25a5752e690d43c0a571f8ed056f757550 100755 (executable)
--- a/print-filename.py
+++ b/print-filename.py
@@ -7,12 +7,8 @@ This file is a part of XSetBg.
 
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2004-2010 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2004-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
@@ -28,15 +24,19 @@ def get_args():
    from getopt import getopt, GetoptError
 
    try:
-      options, arguments = getopt(sys.argv[1:], "ho", ["help", "old"])
+      options, arguments = getopt(sys.argv[1:], "he:o",
+                                  ["help", "output-encoding=", "old"])
    except GetoptError:
       usage(1)
 
    old = False
+   output_encoding = None
 
    for option, value in options:
       if option in ("-h", "--help"):
          usage()
+      elif option in ("-e", "--output-encoding"):
+         output_encoding = value
       elif option in ("-o", "--old"):
          old = True
       else:
@@ -45,9 +45,12 @@ def get_args():
    if arguments:
       usage(3)
 
-   return old
+   if output_encoding is None:
+      from m_lib.defenc import default_encoding
+      output_encoding = default_encoding
+   return old, output_encoding
 
-old = get_args()
+old, output_encoding = get_args()
 
 
 xsetbg_dir = os.path.join(os.environ["HOME"], "lib", "xsetbg")
@@ -66,7 +69,11 @@ else:
 filename = global_db[key]
 global_db.close()
 
-from m_lib.defenc import default_encoding
-filename = unicode(filename, default_encoding)
+from ConfigParser import SafeConfigParser
+config = SafeConfigParser()
+config.read("xsetbg.conf")
+
+fs_encoding = config.get("images", "fs_encoding")
+filename = unicode(filename, fs_encoding)
 
-print filename.encode(default_encoding)
+print filename.encode(output_encoding)