git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remote: do not ping all the time
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
Instance.java
diff --git
a/src/be/nikiroo/fanfix/Instance.java
b/src/be/nikiroo/fanfix/Instance.java
index c547a2b121bdf07ae3e48ad146ad28ea07ed9c04..ef7799fbc497d246e7d64ddaf80f8d0cde59546f 100644
(file)
--- a/
src/be/nikiroo/fanfix/Instance.java
+++ b/
src/be/nikiroo/fanfix/Instance.java
@@
-17,6
+17,7
@@
import be.nikiroo.fanfix.library.LocalLibrary;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.utils.Cache;
import be.nikiroo.utils.IOUtils;
import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.utils.Cache;
import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Image;
import be.nikiroo.utils.Proxy;
import be.nikiroo.utils.TempFiles;
import be.nikiroo.utils.TraceHandler;
import be.nikiroo.utils.Proxy;
import be.nikiroo.utils.TempFiles;
import be.nikiroo.utils.TraceHandler;
@@
-71,7
+72,8
@@
public class Instance {
remoteDir = new File(configDir, "remote");
lib = createDefaultLibrary(remoteDir);
remoteDir = new File(configDir, "remote");
lib = createDefaultLibrary(remoteDir);
- // create cache
+ // create cache and TMP
+ Image.setTemporaryFilesRoot(new File(configDir, "tmp.images"));
File tmp = getFile(Config.CACHE_DIR);
if (tmp == null) {
// Could have used: System.getProperty("java.io.tmpdir")
File tmp = getFile(Config.CACHE_DIR);
if (tmp == null) {
// Could have used: System.getProperty("java.io.tmpdir")
@@
-439,6
+441,7
@@
public class Instance {
+ getFile(libDir), e));
}
} else {
+ getFile(libDir), e));
}
} else {
+ Exception ex = null;
int pos = remoteLib.lastIndexOf(":");
if (pos >= 0) {
String port = remoteLib.substring(pos + 1).trim();
int pos = remoteLib.lastIndexOf(":");
if (pos >= 0) {
String port = remoteLib.substring(pos + 1).trim();
@@
-457,13
+460,14
@@
public class Instance {
lib);
} catch (Exception e) {
lib);
} catch (Exception e) {
+ ex = e;
}
}
}
if (lib == null) {
tracer.error(new IOException(
}
}
}
if (lib == null) {
tracer.error(new IOException(
- "Cannot create remote library for: " + remoteLib));
+ "Cannot create remote library for: " + remoteLib
, ex
));
}
}
}
}
@@
-547,7
+551,7
@@
public class Instance {
private static String getLang() {
String lang = config.getString(Config.LANG);
private static String getLang() {
String lang = config.getString(Config.LANG);
- if (lang == null | lang.isEmpty()) {
+ if (lang == null |
|
lang.isEmpty()) {
if (System.getenv("LANG") != null
&& !System.getenv("LANG").isEmpty()) {
lang = System.getenv("LANG");
if (System.getenv("LANG") != null
&& !System.getenv("LANG").isEmpty()) {
lang = System.getenv("LANG");