More changes to the obok cli interface for character encodings

diff --git a/Obok_calibre_plugin/obok_plugin.zip b/Obok_calibre_plugin/obok_plugin.zip
index 144ad0e8d130a67ba4498de81a8407afbd145599..3e1b918528975c691398c6c3339748fe7af4e948 100644 (file)
Binary files a/Obok_calibre_plugin/obok_plugin.zip and b/Obok_calibre_plugin/obok_plugin.zip differ

diff --git a/Obok_calibre_plugin/obok_plugin/obok/obok.py b/Obok_calibre_plugin/obok_plugin/obok/obok.py
index d619a26ae53af02bb11ac39674e115c4b2cb08d4..18e629bccef21148db2e7ea9c0aa8a339b20d93b 100644 (file)
--- a/Obok_calibre_plugin/obok_plugin/obok/obok.py
+++ b/Obok_calibre_plugin/obok_plugin/obok/obok.py
@@ -486,7 +486,7 @@ def cli_main():
     lib = KoboLibrary()
 
     for i, book in enumerate(lib.books):
-        print ('%d: %s' % (i + 1, book.title)).encode('ascii', 'ignore')
+        print ('%d: %s' % (i + 1, book.title))
 
     num_string = raw_input("Convert book number... ")
     try:
@@ -499,7 +499,7 @@ def cli_main():
 
     zin = zipfile.ZipFile(book.filename, "r")
     # make filename out of Unicode alphanumeric and whitespace equivalents from title
-    outname = "%s.epub" % (re.sub('[^\s\w]', '', book.title, 0, re.UNICODE))
+    outname = "%s.epub" % (re.sub('[^\s\w]', '_', book.title, 0, re.UNICODE))
 
     if (book.type == 'drm-free'):
         print "DRM-free book, conversion is not needed"

diff --git a/Other_Tools/Kobo/obok.py b/Other_Tools/Kobo/obok.py
index d619a26ae53af02bb11ac39674e115c4b2cb08d4..18e629bccef21148db2e7ea9c0aa8a339b20d93b 100644 (file)
--- a/Other_Tools/Kobo/obok.py
+++ b/Other_Tools/Kobo/obok.py
@@ -486,7 +486,7 @@ def cli_main():
     lib = KoboLibrary()
 
     for i, book in enumerate(lib.books):
-        print ('%d: %s' % (i + 1, book.title)).encode('ascii', 'ignore')
+        print ('%d: %s' % (i + 1, book.title))
 
     num_string = raw_input("Convert book number... ")
     try:
@@ -499,7 +499,7 @@ def cli_main():
 
     zin = zipfile.ZipFile(book.filename, "r")
     # make filename out of Unicode alphanumeric and whitespace equivalents from title
-    outname = "%s.epub" % (re.sub('[^\s\w]', '', book.title, 0, re.UNICODE))
+    outname = "%s.epub" % (re.sub('[^\s\w]', '_', book.title, 0, re.UNICODE))
 
     if (book.type == 'drm-free'):
         print "DRM-free book, conversion is not needed"