X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=2ed276b1ea335dce6be6ed116b8e7973edd9f0ec;hb=159c11da407dfb004c57efd995b6c799275e5fc3;hp=b3633612713996f8651bffda5f480fc2607b54be;hpb=ee9b7083501b94c9ff00ab1d7e481d6f8dec8b05;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java index b363361..2ed276b 100644 --- a/src/be/nikiroo/fanfix/Main.java +++ b/src/be/nikiroo/fanfix/Main.java @@ -10,8 +10,11 @@ import java.util.List; import javax.net.ssl.SSLException; import be.nikiroo.fanfix.bundles.Config; +import be.nikiroo.fanfix.bundles.ConfigBundle; import be.nikiroo.fanfix.bundles.StringId; +import be.nikiroo.fanfix.bundles.StringIdBundle; 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; @@ -28,6 +31,8 @@ import be.nikiroo.fanfix.supported.BasicSupport; import be.nikiroo.fanfix.supported.SupportType; import be.nikiroo.utils.Progress; import be.nikiroo.utils.Version; +import be.nikiroo.utils.resources.Bundles; +import be.nikiroo.utils.resources.TransBundle; import be.nikiroo.utils.serial.server.ServerObject; /** @@ -644,10 +649,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; @@ -783,7 +788,7 @@ public class Main { try { URL source = BasicReader.getUrl(urlString); sourceName = source.toString(); - if (source.toString().startsWith("file://")) { + if (sourceName.startsWith("file://")) { sourceName = sourceName.substring("file://".length()); }