X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FLocalReader.java;h=c17e83eaa097531eb423473d544c60eabff92a64;hb=b4dc6ab518ded2dd92e4cbb02ac615b1d57e8e6d;hp=26f48f5a21210fe4d6026b44d0e2bdae3cf3e2c1;hpb=a6395bef99a8e917f67341ef1906917b87df24a4;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/reader/LocalReader.java b/src/be/nikiroo/fanfix/reader/LocalReader.java
index 26f48f5..c17e83e 100644
--- a/src/be/nikiroo/fanfix/reader/LocalReader.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReader.java
@@ -6,11 +6,9 @@ import java.io.IOException;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.Library;
-import be.nikiroo.fanfix.bundles.Config;
-import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
-import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 
 class LocalReader extends BasicReader {
 	private Library lib;
@@ -24,14 +22,14 @@ class LocalReader extends BasicReader {
 		}
 
 		// TODO: can throw an exception, manage that (convert to IOEx ?)
-		OutputType text = OutputType.valueOfNullOkUC(Instance.getConfig()
-				.getString(Config.LOCAL_READER_NON_IMAGES_DOCUMENT_TYPE));
+		OutputType text = OutputType.valueOfNullOkUC(Instance.getUiConfig()
+				.getString(UiConfig.LOCAL_READER_NON_IMAGES_DOCUMENT_TYPE));
 		if (text == null) {
 			text = OutputType.HTML;
 		}
 
-		OutputType images = OutputType.valueOfNullOkUC(Instance.getConfig()
-				.getString(Config.LOCAL_READER_IMAGES_DOCUMENT_TYPE));
+		OutputType images = OutputType.valueOfNullOkUC(Instance.getUiConfig()
+				.getString(UiConfig.LOCAL_READER_IMAGES_DOCUMENT_TYPE));
 		if (images == null) {
 			images = OutputType.CBZ;
 		}
@@ -48,36 +46,35 @@ class LocalReader extends BasicReader {
 	public void read(int chapter) {
 	}
 
-	// return new luid
-	public String imprt(String luid) {
+	// keep same luid
+	public void 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, luid);
+			} 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) {
-		MetaData meta = lib.getInfo(luid);
+	public File getTarget(String luid) throws IOException {
 		File file = lib.getFile(luid);
 		if (file == null) {
-			luid = imprt(luid);
+			imprt(luid);
 			file = lib.getFile(luid);
-			meta = lib.getInfo(luid);
 		}
 
 		return file;
 	}
 
 	@Override
-	public void start(SupportType type) {
-		final SupportType typeFinal = type;
+	public void start(String type) {
+		final String typeFinal = type;
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				new LocalReaderFrame(LocalReader.this, typeFinal)
@@ -85,8 +82,4 @@ class LocalReader extends BasicReader {
 			}
 		});
 	}
-
-	public static void main(String[] args) throws IOException {
-		new LocalReader().start(null);
-	}
 }