git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a5b4244
)
remote string -> stream + encrypt
author
Niki Roo
<niki@nikiroo.be>
Sun, 28 Apr 2019 17:51:07 +0000
(19:51 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Sun, 28 Apr 2019 17:51:07 +0000
(19:51 +0200)
changelog-fr.md
patch
|
blob
|
blame
|
history
changelog.md
patch
|
blob
|
blame
|
history
libs/nikiroo-utils-4.7.2-dev-sources.jar
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/library/RemoteLibrary.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
patch
|
blob
|
blame
|
history
diff --git
a/changelog-fr.md
b/changelog-fr.md
index cc5632b27410ed9d3d2a4fee1a5d28422710fd0e..8980fad938528dca6be498e12cdc7c195f7fd545 100644
(file)
--- a/
changelog-fr.md
+++ b/
changelog-fr.md
@@
-9,8
+9,9
@@
- gui: correction pour le focus
- MangaLEL: site web changé
- search: supporte MangaLEL
- gui: correction pour le focus
- MangaLEL: site web changé
- search: supporte MangaLEL
-- remote:
passage en CLEAR TEXT parce que Google et Android n'aiment pas le SSL anonym
e
+- remote:
changement du chiffrement because Googl
e
- remote: incompatible avec 2.x
- remote: incompatible avec 2.x
+- remote: perfs et utilisation de la mémoire améliorées
# Version 2.0.2
# Version 2.0.2
diff --git
a/changelog.md
b/changelog.md
index 1e2dc0dc6d0b81e19fc2e2490e7c368cbb502d3e..e8698efb3dcec1aa577ff8af902cf07147fa289c 100644
(file)
--- a/
changelog.md
+++ b/
changelog.md
@@
-9,8
+9,9
@@
- gui: focus fix
- MangaLEL: website has changed
- search: MangaLEL support
- gui: focus fix
- MangaLEL: website has changed
- search: MangaLEL support
-- remote:
go CLEAR TEXT because Google and Android don't like anonymous SSL
+- remote:
encryption mode changed because Google
- remote: not compatible with 2.x
- remote: not compatible with 2.x
+- remote: better perfs and memory usage
# Version 2.0.2
# Version 2.0.2
diff --git
a/libs/nikiroo-utils-4.7.2-dev-sources.jar
b/libs/nikiroo-utils-4.7.2-dev-sources.jar
index 9ce0b0eb90cbecd8ea9cccf544493f3542a51e1e..de706762501896f25a59e0ea9adabb3e9287d001 100644
(file)
Binary files a/libs/nikiroo-utils-4.7.2-dev-sources.jar and b/libs/nikiroo-utils-4.7.2-dev-sources.jar differ
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibrary.java
b/src/be/nikiroo/fanfix/library/RemoteLibrary.java
index c2ed310b5da0fbf9f1e49dc57eacbb17c448e3fe..d6bdd1568546d625477f5a0c4baaae1f5bc3708f 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibrary.java
+++ b/
src/be/nikiroo/fanfix/library/RemoteLibrary.java
@@
-14,7
+14,6
@@
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
-import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.server.ConnectActionClientObject;
/**
import be.nikiroo.utils.serial.server.ConnectActionClientObject;
/**
@@
-61,7
+60,7
@@
public class RemoteLibrary extends BasicLibrary {
Instance.getTraceHandler().trace("Getting remote lib status...");
new ConnectActionClientObject(host, port, key) {
@Override
Instance.getTraceHandler().trace("Getting remote lib status...");
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Object rep = send(new Object[] { "PING" });
if ("PONG".equals(rep)) {
Object rep = send(new Object[] { "PING" });
if ("PONG".equals(rep)) {
@@
-99,7
+98,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Object rep = send(new Object[] { "GET_COVER", luid });
result[0] = (Image) rep;
}
Object rep = send(new Object[] { "GET_COVER", luid });
result[0] = (Image) rep;
}
@@
-138,7
+137,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Object rep = send(new Object[] { "GET_CUSTOM_COVER", type,
source });
result[0] = (Image) rep;
Object rep = send(new Object[] { "GET_CUSTOM_COVER", type,
source });
result[0] = (Image) rep;
@@
-169,7
+168,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Progress pg = pgF;
if (pg == null) {
pg = new Progress();
Progress pg = pgF;
if (pg == null) {
pg = new Progress();
@@
-230,7
+229,7
@@
public class RemoteLibrary extends BasicLibrary {
new ConnectActionClientObject(host, port, key) {
@Override
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Progress pg = pgF;
if (story.getMeta().getWords() <= Integer.MAX_VALUE) {
pg.setMinMax(0, (int) story.getMeta().getWords());
Progress pg = pgF;
if (story.getMeta().getWords() <= Integer.MAX_VALUE) {
pg.setMinMax(0, (int) story.getMeta().getWords());
@@
-280,7
+279,7
@@
public class RemoteLibrary extends BasicLibrary {
public synchronized void delete(final String luid) throws IOException {
new ConnectActionClientObject(host, port, key) {
@Override
public synchronized void delete(final String luid) throws IOException {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
send(new Object[] { "DELETE_STORY", luid });
}
send(new Object[] { "DELETE_STORY", luid });
}
@@
-312,7
+311,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
send(new Object[] { "SET_COVER", type, value, luid });
}
send(new Object[] { "SET_COVER", type, value, luid });
}
@@
-357,7
+356,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Progress pg = pgF;
Object rep = send(new Object[] { "IMPORT", url.toString() });
Progress pg = pgF;
Object rep = send(new Object[] { "IMPORT", url.toString() });
@@
-409,7
+408,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Progress pg = pgF;
Object rep = send(new Object[] { "CHANGE_STA", luid,
Progress pg = pgF;
Object rep = send(new Object[] { "CHANGE_STA", luid,
@@
-451,7
+450,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
send(new Object[] { "EXIT" });
}
send(new Object[] { "EXIT" });
}
@@
-535,7
+534,7
@@
public class RemoteLibrary extends BasicLibrary {
try {
new ConnectActionClientObject(host, port, key) {
@Override
try {
new ConnectActionClientObject(host, port, key) {
@Override
- public void action(
Version serverVersion
) throws Exception {
+ public void action() throws Exception {
Progress pg = pgF;
if (pg == null) {
pg = new Progress();
Progress pg = pgF;
if (pg == null) {
pg = new Progress();
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index c2edeb3ecebeba71ee7149c118b9aaaab9f60512..72f4e83bcc19a8563102a2adccf3e2762ebce3e8 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
@@
-16,7
+16,6
@@
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Progress.ProgressListener;
import be.nikiroo.utils.StringUtils;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Progress.ProgressListener;
import be.nikiroo.utils.StringUtils;
-import be.nikiroo.utils.Version;
import be.nikiroo.utils.serial.server.ConnectActionServerObject;
import be.nikiroo.utils.serial.server.ServerObject;
import be.nikiroo.utils.serial.server.ConnectActionServerObject;
import be.nikiroo.utils.serial.server.ServerObject;
@@
-70,8
+69,8
@@
public class RemoteLibraryServer extends ServerObject {
}
@Override
}
@Override
- protected Object onRequest(ConnectActionServerObject action,
-
Version clientVersion, Object data)
throws Exception {
+ protected Object onRequest(ConnectActionServerObject action,
Object data)
+ throws Exception {
long start = new Date().getTime();
String command = "";
long start = new Date().getTime();
String command = "";