From 3d247bc3bb955a9b85686f0db431157cb9dc4a10 Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Fri, 17 Feb 2017 13:46:38 +0100
Subject: [PATCH] Fix UTF-8 and "/" -> "\" issues for Win32 It works on Windows
 now

---
 VERSION                                       |   2 +-
 ...es.jar => nikiroo-utils-0.9.8-sources.jar} | Bin 39700 -> 39721 bytes
 src/be/nikiroo/fanfix/Library.java            |   2 +-
 src/be/nikiroo/fanfix/output/Cbz.java         |  10 +++++++---
 src/be/nikiroo/fanfix/output/Epub.java        |  12 ++++++++----
 src/be/nikiroo/fanfix/output/Html.java        |  10 ++++++----
 src/be/nikiroo/fanfix/output/InfoCover.java   |  11 +++++++----
 src/be/nikiroo/fanfix/output/LaTeX.java       |  11 +++++++----
 src/be/nikiroo/fanfix/output/Text.java        |  11 +++++++----
 src/be/nikiroo/fanfix/reader/LocalReader.java |  18 ++++++++++--------
 10 files changed, 54 insertions(+), 33 deletions(-)
 rename libs/{nikiroo-utils-0.9.7-sources.jar => nikiroo-utils-0.9.8-sources.jar} (71%)

diff --git a/VERSION b/VERSION
index a602fc9e..b0bb8785 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.4
+0.9.5
diff --git a/libs/nikiroo-utils-0.9.7-sources.jar b/libs/nikiroo-utils-0.9.8-sources.jar
similarity index 71%
rename from libs/nikiroo-utils-0.9.7-sources.jar
rename to libs/nikiroo-utils-0.9.8-sources.jar
index dbccbca122182540b78a387abd863fae900e38b2..3f930a41e0498a9cef074ffc2414e2120d788b81 100644
GIT binary patch
delta 4249
zcmZWsc|4Te-@a#TgJH6holJ~<k0=%LF!r6SL-u_SGi1w>rC}Ib*^(_;lVm45*_TI2
zvR7oOM;_iWy>Gwzz4!gOKj+-vbA7Mxb-w5PbEP+e%NoHndRio;i~s}z0c_3n(`Xb)
z&IV1SBKvt(A?NQb0`RqB#HBSBrWF<e95Chf)pyqy1n6l|KwJklXjB0JP$PV2Bvb$Z
z0RSHZ{j^aolCxn4el}p)Kyb>R1qgq24vgQgQ~rWtGf{G9pt`+C8dBn<$I+04IMMdM
zPfg4Z1My+K{Hf|reYHTul|>8#m^c|jef=3>cd4fQjZ_09Nz5EW@nLgulyzg2S15@I
zbPReRIzl;3g5+NhKlZ&ZBN3+zULe-ShJmm|JUe;ZPcap-ia$%P-)p9#{=bHu?T#e2
zgoMXjAM0o;g<)5qKV1l;>M?D&OpCU?4xvn;p?tPh;r<9*7G5l<+32V=7`&4GW~V9o
z3wlv>I7tSEs{PAT*e#{RqzzqV@;p|7+iF*<BeszJ$P|6SQC=T?&a1led)<p9#veI0
zdtz<+iyctNbFHq->m$uSu<_gpb@$?SRn_aHGEx!~9Wbx=6g%bn9r*YppQdgMx*tX@
zq3EV`PPzUmw?FEG4T$)7pBrHaDCg^N%Gi4yZ-LY+g6T}HOI^Cs!WsYKtD{-I<)e}7
z#@qdf7ZC4nZ6_^1GOu2R8vC1G{WMV1?<s5W<RTiDY<H*R+x`Ys=)lNh^pH9z1qG+0
zVjjfX_RU~STkp-KzP29<zJT=}lG$rYq~1N9QPMYLlZ4*<zG#WR*wxO>hK~A>!kWLm
zr%4hcYYW2nO&UFuG|d(IYc%tu0W!BX6Ul8Ysk+pvHMzfgXN3O>3a!yrc`7AVgDgyY
z7SEI-7E^BV$ce)oCn$S=g$9w&YqbKp^Ng;EG`9ys{t5*z)KJ%$v~*$pfa+liv(my0
zd5&3+CeWI_gV(5InS}>c<7C}s@JPl5$ATuip4mfaj)xie%{47{3xwv~7@2@kTj@O>
z2~vr_Imx7$^Yg7DF)84FllM0xKlUB(K4Jp76!5#Xv%ifbiA$fqlE=Q{y*<%8zdGpW
zuTYFJB8LbuM;Hdp&CBiWW4Qybb<R#ySc*1MV5>Ofs&ex^>Kf#vo`83wSOxT<S)kP)
zsM!vkA?Yu-H&Y%jWt>yWYnNkDkv!y=G>~d`BU!JF>GQL{jbna*B-=?%D33^re+%!f
zH&9bpb4~DFOUt6}y9ED!ay~c02~NLHI=X>bTH(*wdDPckL;pgQ#Z^(nEqtZ9)Oc0l
z-c=3r<*@qG&-<zWFa+}RkdxxOJS4^|X@4+)!Fl5o$Mb3?PTW_x9uJ21H1RbQkn6Ed
z_1=8vXA0C?^8((L_v7wzTR-@!<LZX$qb-4wlH)&?%;!=hOZ`*1^_rsW`70bHCKtVo
zkt+1bR@rrDX|$jx-5z8yplIS4Sw*Y?N9XYR6q~#U`J+hYZV@4HR^wl$LFRQc4iy2y
z>kKek?}1RC3WzrBTPRi4v^&#W{XW7%l`^75wj;%~ETTPyiT3r2@%50e^?{P(T^A{g
z{m_k@gD+8O@*GYg@2P7y?Q~hW8C@@7l6sCK>fqaZqF0yBKdxV2y~wGda}b!^On$*=
z>&e83uc5%YQ=T`RLB$j2E@E%2<Le`H)F?#SW5ksuLEAWXGOO<j6MmJ)rKAUCG&+(K
zg0MDB+%j}Hz-TMi8*5y?bA6^gR$`8<S6ki8TTt9mpV#eqez`{IZ6CW{t*xpAjNWjd
zPu<*f?23gcx!C6tgB7$Dr_-Zp{89dWhbN?yT<53~6Fng_15L=HtVJYQey_m{vazzI
zUam#L;f4l_F*HvZONWn9Unmbaoctz2uIseqH>nfHJNu9`w9I@i;*E>`h4E|T$mV6{
z+VK1hALl@_hdv1x!<sm2r!Pvq$E=O$*NV!gbEz3RJ}HgjGEdJQcfFR1R=T|Dj%OJ3
z5aGiH7~T**qP}6uojn`Qa97@NwnOa1#ovH@HD*@ywKI;2r8~VrkRB1=$$d^4&hacu
zJR0VD%aY{9H-Y*V(&zbuW71dSs}eJ(-)k>Z^f@@U%1S$p6tf~Ula`m1D={?n;7M#t
z6dli`w64EL&8P8=f&Rh~1dV9v;F{TVXj3189V#f4_P~Oo8qt_^J<(qHOIR=8Ik<R+
zINLn(;fORk&O3SOnB2DD=>vZ=hB}d{jrIlnmyOBI8|F+O(E2=NB>gZ3I|>Ribp;D<
z_rS7Em69z(`k}5v*^YE;eoUBk2vR$q4dQ~>+EzzI@Ri?!8XOf)Sr}HdTzQq4krmMK
z{WHfoqigH3@4iYz8+52dZdunnhI`4FxBy!H|JsQ}sm3#`&$ZyJY~GcYjky8|h1^23
zPwj+BS@<@qpw(){19lEf<>pl^x{mZJ;Y_4o$qRWQ%k}99@gvg<_Lzbe+~<?%&Y>$T
zZ!WZY;rBBWJ994Q^{wo9sZ`Qfisg5ac$!RZ@1%6l8E%A&8sC>>Mk}>g9>%UZjmN=A
zcKtHqr(7oW#{|C}C`@UW!MBIu-k#YV75i3APs+3_+jiHfM1=#nT;;g+_9Exp)q>!c
zoM{~YNf&d1Nakg!-@<^F^F=kYA|^Rf&4WmN(=Rd9Ddd5MDPb2+o{%tdHfP4%c{Ueg
zqiv`-vI=ib>FTn42dQuliIA|A)c8?)Ui#I*TPoI-81lF3{e5xiy$77n9h+oneQhTq
z>>2LJ0|n#*O(%k(MKh=Z5mo1${tBrtI`0hn4jZYjDA4u|$24MErTLYS`4Xh(RfV^B
z#dLG^2j9C`>e7lby=%_p7q`3@I?PXtF6ni3ppQw>=>^^Q`i$D?3N7P-2{i|1qB<UP
zc)jB(MXo1s<^n4B1Q}f|#q|tn7q)cZ&#;cc^4NIm_)_Y~zz-=?jMcOo0nmuO%e2lt
zK4`@8U|B8Yi8h8myKpBzZnx8m(}WD6ds(q{m(rX1`X{6Lk$+9s>#5MUEoEaP=BENR
zTTc=q8*YMROfg0x+r6pCn3;{BnR)0H88J1!gr`7b&J6GKdOWYcqcXqwMUr*<hWW%0
zHk0|Zsk`xMJLsqz#i3G99=u3f_~!H~+`-z3@<-~BNgosDFgH4&z5A_V_i%8e&HYu*
zBE_wm1J}6>pvhjoVHR0VZdb!Qe-HYkCwaKRkE~51!eSbo$a+Ubo`Oaypnzs{>F?0?
z<SH2nyOWn%9Ep^=;D&v<;e=;=H92}(Udf3HAA_y)jFZ=zO+^tCVhn+!CrSz}!P3F<
z!I-AgYfeR&PP#NsnT?1A)s5wjxj7F}Wi6~zkY5_Ekm+wt6Z~figtq(3c<q<Pv2SFR
z+Y=@pA4hjTRD2m`pFvwW9-^j!KR+z*zQ`pc{0=doE=T#jq;(<6P}9u<abdz_oo;Qe
zvj}Q_2ptu8Cm?23Xo4@LIhu}fU9stEy@Ay-9)A#kL5Te8KSEmB!owdhx$KPb_@tyf
zQ6SRHBfYa&z_#}x5g)CiLw*Z}V#U8?E_W^6nY>+8#%iVidiNo=%Vut4H=;^vGX2xT
z-2MLS<AdUA8=WKfIFI(3O~j&`<9ztn(W)R^$Uz1}Wgcqh=^_{Bd$)UGEndB_M(3GJ
zep|9`n0)+h7kaQ+cD=F`cY^Rwk&8OddRZumJ5rfxe<M?m?^+xTo))<}wI#r$V|^P~
zn6tCo*7DRB{`jvB!;klZ8ol7am;^NmmpZdrb9&)sNfjJN{!9bZEZ{;7O*id*4rIjn
zniAt2^*YK|RO<9&J(B5~DCwCwN6Q7~_U<+a#+%`0&Oxf@3BQJXzUhr4dr)zXcm?m`
z-y+p>V}76SuHAXIo>_P?);Fy5(}<oNEL5THDcezr(*8iI*G%xpkl2@2==jN<YeBf1
znccbF<TojhOTuh2D(rzvulYmn2L*r6B$MiNYZ0;Fa0sNtXKt51yyY--sb5ThYK*%&
z$Q6^tIVo}ZiS4v5-gtQr$F~O^XKpNeK}HL+wLfqxImcJ<87Fw|v1CK5%{9v~eG7|2
ziPM9a<EmRSyZo~=kkVWv59&ryaa)0O^qU5g{KWn4L)39iO=auo7UlgbFPU3%)((e8
zlKZ7M+RL?nEQi%-*@#puuNE1Foj{o6M<y@{R08J{Udgcen@xF6QZk+%t7hkNCJy4q
zoZ><!qx;<<p>!Lynf6UVySi&T7Fjo9F7-A?QeA+?Kz(2BU)K?1Y)j&fcq<UtQs6Nz
zCY1W|sSvUf$EHFzCf@PSqgnT<t8|}Kj2O++wmpjLx=xLDoMlQ-UuK*2I~_h4>R8ob
zMmj!uxM^iXb*`+xj#lHRrcQV6yq>~8YfGKvm}V2@djmVwnKQCBqJ5JYwE6b!OhVrV
zx4^1W8}|gJt!NH)_tsWv@}%emMg1T$wdkZG+wf9D7GNp_B(qt~!XW+`Y1u6cqu=fO
z0QVa(3HPim-${rO=k7~pes8Kd>l>&ervB3ODf?caL`h-t4*DbJ%p_?I`3C=>1^{ER
zGm``YGXlT77PcCDiH2adG=CW>>^@eOXk0|n*_pct2F2b{{49wI_>W<-N@rJG`MKoj
z;^yM(<@Mi?Kg<o?FPn2Vp~3E^Gs1q?ab{s&;MhS*XDiqZ9E|$+Vmg`ZU}aUTPZlTk
zUM7?%tqRW$4m=A9Vi9-gu@KzP@HPP%t3gD<vxIrhJl2s~v$+ys>m0%W0RKbA-&#aq
zh(9$JiT_{PEOxNFDKUKNONafQ^)qZqsJ3cG3}@h(h_qTHQ_hb-08mE)02lwDJ+>eM
zk5N$UVkVRbelQ(iY(ohE$2<T)kn!8Idy4>;6#Q+sfAo#{Hz)v<-Ny2QS+P_ZKUoiI
z-wLu2SOK2@maupR<iP6T*oe(?$FYO|@+O8#aCAgPcGLfUYa&SBU<3gEKZ@k~5P$;z
z?{wHQ*uf<M#QHiJd_;~A*B3B(0>>fYS_u5XaXAqCK0}%aN=lv}T_*HNj1&Mw{{Z!b
z5ZD;7!?7IL>g=C=Zp~%~gTsj7&)M{d|J>8FgS<>-t8PYMxJ~%@{$P3?OH2`nC7u`$
v!3S&pe&IR)0DHxqf%*Q@HTHLL_Y-rq3$)YIA|pS;uo7Nt3IJ%pp8fp~#WV;k

delta 4138
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
B5<LI_

diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java
index b5f246c6..a8d9302b 100644
--- a/src/be/nikiroo/fanfix/Library.java
+++ b/src/be/nikiroo/fanfix/Library.java
@@ -136,7 +136,7 @@ public class Library {
 	 * @param luid
 	 *            the Library UID of the story
 	 * 
-	 * @return the corresponding {@link Story}
+	 * @return the corresponding {@link Story} or NULL if not found
 	 */
 	public Story getStory(String luid) {
 		if (luid != null) {
diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/src/be/nikiroo/fanfix/output/Cbz.java
index f618f59d..2c9dbc3f 100644
--- a/src/be/nikiroo/fanfix/output/Cbz.java
+++ b/src/be/nikiroo/fanfix/output/Cbz.java
@@ -1,8 +1,10 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
@@ -59,7 +61,8 @@ class Cbz extends BasicOutput {
 			}
 		}
 
-		FileWriter writer = new FileWriter(new File(dir, "URL"));
+		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(new File(dir, "URL")), "UTF-8"));
 		try {
 			if (meta != null) {
 				writer.write(meta.getUuid());
@@ -70,7 +73,8 @@ class Cbz extends BasicOutput {
 			writer.close();
 		}
 
-		writer = new FileWriter(new File(dir, "SUMMARY"));
+		writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(new File(dir, "SUMMARY")), "UTF-8"));
 		try {
 			String title = "";
 			if (meta != null && meta.getTitle() != null) {
diff --git a/src/be/nikiroo/fanfix/output/Epub.java b/src/be/nikiroo/fanfix/output/Epub.java
index f27391b4..3e875aa1 100644
--- a/src/be/nikiroo/fanfix/output/Epub.java
+++ b/src/be/nikiroo/fanfix/output/Epub.java
@@ -1,9 +1,11 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.net.URL;
 
 import javax.imageio.ImageIO;
@@ -14,14 +16,14 @@ import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
-import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
+import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.StringUtils;
 
 class Epub extends BasicOutput {
 	private File tmpDir;
-	private FileWriter writer;
+	private BufferedWriter writer;
 	private boolean inDialogue = false;
 	private boolean inNormal = false;
 	private File images;
@@ -119,7 +121,9 @@ class Epub extends BasicOutput {
 	protected void writeChapterHeader(Chapter chap) throws IOException {
 		String filename = String.format("%s%03d%s", "chapter-",
 				chap.getNumber(), ".xml");
-		writer = new FileWriter(new File(tmpDir + "/OPS", filename));
+		writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(new File(tmpDir + File.separator + "OPS",
+						filename)), "UTF-8"));
 		inDialogue = false;
 		inNormal = false;
 		try {
diff --git a/src/be/nikiroo/fanfix/output/Html.java b/src/be/nikiroo/fanfix/output/Html.java
index fcffec67..3ed52ad6 100644
--- a/src/be/nikiroo/fanfix/output/Html.java
+++ b/src/be/nikiroo/fanfix/output/Html.java
@@ -1,9 +1,11 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 
 import javax.imageio.ImageIO;
 
@@ -19,7 +21,7 @@ import be.nikiroo.utils.StringUtils;
 
 class Html extends BasicOutput {
 	private File dir;
-	protected FileWriter writer;
+	protected BufferedWriter writer;
 	private boolean inDialogue = false;
 	private boolean inNormal = false;
 
@@ -32,12 +34,12 @@ class Html extends BasicOutput {
 		target.mkdir();
 		dir = target;
 
-		targetName = new File(targetName, "index").getPath();
 		targetName += getDefaultExtension();
 
 		target = new File(targetDir, targetName);
 
-		writer = new FileWriter(target);
+		writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(target), "UTF-8"));
 		try {
 			super.process(story, targetDir, targetNameOrig);
 		} finally {
diff --git a/src/be/nikiroo/fanfix/output/InfoCover.java b/src/be/nikiroo/fanfix/output/InfoCover.java
index 74505e7d..1a63dce6 100644
--- a/src/be/nikiroo/fanfix/output/InfoCover.java
+++ b/src/be/nikiroo/fanfix/output/InfoCover.java
@@ -1,8 +1,10 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 
 import javax.imageio.ImageIO;
 
@@ -14,7 +16,8 @@ class InfoCover {
 	public static void writeInfo(File targetDir, String targetName,
 			MetaData meta) throws IOException {
 		File info = new File(targetDir, targetName + ".info");
-		FileWriter infoWriter = new FileWriter(info);
+		BufferedWriter infoWriter = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(info), "UTF-8"));
 
 		if (meta != null) {
 			try {
@@ -73,8 +76,8 @@ class InfoCover {
 		}
 	}
 
-	private static void writeMeta(FileWriter writer, String key, String value)
-			throws IOException {
+	private static void writeMeta(BufferedWriter writer, String key,
+			String value) throws IOException {
 		if (value == null) {
 			value = "";
 		}
diff --git a/src/be/nikiroo/fanfix/output/LaTeX.java b/src/be/nikiroo/fanfix/output/LaTeX.java
index a4ed4d27..d322e4a7 100644
--- a/src/be/nikiroo/fanfix/output/LaTeX.java
+++ b/src/be/nikiroo/fanfix/output/LaTeX.java
@@ -1,19 +1,21 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
-import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
+import be.nikiroo.fanfix.data.Story;
 
 class LaTeX extends BasicOutput {
-	protected FileWriter writer;
+	protected BufferedWriter writer;
 	private boolean lastWasQuote = false;
 
 	// quote chars
@@ -34,7 +36,8 @@ class LaTeX extends BasicOutput {
 
 		File target = new File(targetDir, targetName);
 
-		writer = new FileWriter(target);
+		writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(target), "UTF-8"));
 		try {
 			super.process(story, targetDir, targetNameOrig);
 		} finally {
diff --git a/src/be/nikiroo/fanfix/output/Text.java b/src/be/nikiroo/fanfix/output/Text.java
index 4555ce62..4acfa762 100644
--- a/src/be/nikiroo/fanfix/output/Text.java
+++ b/src/be/nikiroo/fanfix/output/Text.java
@@ -1,8 +1,10 @@
 package be.nikiroo.fanfix.output;
 
+import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.net.URL;
 
 import be.nikiroo.fanfix.Instance;
@@ -10,11 +12,11 @@ import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
-import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
+import be.nikiroo.fanfix.data.Story;
 
 class Text extends BasicOutput {
-	protected FileWriter writer;
+	protected BufferedWriter writer;
 	protected File targetDir;
 
 	@Override
@@ -27,7 +29,8 @@ class Text extends BasicOutput {
 
 		File target = new File(targetDir, targetName);
 
-		writer = new FileWriter(target);
+		writer = new BufferedWriter(new OutputStreamWriter(
+				new FileOutputStream(target), "UTF-8"));
 		try {
 			super.process(story, targetDir, targetNameOrig);
 		} finally {
diff --git a/src/be/nikiroo/fanfix/reader/LocalReader.java b/src/be/nikiroo/fanfix/reader/LocalReader.java
index bfb8b972..86b779c3 100644
--- a/src/be/nikiroo/fanfix/reader/LocalReader.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReader.java
@@ -48,21 +48,23 @@ class LocalReader extends BasicReader {
 	}
 
 	// return new luid
-	public String imprt(String luid) {
+	public String imprt(String luid) throws IOException {
 		try {
 			Story story = Instance.getLibrary().getStory(luid);
-			story = lib.save(story);
-			return story.getMeta().getLuid();
+			if (story != null) {
+				story = lib.save(story);
+				return story.getMeta().getLuid();
+			} else {
+				throw new IOException("Cannot find story in Library: " + luid);
+			}
 		} catch (IOException e) {
-			Instance.syserr(new IOException(
+			throw new IOException(
 					"Cannot import story from library to LocalReader library: "
-							+ luid, e));
+							+ luid, e);
 		}
-
-		return null;
 	}
 
-	public File getTarget(String luid) {
+	public File getTarget(String luid) throws IOException {
 		MetaData meta = lib.getInfo(luid);
 		File file = lib.getFile(luid);
 		if (file == null) {
-- 
2.27.0