X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=c01275b62d5db57e95bf4b8542b64a09b09ea591;hb=c8d48938ca540d7b619a2c19bd76623d689b72cb;hp=44d39adbcc30d8b6867aaf5fd4961ac0dc00bac9;hpb=efa3c511f39ab1432675e3b75b9b7b32d579f1c3;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 44d39ad..c01275b 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -119,15 +119,15 @@ public class RemoteLibrary extends BasicLibrary { } @Override - public Image getSourceCover(final String source) { + public Image getCustomSourceCover(final String source) { final Image[] result = new Image[1]; try { new ConnectActionClientObject(host, port, true) { @Override public void action(Version serverVersion) throws Exception { - Object rep = send(new Object[] { md5, "GET_SOURCE_COVER", - source }); + Object rep = send(new Object[] { md5, + "GET_CUSTOM_SOURCE_COVER", source }); result[0] = (Image) rep; } @@ -285,6 +285,13 @@ public class RemoteLibrary extends BasicLibrary { @Override // Could work (more slowly) without it public Story 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); + } + + // Import it remotely if it is an URL + if (pg == null) { pg = new Progress(); } @@ -341,8 +348,9 @@ public class RemoteLibrary extends BasicLibrary { @Override // Could work (more slowly) without it - public synchronized void changeSource(final String luid, - final String newSource, Progress pg) throws IOException { + protected synchronized void changeSTA(final String luid, + final String newSource, final String newTitle, + final String newAuthor, Progress pg) throws IOException { final Progress pgF = pg == null ? new Progress() : pg; try { @@ -351,8 +359,8 @@ public class RemoteLibrary extends BasicLibrary { public void action(Version serverVersion) throws Exception { Progress pg = pgF; - Object rep = send(new Object[] { md5, "CHANGE_SOURCE", - luid, newSource }); + Object rep = send(new Object[] { md5, "CHANGE_STA", luid, + newSource, newTitle, newAuthor }); while (true) { if (!RemoteLibraryServer.updateProgress(pg, rep)) { break; @@ -420,7 +428,7 @@ public class RemoteLibrary extends BasicLibrary { } @Override - protected void deleteInfo(String luid) { + protected void invalidateInfo(String luid) { // Will be taken care of directly server side } @@ -446,6 +454,8 @@ public class RemoteLibrary extends BasicLibrary { /** * Return the meta of the given story or a list of all known metas if the * luid is "*". + *

+ * Will not get the covers. * * @param luid * the luid of the story or *