X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FRemoteLibrary.java;h=bbe772a8c90168c658fa985461e92c58f13bb8d0;hb=3177622aa63d2e126ce9426b440a3443a2ea8bab;hp=a6c68546882c0cdd64bda6c7592976d228bdfb4d;hpb=1feb447473d8176c3a218cc209c681fb41d468d1;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index a6c6854..bbe772a 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 {
*
wl: flag to allow access to all the stories (bypassing the
* whitelist if it exists)
*
- *
+ *
* Some examples:
*
* - my_key: normal connection, will take the default server
@@ -124,9 +124,9 @@ public class RemoteLibrary extends BasicLibrary {
@Override
public Status getStatus() {
- Instance.getTraceHandler().trace("Getting remote lib status...");
+ Instance.getInstance().getTraceHandler().trace("Getting remote lib status...");
Status status = getStatusDo();
- Instance.getTraceHandler().trace("Remote lib status: " + status);
+ Instance.getInstance().getTraceHandler().trace("Remote lib status: " + status);
return status;
}
@@ -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
@@ -434,7 +426,7 @@ public class RemoteLibrary extends BasicLibrary {
}
@Override
- public synchronized File getFile(final String luid, Progress pg) {
+ public File getFile(final String luid, Progress pg) {
throw new java.lang.InternalError(
"Operation not supportorted on remote Libraries");
}
@@ -451,12 +443,13 @@ public class RemoteLibrary extends BasicLibrary {
public void action(ConnectActionClientObject action)
throws Exception {
action.send(new Object[] { subkey, "EXIT" });
+ Thread.sleep(100);
}
});
}
@Override
- public synchronized MetaData getInfo(String luid) throws IOException {
+ public MetaData getInfo(String luid) throws IOException {
List metas = getMetasList(luid, null);
if (!metas.isEmpty()) {
return metas.get(0);
@@ -567,7 +560,7 @@ public class RemoteLibrary extends BasicLibrary {
@Override
protected void onError(Exception e) {
if (!(e instanceof IOException)) {
- Instance.getTraceHandler().error(e);
+ Instance.getInstance().getTraceHandler().error(e);
return;
}