Proxy: step one (missing proxy from nikiroo-utils)

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index cacbbfe33320c32df5002563105e643a9ac8c86a..733c16cf9a6e8705e1a602ec279e2b8309d6f395 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -52,6 +52,10 @@ public class Instance {
 
                // Most of the rest is dependent upon this:
                createConfigs(configDir, false);
+               
+               // Proxy support
+               // TODO: include new nikiroo-utils version
+               // Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
 
                // update tracer:
                boolean debug = Instance.getConfig()

diff --git a/src/be/nikiroo/fanfix/bundles/Config.java b/src/be/nikiroo/fanfix/bundles/Config.java
index ecbfa3da9f0ce11ae8454106578c4f5f0f1c9b10..74beeaec6c713e8bf5fa8d5124640de59dd54124 100644 (file)
--- a/src/be/nikiroo/fanfix/bundles/Config.java
+++ b/src/be/nikiroo/fanfix/bundles/Config.java
@@ -64,6 +64,8 @@ public enum Config {
        LOGIN_YIFFSTAR_PASS, //
        @Meta(description = "If the last update check was done at least that many days, check for updates at startup (-1 for 'no checks' -- default is 1 day)", format = Format.INT)
        UPDATE_INTERVAL, //
+       @Meta(def = "", description = "", info = "Format is ((user(:pass)@)proxy:port), with ':' being system proxy and an empty String being no proxy")
+       USE_PROXY,
        @Meta(description = "An API key required to create a token from FimFiction", format = Format.STRING)
        LOGIN_FIMFICTION_APIKEY_CLIENT_ID, //
        @Meta(description = "An API key required to create a token from FimFiction", format = Format.PASSWORD)

diff --git a/src/be/nikiroo/fanfix/bundles/config.properties b/src/be/nikiroo/fanfix/bundles/config.properties
index 8f22f9fb63e639e9a7af5be81fe3c06256a0ce40..640953972b3b56a108e8dfde37d4f31dc9ef0914 100644 (file)
--- a/src/be/nikiroo/fanfix/bundles/config.properties
+++ b/src/be/nikiroo/fanfix/bundles/config.properties
@@ -77,6 +77,8 @@ LOGIN_YIFFSTAR_PASS =
 # If the last update check was done at least that many days, check for updates at startup (-1 for 'no checks' -- default is 1 day)
 # (FORMAT: INT) 
 UPDATE_INTERVAL = 
+#  (FORMAT: STRING) Format is ((user(:pass)@)proxy:port), with ':' being system proxy and an empty String being no proxy
+USE_PROXY = 
 # An API key required to create a token from FimFiction
 # (FORMAT: STRING) 
 LOGIN_FIMFICTION_APIKEY_CLIENT_ID =