From 2e96db6cdcd310902c4711c60014cec9cef67153 Mon Sep 17 00:00:00 2001
From: apprenticeharper <apprenticeharper@gmail.com>
Date: Tue, 8 Sep 2015 07:52:06 +0100
Subject: [PATCH] More changes to the obok cli interface for character
 encodings

---
 Obok_calibre_plugin/obok_plugin.zip          | Bin 60744 -> 60732 bytes
 Obok_calibre_plugin/obok_plugin/obok/obok.py |   4 ++--
 Other_Tools/Kobo/obok.py                     |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Obok_calibre_plugin/obok_plugin.zip b/Obok_calibre_plugin/obok_plugin.zip
index 144ad0e8d130a67ba4498de81a8407afbd145599..3e1b918528975c691398c6c3339748fe7af4e948 100644
GIT binary patch
delta 1325
zcmV+|1=9M++5^1W1F$Vx4FEnUM~<;p4F?+l03owFTB#O)g(Yc2+LS^RIpZ0n7Y%n>
zZ9jeIH~YN3HHOmrr>Q$TkA2L}%+9PVEz|Cw>aDFXNmW@^KMTox^uL5NT9J~ax;xE=
z4Ktbq9l5Dg9zMy3>1K%+SW;tXy8+Dd;ZiNTm&$g^_;rIg$zRB4#&Mu<81BrhHryr2
zF+9Bj_D+0%f9lUUSr1%UgmTD*-7dIUl6B=%E@jgQ5FA`)&&KUz^Mu9-c3>>NqyCo@
zt5jf#g9@z4qdiQJ0kmE)Np=jKeLGpA%!8XO4%Ez`I)mF*lKjFFb*SC(DCYt}OuZVl
zrHP6~Mx2o2cNwR7qH4j>KukMwOQ@1{?`>Yvslk$e`<iz+P){xXL-%;t>s3xa5LhK}
zhNx8n_KS@>vOH8Q^&?rPKW?tOqSACJ1@Lo5rk%Mx;yL>BHJOfv3_aLRr-SX}9sc#<
znfSj8_v!ZH3epvb>YT3HEZO==DfoP01K~?v21TXsZ_PJvH~C_T+$cmkMPG%Zsq`&Z
zsv$6c70X!4Sc0G3e6?ue^a+)`vuA0X++CiD<CEh<aS|OB$kFk=LMA$?9TVdkAI2Qx
zGNaV$bluBUvYhBZf<?Ai)inanDt5Km#Af*sba9C&1U=CSJD+xbTAg92>nTz5x_TMU
z5-?={t&+EhEc<s`3Q?=m7zP#xl!Hb`zO){Hi~v=9c2L>{q4e+XOU}4acs+Ma6udJs
z-ni+s+{bi2dL~E4q++D=vGQPbKA<@nc>J0sD3>hA6~lW7DDa46x`V@<+*S2jb<!2p
zye6umK1XeeM4+xz4Q|4vGRon6#2d1SaDP<M#y=C4!ObX&g!Uwhml)Kp)|^G>ObO$E
z=n2E^1K?XiuOFS-Yd3OJ^bzhVCG{rT`N|H9QXh&_B3W@o)KFm;nc+e%@`23YH8vhn
z@0U|?uX1?f^ko+F_|N5&D4Q8MKm786fdBq0PI*yCzr%(C35_xtE7d&W3=>R@^)Cnc
zU^9e+IjXr*G)0?l0`EWf&%T^r*m*;LEJ}jC8jDh6RCq^+Rh@H508c_*g1cAqT!$Co
zA%kgPz?3|V5+%3}B9HO1Q=HR;_*r^S$?9=4sW(C>czWAL#4O3zDK0rXb{l9Lk|q_)
zNeA;CiOv1vw+v4(z`Vo3q9ENPWrV*T-GhZMOEdC{ua-+hrqt=7o69$Me`IBUhQGR$
zXtb_2Gz6x#e>*zAxV*-zAD+VE<QKi<<_iuG;BQ2tO37OI9PMKQ4H`jM8M^3sGWYts
z_*6tC(BVNN+>x8&aLCeY!?*0$g!><eTRKD&t{qt;EQaE36^HwcWlMg|IL6Zyn{3Ii
z8ilavz=J!nJ4D6jF97D8t;PC(E9_zw$W(GteP$YVO32`)EJl3)VGrRm8>e0TJzP>@
z)owS)&ADI4)5J!=*5W#NnvKd^<s;su^;Nfw8!cVzg56#CL7k&gHgucAm;(}2K$HF(
z@p(ELY0DHD8~JKNlzPRoiMnlR6hM<K+W|@~4k+s>dw^5RUr<W}1QY<XW_1sA4FEnU
zM~<;p4F?+l03nlt=}Q4rlg{Zt0ko43>P`XklV0jS0dbR_>OTQyliun-0r8U_>pua;
zlV0mY0(qK~p_&wvxa%qbpp)b4KLO>FBkVr`a+721KLJ6LqwGHc-;?9)KPIl+004D#
jX>4h9X=QURaCuNm1qJ{B000*N7XYCJ004#O00000rAB>^

delta 1324
zcmV+{1=ISx+5^bi1F$Vx4Jtt=N5-S5AQKw^06MceTB#O)MM~0!v?+xsa>g?ry=b^I
z)%MeOezVWpTVp7_f10|p^VrAi%<Rm{(lYJ-sovTOlT?*u^|O@BNB>JWqZKJxs=L!{
z*f66>(2<);<>8Zjm~NJMi6u3Lwj01KA1>9Zd#P-voL@JHlj50tW*i3!hvCl5YRg@c
z9K+KqVCTetU(WnFC+mSLi%<@^u-gSUOR}zf#-(f;0fK|e{K>d|Y@W~<!48bYchvuK
zVwDOkaZrIZd9;HGGJswdOp+Z#XWvejDD&VZivu+?sLtTFl_bBgL>+3kJj#VY5L2&4
zZE2!nkr5~4_?^dDk*Hd5G!WB{+!Cr{-FustbZW4F<i6n@4%AbNf8ReG4F<L24+K^V
zoFQtJfc<jgmMjkyOZ`Ze>5uEHzNocbN&)<wk!fdchj@<ud`+f<5kn6*v)OPneTRR2
zcqabu!hO0qyMS~hqB^ImF;6yrQVKp_*g*J_mqA(S`&;wP+fBY$A~y<=&d^ukXe)io
zm1+ooOvN&mGLhgX*IzA~ID14T@BB#`C%5M(;_&EjUmQgTC319puaJpOYRAO5Ci^kR
zxXdVZdVTkDl`JPZkYJH5R!xn7vx;49HnmxP1YKSt3c*11!p^6ipH6QS>UvDnyslox
zvjhy;f2-szBFp~$jzZMwwMK!(0p+04kuR-(2O~fgpB<ELNhtmM`-(Ge6yCrc69w;#
zj5lsNE%zZy$4}(Qm{g1`ohT1h=L4FPfyb|Hf^x}%Trs?dfC7(5raL&y$z9cK)Tez>
zFB+mQnki~iBm#A%+A@2KM;V??`nXu;iM6hYipn*ITN1CyTEfjzO}homjtqN7Q6#i~
zk6FInpmwzyEjnki7{@>uIqm`95qf3mq+h$m+u{;|uu8gbvPoBVz?5Q9oD#{JE4+pZ
zJI@Rka-R2OZm+Takd(iii940u8)wh+m}e%HkEN{V<QDOp2m+q{uQ=o7B0UltBqTJ-
zn5@-{h;vUcW!Cc?7Q^*Oxt>;tw&?PI72)0I%abpsXV#2BkV=BR8l+M~RC-{Cb)a*5
z02f2vj=OjET%Z@>g@ajOyp%Yt3MKdyqKNV2Q(Vw|`00C($?9P}ZMH%vcy_x+#5^fp
zGTeUl?EcWkCCw>TlaBH`5}S+3Z#mv(fZc}^M?t!0%@}_@xF-(ZqUPi-Uo4k@2wACP
zMK@Qk^!~__4S#Vd(P&w%X$VZ~<<0o??EDJPfq0sXvtsm$OBWnDz~2Z_RkFD7Icmv7
zAT)xomUPkcWbSl?@u^Ttpu@dJxFu=D;gF@*7ID?#3HRR<H*~rtTvYOccp0j?Re<g{
zmMu9vlNfJStn(#5cND^+BNFa^#BLE4pT7W@b2cNJuds_%Aal$~^O<SbDj|bc(i`#p
zhdqSPY@BZS_i(L+)w=y4H>ZAqPa7KnTZ;?iX*Ozam5+FrW?9oRZj^Mn3wC$u2X(+o
z+0ZS8l?Nm!jVAp!=7V-T)+Q@bIf~VkC=JT>6iwUGDuE_>z6F$898lH@Q}$%1mcLL-
z0|b+u=^C?gb@y`(DnTbl#-pep6B_^kI+J$kO9EhZlW=tvli2Ah0>F2Z(03)1De5Qz
z|C3VcKLLG{lIlMJa+A{PKLP!d66-$!(vwo_L;;19m+L<PtdrO4KLYW$lL5FClPv5i
i0e+KL>^}iblb7s20qc|3>^}jzlNaqD29f6g0000~*oUS7

diff --git a/Obok_calibre_plugin/obok_plugin/obok/obok.py b/Obok_calibre_plugin/obok_plugin/obok/obok.py
index d619a26..18e629b 100644
--- 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 d619a26..18e629b 100644
--- 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"