I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moved the configurationManager.

Browse Source 
Added support for reading/writing conf to file.
Change how config queries without values are handled. Now the defaultValue provided will be saved if no value existed before.
This commit is contained in:
dev
2011-07-01 08:19:14 +00:00
parent 22931dc3d5
commit 587622405d
4 changed files with 184 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/i2p/itoopie/Main.java
View File

@ -4,8 +4,6 @@ package net.i2p.itoopie;
* Main.java
*/
import java.security.Security;
import javax.net.ssl.HttpsURLConnection;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@ -16,9 +14,9 @@ import org.apache.commons.logging.LogFactory;
import com.thetransactioncompany.jsonrpc2.JSONRPC2Error;
import net.i2p.itoopie.configuration.ConfigurationManager;
import net.i2p.itoopie.i2pcontrol.JSONInterface;
import net.i2p.itoopie.security.CertificateHelper;
import net.i2p.itoopie.util.ConfigurationManager;
/**
* The main class of the application.

182
src/net/i2p/itoopie/configuration/ConfigurationManager.java Normal file
View File

@ -0,0 +1,182 @@
package net.i2p.itoopie.configuration;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Manage the configuration of I2PControl.
* @author mathias
* modified: hottuna
*
*/
public class ConfigurationManager {
private static final String DEFAULT_CONFIG_LOCATION = "itoopie.conf";
private static final Log _log = LogFactory.getLog(ConfigurationManager.class);
private static ConfigurationManager instance;
//Configurations with a String as value
private static Map<String, String> stringConfigurations = new HashMap<String, String>();
//Configurations with a Boolean as value
private static Map<String, Boolean> booleanConfigurations = new HashMap<String, Boolean>();
//Configurations with an Integer as value
private static Map<String, Integer> integerConfigurations = new HashMap<String, Integer>();
private ConfigurationManager() {}
public synchronized static ConfigurationManager getInstance() {
if(instance == null) {
instance = new ConfigurationManager();
}
return instance;
}
/**
* Collects arguments of the form --word, --word=otherword and -blah
* to determine user parameters.
* @param args Command line arguments to the application
*/
public void loadArguments(String[] args) {
for(int i=0; i<args.length; i++) {
String arg = args[i];
if(arg.startsWith("--")) {
parseConfigStr(arg.substring(2));
}
}
}
/**
* Reads configuration from file itoopie.conf, every line is parsed as key=value.
*/
public static void readConfFile(){
try {
BufferedReader br = new BufferedReader(new FileReader(DEFAULT_CONFIG_LOCATION));
String input;
while ((input = br.readLine()) != null){
parseConfigStr(input);
}
br.close();
} catch (FileNotFoundException e) {
_log.error("Unable to find config file, " + DEFAULT_CONFIG_LOCATION);
} catch (IOException e) {
_log.error("Unable to read from config file, " + DEFAULT_CONFIG_LOCATION);
}
}
/**
* Write configuration into default config file.
*/
public static void writeConfFile(){
TreeMap<String,String> tree = new TreeMap<String,String>();
for (Entry<String,String> e : stringConfigurations.entrySet()){
tree.put(e.getKey(), e.getValue());
}
for (Entry<String,Integer> e : integerConfigurations.entrySet()){
tree.put(e.getKey(), e.getValue().toString());
}
for (Entry<String,Boolean> e : booleanConfigurations.entrySet()){
tree.put(e.getKey(), e.getValue().toString());
}
try {
BufferedWriter bw = new BufferedWriter(new FileWriter(DEFAULT_CONFIG_LOCATION));
for (Entry<String,String> e : tree.entrySet()){
bw.write(e.getKey() + "=" + e.getValue() + "\r\n");
}
bw.close();
} catch (IOException e1) {
_log.error("Couldn't open file, " + DEFAULT_CONFIG_LOCATION + " for writing config.");
}
}
/**
* Try to parse the given line as 'key=value',
* where value will (in order) be parsed as integer/boolean/string.
* @param str
*/
public static void parseConfigStr(String str){
int eqIndex = str.indexOf('=');
if (eqIndex != -1){
String key = str.substring(0, eqIndex).trim().toLowerCase();
String value = str.substring(eqIndex+1, str.length()).trim();
System.out.println("Key:Value, " + key + ":" + value);
//Try parse as integer.
try {
int i = Integer.parseInt(value);
integerConfigurations.put(key, i);
return;
} catch (NumberFormatException e){}
//Check if value is a bool
if (value.toLowerCase().equals("true")){
booleanConfigurations.put(key, Boolean.TRUE);
return;
} else if (value.toLowerCase().equals("false")){
booleanConfigurations.put(key, Boolean.FALSE);
return;
}
stringConfigurations.put(key, value);
}
}
/**
* Check if a specific boolean configuration exists.
* @param arg The key for the configuration.
* @param defaultValue If the configuration is not found, we use a default value.
* @return The value of a configuration: true if found, defaultValue if not found.
*/
public boolean getConf(String arg, boolean defaultValue) {
Boolean value = booleanConfigurations.get(arg);
if(value != null) {
return value;
} else {
booleanConfigurations.put(arg, defaultValue);
return defaultValue;
}
}
/**
* Check if a specific boolean configuration exists.
* @param arg The key for the configuration.
* @param defaultValue If the configuration is not found, we use a default value.
* @return The value of a configuration: true if found, defaultValue if not found.
*/
public int getConf(String arg, int defaultValue) {
Integer value = integerConfigurations.get(arg);
if(value != null) {
return value;
} else {
integerConfigurations.put(arg, defaultValue);
return defaultValue;
}
}
/**
* Get a specific String configuration.
* @param arg The key for the configuration.
* @param defaultValue If the configuration is not found, we use a default value.
* @return The value of the configuration, or the defaultValue.
*/
public String getConf(String arg, String defaultValue) {
String value = stringConfigurations.get(arg);
if(value != null) {
return value;
} else {
stringConfigurations.put(arg, defaultValue);
return defaultValue;
}
}
}

2
src/net/i2p/itoopie/i2pcontrol/JSONInterface.java
View File

@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import net.i2p.itoopie.util.ConfigurationManager;
import net.i2p.itoopie.configuration.ConfigurationManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

115
src/net/i2p/itoopie/util/ConfigurationManager.java
View File

@ -1,115 +0,0 @@
package net.i2p.itoopie.util;
import java.util.HashMap;
import java.util.Map;
/**
* Manage the configuration of itoopie.
* @author mathias
* modified: hottuna
*
*/
public class ConfigurationManager {
private static ConfigurationManager instance;
//Configurations with a String as value
private Map<String, String> stringConfigurations = new HashMap<String, String>();
//Configurations with a Boolean as value
private Map<String, Boolean> booleanConfigurations = new HashMap<String, Boolean>();
//Configurations with an Integer as value
private Map<String, Integer> integerConfigurations = new HashMap<String, Integer>();
private ConfigurationManager() {}
public synchronized static ConfigurationManager getInstance() {
if(instance == null) {
instance = new ConfigurationManager();
}
return instance;
}
/**
* Collects arguments of the form --word, --word=otherword and -blah
* to determine user parameters.
* @param args Command line arguments to the application
*/
public void loadArguments(String[] args) {
for(int i=0; i<args.length; i++) {
String arg = args[i];
if(arg.startsWith("--")) {
parseConfigStr(arg.substring(2));
}
}
}
public void parseConfigStr(String str){
int eqIndex = str.indexOf('=');
if (eqIndex != -1){
String key = str.substring(0, eqIndex).trim().toLowerCase();
String value = str.substring(eqIndex+1, str.length()).trim();
System.out.println("Key:Value, " + key + ":" + value);
//Try parse as integer.
try {
int i = Integer.parseInt(value);
integerConfigurations.put(key, i);
return;
} catch (NumberFormatException e){}
//Check if value is a bool
if (value.toLowerCase().equals("true")){
booleanConfigurations.put(key, Boolean.TRUE);
return;
} else if (value.toLowerCase().equals("false")){
booleanConfigurations.put(key, Boolean.FALSE);
return;
}
stringConfigurations.put(key, value);
}
}
/**
* Check if a specific boolean configuration exists.
* @param arg The key for the configuration.
* @param defaultValue If the configuration is not found, we use a default value.
* @return The value of a configuration: true if found, defaultValue if not found.
*/
public boolean getConf(String arg, boolean defaultValue) {
Boolean value = ((Boolean) booleanConfigurations.get(arg));
//System.out.println(value);
if(value != null) {
return value;
}
return defaultValue;
}
/**
* Check if a specific boolean configuration exists.
* @param arg The key for the configuration.
* @param defaultValue If the configuration is not found, we use a default value.
* @return The value of a configuration: true if found, defaultValue if not found.
*/
public int getConf(String arg, int i) {
Integer value = integerConfigurations.get(arg);
//System.out.println(value);
if(value != null) {
return value;
}
return i;
}
/**
* Get a specific String configuration.
* @param arg The key for the configuration.
* @param defaultValue If the configuration is not found, we use a default value.
* @return The value of the configuration, or the defaultValue.
*/
public String getConf(String arg, String defaultValue) {
String value = stringConfigurations.get(arg);
//System.out.println(value);
if(value != null) {
return value;
}
return defaultValue;
}
}