X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=c01275b62d5db57e95bf4b8542b64a09b09ea591;hb=c8d48938ca540d7b619a2c19bd76623d689b72cb;hp=71b65bf97f0e0dc52e3815a7ca2b1a7f9aad09b5;hpb=9f51d8ab092b891f407dc1bfe0e0fa1cef7ff944;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java index 71b65bf..c01275b 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibrary.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibrary.java @@ -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 }