git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '8b2627ce767579eb616e262b3f45f810a88ec200'
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
RemoteLibraryServer.java
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index dc9688c4de69c0348a1ee7dbac4665ec581d905a..4ee3f74d221c3497978cc57d70fc935fd466579f 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@
-80,7
+80,7
@@
public class RemoteLibraryServer extends ServerObject {
*/
public RemoteLibraryServer(String key, int port) throws IOException {
super("Fanfix remote library", port, key);
*/
public RemoteLibraryServer(String key, int port) throws IOException {
super("Fanfix remote library", port, key);
- setTraceHandler(Instance.getTraceHandler());
+ setTraceHandler(Instance.get
Instance().get
TraceHandler());
}
@Override
}
@Override
@@
-110,8
+110,7
@@
public class RemoteLibraryServer extends ServerObject {
}
}
}
}
- List<String> whitelist = Instance.getConfig().getList(
- Config.SERVER_WHITELIST);
+ List<String> whitelist = Instance.getInstance().getConfig().getList(Config.SERVER_WHITELIST);
if (whitelist == null) {
whitelist = new ArrayList<String>();
}
if (whitelist == null) {
whitelist = new ArrayList<String>();
}
@@
-120,10
+119,9
@@
public class RemoteLibraryServer extends ServerObject {
wl = false;
}
wl = false;
}
- rw = Instance.getConfig().getBoolean(Config.SERVER_RW, rw);
+ rw = Instance.get
Instance().get
Config().getBoolean(Config.SERVER_RW, rw);
if (!subkey.isEmpty()) {
if (!subkey.isEmpty()) {
- List<String> allowed = Instance.getConfig().getList(
- Config.SERVER_ALLOWED_SUBKEYS);
+ List<String> allowed = Instance.getInstance().getConfig().getList(Config.SERVER_ALLOWED_SUBKEYS);
if (allowed.contains(subkey)) {
if ((subkey + "|").contains("|rw|")) {
rw = true;
if (allowed.contains(subkey)) {
if ((subkey + "|").contains("|rw|")) {
rw = true;
@@
-203,21
+201,13
@@
public class RemoteLibraryServer extends ServerObject {
if ("*".equals(args[0])) {
Progress pg = createPgForwarder(action);
if ("*".equals(args[0])) {
Progress pg = createPgForwarder(action);
- for (MetaData meta : Instance.getLibrary().getMetas(pg)) {
- MetaData light;
- if (meta.getCover() == null) {
- light = meta;
- } else {
- light = meta.clone();
- light.setCover(null);
- }
-
- metas.add(light);
+ for (MetaData meta : Instance.getInstance().getLibrary().getMetas(pg)) {
+ metas.add(removeCover(meta));
}
forcePgDoneSent(pg);
} else {
}
forcePgDoneSent(pg);
} else {
- MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
+ MetaData meta = Instance.get
Instance().get
Library().getInfo((String) args[0]);
MetaData light;
if (meta.getCover() == null) {
light = meta;
MetaData light;
if (meta.getCover() == null) {
light = meta;
@@
-240,7
+230,7
@@
public class RemoteLibraryServer extends ServerObject {
return metas.toArray(new MetaData[0]);
} else if ("GET_STORY".equals(command)) {
return metas.toArray(new MetaData[0]);
} else if ("GET_STORY".equals(command)) {
- MetaData meta = Instance.getLibrary().getInfo((String) args[0]);
+ MetaData meta = Instance.get
Instance().get
Library().getInfo((String) args[0]);
if (meta == null) {
return null;
}
if (meta == null) {
return null;
}
@@
-257,8
+247,7
@@
public class RemoteLibraryServer extends ServerObject {
action.send(meta);
action.rec();
action.send(meta);
action.rec();
- Story story = Instance.getLibrary()
- .getStory((String) args[0], null);
+ Story story = Instance.getInstance().getLibrary().getStory((String) args[0], null);
for (Object obj : breakStory(story)) {
action.send(obj);
action.rec();
for (Object obj : breakStory(story)) {
action.send(obj);
action.rec();
@@
-280,7
+269,7
@@
public class RemoteLibraryServer extends ServerObject {
}
Story story = rebuildStory(list);
}
Story story = rebuildStory(list);
- Instance.getLibrary().save(story, (String) args[0], null);
+ Instance.get
Instance().get
Library().save(story, (String) args[0], null);
return story.getMeta().getLuid();
} else if ("IMPORT".equals(command)) {
if (!rw) {
return story.getMeta().getLuid();
} else if ("IMPORT".equals(command)) {
if (!rw) {
@@
-289,8
+278,7
@@
public class RemoteLibraryServer extends ServerObject {
}
Progress pg = createPgForwarder(action);
}
Progress pg = createPgForwarder(action);
- MetaData meta = Instance.getLibrary().imprt(
- new URL((String) args[0]), pg);
+ MetaData meta = Instance.getInstance().getLibrary().imprt(new URL((String) args[0]), pg);
forcePgDoneSent(pg);
return meta.getLuid();
} else if ("DELETE_STORY".equals(command)) {
forcePgDoneSent(pg);
return meta.getLuid();
} else if ("DELETE_STORY".equals(command)) {
@@
-299,16
+287,14
@@
public class RemoteLibraryServer extends ServerObject {
+ args[0], false);
}
+ args[0], false);
}
- Instance.getLibrary().delete((String) args[0]);
+ Instance.get
Instance().get
Library().delete((String) args[0]);
} else if ("GET_COVER".equals(command)) {
} else if ("GET_COVER".equals(command)) {
- return Instance.getLibrary().getCover((String) args[0]);
+ return Instance.get
Instance().get
Library().getCover((String) args[0]);
} else if ("GET_CUSTOM_COVER".equals(command)) {
if ("SOURCE".equals(args[0])) {
} else if ("GET_CUSTOM_COVER".equals(command)) {
if ("SOURCE".equals(args[0])) {
- return Instance.getLibrary().getCustomSourceCover(
- (String) args[1]);
+ return Instance.getInstance().getLibrary().getCustomSourceCover((String) args[1]);
} else if ("AUTHOR".equals(args[0])) {
} else if ("AUTHOR".equals(args[0])) {
- return Instance.getLibrary().getCustomAuthorCover(
- (String) args[1]);
+ return Instance.getInstance().getLibrary().getCustomAuthorCover((String) args[1]);
} else {
return null;
}
} else {
return null;
}
@@
-319,21
+305,18
@@
public class RemoteLibraryServer extends ServerObject {
}
if ("SOURCE".equals(args[0])) {
}
if ("SOURCE".equals(args[0])) {
- Instance.getLibrary().setSourceCover((String) args[1],
- (String) args[2]);
+ Instance.getInstance().getLibrary().setSourceCover((String) args[1], (String) args[2]);
} else if ("AUTHOR".equals(args[0])) {
} else if ("AUTHOR".equals(args[0])) {
- Instance.getLibrary().setAuthorCover((String) args[1],
- (String) args[2]);
+ Instance.getInstance().getLibrary().setAuthorCover((String) args[1], (String) args[2]);
}
} else if ("CHANGE_STA".equals(command)) {
if (!rw) {
}
} else if ("CHANGE_STA".equals(command)) {
if (!rw) {
- throw new RemoteLibraryException("Read-Only remote library: "
- + args[0] + ", " + args[1], false);
+ throw new RemoteLibraryException("Read-Only remote library: " + args[0] + ", " + args[1], false);
}
Progress pg = createPgForwarder(action);
}
Progress pg = createPgForwarder(action);
- Instance.get
Library().changeSTA((String) args[0], (String) args[1
],
- (String) args[
2], (String) args[
3], pg);
+ Instance.get
Instance().getLibrary().changeSTA((String) args[0], (String) args[1], (String) args[2
],
+ (String) args[3], pg);
forcePgDoneSent(pg);
} else if ("EXIT".equals(command)) {
if (!rw) {
forcePgDoneSent(pg);
} else if ("EXIT".equals(command)) {
if (!rw) {
@@
-341,7
+324,7
@@
public class RemoteLibraryServer extends ServerObject {
"Read-Only remote library: EXIT", false);
}
"Read-Only remote library: EXIT", false);
}
- stop(0, false);
+ stop(
1000
0, false);
}
return null;
}
return null;
@@
-422,16
+405,19
@@
public class RemoteLibraryServer extends ServerObject {
* @return TRUE if it was a progress event, FALSE if not
*/
static boolean updateProgress(Progress pg, Object rep) {
* @return TRUE if it was a progress event, FALSE if not
*/
static boolean updateProgress(Progress pg, Object rep) {
- if (rep instanceof
Integer
[]) {
-
Integer[] a = (Integer
[]) rep;
- if (a.length
=
= 3) {
- int min = a[0];
- int max = a[1];
- int progress = a[2];
+ if (rep instanceof
Object
[]) {
+
Object[] a = (Object
[]) rep;
+ if (a.length
>
= 3) {
+ int min =
(Integer)
a[0];
+ int max =
(Integer)
a[1];
+ int progress =
(Integer)
a[2];
if (min >= 0 && min <= max) {
pg.setMinMax(min, max);
pg.setProgress(progress);
if (min >= 0 && min <= max) {
pg.setMinMax(min, max);
pg.setProgress(progress);
+ if (a.length >= 4) {
+ pg.put("meta", a[3]);
+ }
return true;
}
return true;
}
@@
-460,27
+446,36
@@
public class RemoteLibraryServer extends ServerObject {
};
final Integer[] p = new Integer[] { -1, -1, -1 };
};
final Integer[] p = new Integer[] { -1, -1, -1 };
+ final Object[] pMeta = new MetaData[1];
final Long[] lastTime = new Long[] { new Date().getTime() };
pg.addProgressListener(new ProgressListener() {
@Override
public void progress(Progress progress, String name) {
final Long[] lastTime = new Long[] { new Date().getTime() };
pg.addProgressListener(new ProgressListener() {
@Override
public void progress(Progress progress, String name) {
+ Object meta = pg.get("meta");
+ if (meta instanceof MetaData) {
+ meta = removeCover((MetaData)meta);
+ }
+
int min = pg.getMin();
int max = pg.getMax();
int min = pg.getMin();
int max = pg.getMax();
- int rel
ativeProgress
= min
+ int rel = min
+ (int) Math.round(pg.getRelativeProgress()
* (max - min));
+ (int) Math.round(pg.getRelativeProgress()
* (max - min));
-
+
+ boolean samePg = p[0] == min && p[1] == max && p[2] == rel;
+
// Do not re-send the same value twice over the wire,
// unless more than 2 seconds have elapsed (to maintain the
// connection)
// Do not re-send the same value twice over the wire,
// unless more than 2 seconds have elapsed (to maintain the
// connection)
- if (
(p[0] != min || p[1] != max || p[2] != relativeProgress)
+ if (
!samePg || !same(pMeta[0], meta) //
|| (new Date().getTime() - lastTime[0] > 2000)) {
p[0] = min;
p[1] = max;
|| (new Date().getTime() - lastTime[0] > 2000)) {
p[0] = min;
p[1] = max;
- p[2] = relativeProgress;
+ p[2] = rel;
+ pMeta[0] = meta;
try {
try {
- action.send(new
Integer[] { min, max, relativeProgress
});
+ action.send(new
Object[] { min, max, rel, meta
});
action.rec();
} catch (Exception e) {
getTraceHandler().error(e);
action.rec();
} catch (Exception e) {
getTraceHandler().error(e);
@@
-495,6
+490,13
@@
public class RemoteLibraryServer extends ServerObject {
return pg;
}
return pg;
}
+
+ private boolean same(Object obj1, Object obj2) {
+ if (obj1 == null || obj2 == null)
+ return obj1 == null && obj2 == null;
+
+ return obj1.equals(obj2);
+ }
// with 30 seconds timeout
private void forcePgDoneSent(Progress pg) {
// with 30 seconds timeout
private void forcePgDoneSent(Progress pg) {
@@
-508,4
+510,16
@@
public class RemoteLibraryServer extends ServerObject {
}
}
}
}
}
}
+
+ private MetaData removeCover(MetaData meta) {
+ MetaData light;
+ if (meta.getCover() == null) {
+ light = meta;
+ } else {
+ light = meta.clone();
+ light.setCover(null);
+ }
+
+ return light;
+ }
}
}