From: Oleg Broytman <phd@phdru.name>
Date: Sun, 21 Jul 2013 15:40:16 +0000 (+0400)
Subject: Set output encoding
X-Git-Tag: v4.0.0~6
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=46d5dc4e5b2f0ce71dc89d537c0756526cdfe5d1;p=xsetbg.git

Set output encoding
---

diff --git a/print-filename.py b/print-filename.py
index 6d14255..91088c2 100755
--- a/print-filename.py
+++ b/print-filename.py
@@ -24,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:
@@ -41,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")
@@ -69,5 +76,4 @@ config.read("xsetbg.conf")
 fs_encoding = config.get("images", "fs_encoding")
 filename = unicode(filename, fs_encoding)
 
-from m_lib.defenc import default_encoding
-print filename.encode(default_encoding)
+print filename.encode(output_encoding)