Using code from win-unicode-console to make sure that console is in U…

…nicode mode under Windows

README.md

@@ -20,9 +20,10 @@ Here is brief list of changes:
 * Added support for latest Kidle firmware (>= 5.7.2)
 * Added simple tool to generate simple thumbnails on Kindle devices
 
-Program uses source code (modified) from following projects released under GPL:
+Program uses source code (modified) from following projects released under GPL and MIT licenses:
 
 * [KindleUnpack](https://github.com/kevinhendricks/KindleUnpack)
+* [win-unicode-console](https://github.com/Drekin/win-unicode-console)
 
 In order to build [Windows releases](https://github.com/rupor-github/fb2mobi/releases) I am using Python 3.5.2, [this fork](https://bitbucket.org/anthony_tuininga/cx_freeze/pull-requests/87/allow-proper-handling-of-unicode-command/diff) of cx_Freeze 5.0 and following libraries:
 

fb2mobi.py

@@ -11,7 +11,12 @@
 import zipfile
 import time
 import shutil
+
 import version
+from version import WINDOWS
+
+if WINDOWS:
+    import wincon
 
 from modules.utils import transliterate
 from modules.fb2html import Fb2XHTML
@@ -516,6 +521,10 @@ def process(args):
 
 
 if __name__ == '__main__':
+
+    if WINDOWS:
+        wincon.enable()
+
     # Настройка парсера аргументов
     argparser = argparse.ArgumentParser(
         description='Converter of fb2 and epub ebooks to mobi, azw3 and epub formats. Version {0}'.format(

synccovers.py

@@ -5,6 +5,10 @@
 
 import argparse
 import version
+from version import WINDOWS
+
+if WINDOWS:
+    import wincon
 
 from modules.mobi_split import mobi_read
 
@@ -79,20 +83,8 @@ def process_folder(inputdir, verbose):
 
 if __name__ == '__main__':
 
-    if sys.platform == "win32":
-        class UniStream(object):
-            __slots__ = ("fileno", "softspace",)
-
-            def __init__(self, fileobject):
-                self.fileno = fileobject.fileno()
-                self.softspace = False
-            def write(self, text):
-                os.write(self.fileno, text.encode("utf-8", errors='ignore'))
-            def flush(self):
-                pass
-
-        sys.stdout = UniStream(sys.stdout)
-        sys.stderr = UniStream(sys.stderr)
+    if WINDOWS:
+        wincon.enable()
 
     argparser = argparse.ArgumentParser(description='Synchronize covers for side-loaded books on Kindle. Version {0}'.format(version.VERSION))
     argparser.add_argument('inputdir', type=str, nargs='?', default=None,  help='Directory on mounted device to look for books.')

version.py

@@ -1,3 +1,7 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
+
+import platform
+
+WINDOWS = platform.system().lower() == "windows"
 
 VERSION = u'3.3.1'