From b6b657954954280c9ab0efcec67f3fe4a3ae0945 Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Thu, 19 Sep 2019 13:15:30 +0200
Subject: [PATCH] remote/general: import should not retrieve story from server

---
 src/be/nikiroo/fanfix/Main.java                |  7 ++++---
 .../nikiroo/fanfix/library/BasicLibrary.java   |  6 +++---
 .../nikiroo/fanfix/library/CacheLibrary.java   | 12 ++++++------
 .../nikiroo/fanfix/library/RemoteLibrary.java  | 18 +++++-------------
 .../fanfix/library/RemoteLibraryServer.java    |  4 ++--
 .../fanfix/reader/ui/GuiReaderFrame.java       |  7 +++----
 .../fanfix/reader/ui/GuiReaderMainPanel.java   | 18 +++++++++---------
 7 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index b3633612..3d69cad3 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -12,6 +12,7 @@ import javax.net.ssl.SSLException;
 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.library.BasicLibrary;
 import be.nikiroo.fanfix.library.CacheLibrary;
@@ -644,10 +645,10 @@ public class Main {
 	 */
 	public static int imprt(String urlString, Progress pg) {
 		try {
-			Story story = Instance.getLibrary().imprt(
+			MetaData meta = Instance.getLibrary().imprt(
 					BasicReader.getUrl(urlString), pg);
-			System.out.println(story.getMeta().getLuid() + ": \""
-					+ story.getMeta().getTitle() + "\" imported.");
+			System.out.println(meta.getLuid() + ": \"" + meta.getTitle()
+					+ "\" imported.");
 		} catch (IOException e) {
 			Instance.getTraceHandler().error(e);
 			return 1;
diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/src/be/nikiroo/fanfix/library/BasicLibrary.java
index 380c5c98..099859dc 100644
--- a/src/be/nikiroo/fanfix/library/BasicLibrary.java
+++ b/src/be/nikiroo/fanfix/library/BasicLibrary.java
@@ -751,14 +751,14 @@ abstract public class BasicLibrary {
 	 * @param pg
 	 *            the optional progress reporter
 	 * 
-	 * @return the imported {@link Story}
+	 * @return the imported Story {@link MetaData}
 	 * 
 	 * @throws UnknownHostException
 	 *             if the host is not supported
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
-	public Story imprt(URL url, Progress pg) throws IOException {
+	public MetaData imprt(URL url, Progress pg) throws IOException {
 		if (pg == null)
 			pg = new Progress();
 
@@ -776,7 +776,7 @@ abstract public class BasicLibrary {
 		Story story = save(support.process(pgProcess), pgSave);
 		pg.done();
 
-		return story;
+		return story.getMeta();
 	}
 
 	/**
diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/src/be/nikiroo/fanfix/library/CacheLibrary.java
index 019acd21..e128da52 100644
--- a/src/be/nikiroo/fanfix/library/CacheLibrary.java
+++ b/src/be/nikiroo/fanfix/library/CacheLibrary.java
@@ -345,7 +345,7 @@ public class CacheLibrary extends BasicLibrary {
 	}
 
 	@Override
-	public Story imprt(URL url, Progress pg) throws IOException {
+	public MetaData imprt(URL url, Progress pg) throws IOException {
 		if (pg == null) {
 			pg = new Progress();
 		}
@@ -356,13 +356,13 @@ public class CacheLibrary extends BasicLibrary {
 		pg.addProgress(pgImprt, 7);
 		pg.addProgress(pgCache, 3);
 
-		Story story = lib.imprt(url, pgImprt);
-		cacheLib.save(story, story.getMeta().getLuid(), pgCache);
-
-		updateInfo(story.getMeta());
+		MetaData meta = lib.imprt(url, pgImprt);
+		updateInfo(meta);
+		
+		clearFromCache(meta.getLuid());
 
 		pg.done();
-		return story;
+		return meta;
 	}
 
 	// All the following methods are only used by Save and Delete in
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index a6c68546..ce4305aa 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@ -78,7 +78,7 @@ public class RemoteLibrary extends BasicLibrary {
 	 * <li><b>wl</b>: flag to allow access to all the stories (bypassing the
 	 * whitelist if it exists)</li>
 	 * </ul>
-	 * 
+	 * <p>
 	 * Some examples:
 	 * <ul>
 	 * <li><b>my_key</b>: normal connection, will take the default server
@@ -352,8 +352,9 @@ public class RemoteLibrary extends BasicLibrary {
 
 	@Override
 	// Could work (more slowly) without it
-	public Story imprt(final URL url, Progress pg) throws IOException {
+	public MetaData imprt(final URL url, Progress pg) throws IOException {
 		// Import the file locally if it is actually a file
+		
 		if (url == null || url.getProtocol().equalsIgnoreCase("file")) {
 			return super.imprt(url, pg);
 		}
@@ -364,13 +365,7 @@ public class RemoteLibrary extends BasicLibrary {
 			pg = new Progress();
 		}
 
-		pg.setMinMax(0, 2);
-		Progress pgImprt = new Progress();
-		Progress pgGet = new Progress();
-		pg.addProgress(pgImprt, 1);
-		pg.addProgress(pgGet, 1);
-
-		final Progress pgF = pgImprt;
+		final Progress pgF = pg;
 		final String[] luid = new String[1];
 
 		connectRemoteAction(new RemoteAction() {
@@ -399,11 +394,8 @@ public class RemoteLibrary extends BasicLibrary {
 			throw new IOException("Remote failure");
 		}
 
-		Story story = getStory(luid[0], pgGet);
-		pgGet.done();
-
 		pg.done();
-		return story;
+		return getInfo(luid[0]);
 	}
 
 	@Override
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index 43f61b09..dc9688c4 100644
--- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@ -289,10 +289,10 @@ public class RemoteLibraryServer extends ServerObject {
 			}
 
 			Progress pg = createPgForwarder(action);
-			Story story = Instance.getLibrary().imprt(
+			MetaData meta = Instance.getLibrary().imprt(
 					new URL((String) args[0]), pg);
 			forcePgDoneSent(pg);
-			return story.getMeta().getLuid();
+			return meta.getLuid();
 		} else if ("DELETE_STORY".equals(command)) {
 			if (!rw) {
 				throw new RemoteLibraryException("Read-Only remote library: "
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
index a28dc8a0..fe11c810 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
@@ -36,7 +36,7 @@ import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.reader.BasicReader;
 import be.nikiroo.fanfix.reader.ui.GuiReaderMainPanel.FrameHelper;
-import be.nikiroo.fanfix.reader.ui.GuiReaderMainPanel.StoryRunnable;
+import be.nikiroo.fanfix.reader.ui.GuiReaderMainPanel.MetaDataRunnable;
 import be.nikiroo.fanfix.searchable.BasicSearchable;
 import be.nikiroo.fanfix.supported.SupportType;
 import be.nikiroo.utils.Progress;
@@ -756,10 +756,9 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 				final GuiReaderBook selectedBook = mainPanel.getSelectedBook();
 				if (selectedBook != null) {
 					final MetaData meta = selectedBook.getInfo().getMeta();
-					mainPanel.imprt(meta.getUrl(), new StoryRunnable() {
+					mainPanel.imprt(meta.getUrl(), new MetaDataRunnable() {
 						@Override
-						public void run(Story story) {
-							MetaData newMeta = story.getMeta();
+						public void run(MetaData newMeta) {
 							if (!newMeta.getSource().equals(meta.getSource())) {
 								reader.changeSource(newMeta.getLuid(),
 										meta.getSource());
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
index 8593fe64..7caa243c 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
@@ -108,18 +108,18 @@ class GuiReaderMainPanel extends JPanel {
 	}
 
 	/**
-	 * A {@link Runnable} with a {@link Story} parameter.
+	 * A {@link Runnable} with a {@link MetaData} parameter.
 	 * 
 	 * @author niki
 	 */
-	public interface StoryRunnable {
+	public interface MetaDataRunnable {
 		/**
 		 * Run the action.
 		 * 
-		 * @param story
-		 *            the story
+		 * @param meta
+		 *            the meta of the story
 		 */
-		public void run(Story story);
+		public void run(MetaData meta);
 	}
 
 	/**
@@ -548,7 +548,7 @@ class GuiReaderMainPanel extends JPanel {
 	 * @param onSuccessPgName
 	 *            the name to use for the onSuccess progress bar
 	 */
-	public void imprt(final String url, final StoryRunnable onSuccess,
+	public void imprt(final String url, final MetaDataRunnable onSuccess,
 			String onSuccessPgName) {
 		final Progress pg = new Progress();
 		final Progress pgImprt = new Progress();
@@ -560,9 +560,9 @@ class GuiReaderMainPanel extends JPanel {
 			@Override
 			public void run() {
 				Exception ex = null;
-				Story story = null;
+				MetaData meta = null;
 				try {
-					story = helper.getReader().getLibrary()
+					meta = helper.getReader().getLibrary()
 							.imprt(BasicReader.getUrl(url), pgImprt);
 				} catch (IOException e) {
 					ex = e;
@@ -586,7 +586,7 @@ class GuiReaderMainPanel extends JPanel {
 					}
 				} else {
 					if (onSuccess != null) {
-						onSuccess.run(story);
+						onSuccess.run(meta);
 					}
 				}
 				pgOnSuccess.done();
-- 
2.27.0