From 73ce17ef4569e43d24f8413ad6b59bc2906aec07 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Mon, 13 Feb 2017 07:31:57 +0100 Subject: [PATCH] Fix --export --export did not correctly pass the LUID to the library --- src/be/nikiroo/fanfix/Library.java | 5 +++++ src/be/nikiroo/fanfix/Main.java | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java index 68f93c53..15b81e44 100644 --- a/src/be/nikiroo/fanfix/Library.java +++ b/src/be/nikiroo/fanfix/Library.java @@ -194,6 +194,11 @@ public class Library { throw new IOException("Output type not supported: " + type); } + Story story = getStory(luid); + if (story == null) { + throw new IOException("Cannot find story to export: " + luid); + } + return out.process(getStory(luid), target); } diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java index 0938fea9..d5669d56 100644 --- a/src/be/nikiroo/fanfix/Main.java +++ b/src/be/nikiroo/fanfix/Main.java @@ -64,7 +64,7 @@ public class Main { String target = null; MainAction action = MainAction.HELP; Boolean plusInfo = null; - + boolean noMoreActions = false; int exitCode = 0; @@ -163,7 +163,7 @@ public class Main { exitCode = imprt(urlString); break; case EXPORT: - exitCode = export(urlString, typeString, target); + exitCode = export(luid, typeString, target); break; case CONVERT: exitCode = convert(urlString, typeString, target, @@ -248,7 +248,7 @@ public class Main { /** * Export the {@link Story} from the {@link Library} to the given target. * - * @param urlString + * @param luid * the story LUID * @param typeString * the {@link OutputType} to use @@ -257,7 +257,7 @@ public class Main { * * @return the exit return code (0 = success) */ - private static int export(String urlString, String typeString, String target) { + private static int export(String luid, String typeString, String target) { OutputType type = OutputType.valueOfNullOkUC(typeString); if (type == null) { Instance.syserr(new Exception(trans(StringId.OUTPUT_DESC, @@ -266,9 +266,7 @@ public class Main { } try { - Story story = Instance.getLibrary().imprt(new URL(urlString)); - Instance.getLibrary().export(story.getMeta().getLuid(), type, - target); + Instance.getLibrary().export(luid, type, target); } catch (IOException e) { Instance.syserr(e); return 4; -- 2.27.0