X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FGuiReader.java;h=8559cf112eb34b47dd923cf14b0011c2c4ae561b;hb=99ccbdf63b539f1f40e070f5833f2d15fcf79830;hp=2f1b33961329179253fa6049ccaded8f3d774f11;hpb=34eb62fc14c1f4db29e65ceb6b190811380aba7e;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/reader/GuiReader.java b/src/be/nikiroo/fanfix/reader/GuiReader.java index 2f1b339..8559cf1 100644 --- a/src/be/nikiroo/fanfix/reader/GuiReader.java +++ b/src/be/nikiroo/fanfix/reader/GuiReader.java @@ -93,21 +93,8 @@ class GuiReader extends BasicReader { * in case of I/O error */ public void imprt(String luid, Progress pg) throws IOException { - Progress pgGetStory = new Progress(); - Progress pgSave = new Progress(); - if (pg != null) { - pg.setMax(2); - pg.addProgress(pgGetStory, 1); - pg.addProgress(pgSave, 1); - } - try { - Story story = getLibrary().getStory(luid, pgGetStory); - if (story != null) { - story = localLibrary.save(story, luid, pgSave); - } else { - throw new IOException("Cannot find story in Library: " + luid); - } + localLibrary.imprt(getLibrary(), luid, pg); } catch (IOException e) { throw new IOException( "Cannot import story from library to LocalReader library: " @@ -205,7 +192,9 @@ class GuiReader extends BasicReader { // delete from main library void delete(String luid) { try { - localLibrary.delete(luid); + if (localLibrary.getInfo(luid) != null) { + localLibrary.delete(luid); + } getLibrary().delete(luid); } catch (IOException e) { Instance.syserr(e);