github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 13:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Dictionary support

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@857 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2010-08-24 12:05:57 +00:00
commit ea26f9ca50
3 changed files with 95 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Greenshot/Forms/MainForm.cs
View file

@ -92,6 +92,11 @@ namespace Greenshot {
LOG.Info("\t" + destination); LOG.Info("\t" + destination);
} }
} }
if (conf.testProp != null) {
foreach(string key in conf.testProp.Keys) {
LOG.Info("\t" + String.Format("{0}={1}", key, conf.testProp[key]));
}
}
try { try {
// Fix for Bug 2495900, Multi-user Environment // Fix for Bug 2495900, Multi-user Environment

4
GreenshotCore/Configuration/CoreConfiguration.cs
View file

@ -92,8 +92,8 @@ namespace Greenshot.Core {
[IniProperty("OutputPrintTimestamp", Description="Print timestamp on print?", DefaultValue="true")] [IniProperty("OutputPrintTimestamp", Description="Print timestamp on print?", DefaultValue="true")]
public bool OutputPrintTimestamp; public bool OutputPrintTimestamp;
//[IniProperty("Test", Description="Print timestamp on print?", DefaultValue="")] [IniProperty("Test", Description="Test property", DefaultValue="")]
//public Dictionary<string, bool> testProp; public Dictionary<string, bool> testProp;
/// <summary> /// <summary>
/// Supply values we can't put as defaults /// Supply values we can't put as defaults

136
GreenshotCore/Core/ConfigHelper.cs
View file

@ -183,6 +183,11 @@ namespace Greenshot.Core {
if (Attribute.IsDefined(field, typeof(IniPropertyAttribute))) { if (Attribute.IsDefined(field, typeof(IniPropertyAttribute))) {
IniPropertyAttribute iniPropertyAttribute = (IniPropertyAttribute)field.GetCustomAttributes(typeof(IniPropertyAttribute), false)[0]; IniPropertyAttribute iniPropertyAttribute = (IniPropertyAttribute)field.GetCustomAttributes(typeof(IniPropertyAttribute), false)[0];
string propertyName = iniPropertyAttribute.Name; string propertyName = iniPropertyAttribute.Name;
string propertyDefaultValue = iniPropertyAttribute.DefaultValue;
if (propertyDefaultValue == null) {
propertyDefaultValue = section.GetDefault(propertyName);
}
string propertyValue = null; string propertyValue = null;
// Get the value from the ini file, if there is none take the default // Get the value from the ini file, if there is none take the default
if (properties != null && properties.ContainsKey(propertyName)) { if (properties != null && properties.ContainsKey(propertyName)) {
@ -190,59 +195,18 @@ namespace Greenshot.Core {
} else { } else {
// Mark as dirty, we didn't use properties from the file (even defaults from the default file are allowed) // Mark as dirty, we didn't use properties from the file (even defaults from the default file are allowed)
section.IsDirty = true; section.IsDirty = true;
if (iniPropertyAttribute.DefaultValue != null) { propertyValue = propertyDefaultValue;
propertyValue = iniPropertyAttribute.DefaultValue;
} else {
propertyValue = section.GetDefault(propertyName);
}
LOG.Debug("Using default: " + propertyName + "=" + propertyValue); LOG.Debug("Using default: " + propertyName + "=" + propertyValue);
} }
// Get the type, or the underlying type for nullables // Get the type, or the underlying type for nullables
Type fieldType = field.FieldType; Type fieldType = field.FieldType;
try {
// Now set the value field.SetValue(section, CreateFieldValue(fieldType, sectionName, propertyName, propertyValue));
if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(List<>)) { } catch (Exception) {
string[] arrayValues = propertyValue.Split(new Char[] {','}); // Mark as dirty, we didn't use properties from the file (even defaults from the default file are allowed)
if (arrayValues != null) { section.IsDirty = true;
object list = Activator.CreateInstance(fieldType); field.SetValue(section, CreateFieldValue(fieldType, sectionName, propertyName, propertyDefaultValue));
MethodInfo methodInfo = fieldType.GetMethod("Add");
foreach(string arrayValue in arrayValues) {
if (arrayValue != null && arrayValue.Length > 0) {
object newValue = null;
try {
newValue = ConvertValueToFieldType(fieldType.GetGenericArguments()[0], arrayValue);
} catch (Exception e) {
LOG.Error("Problem converting " + fieldType.FullName, e);
}
if (newValue != null) {
LOG.Debug("Adding: " + newValue);
methodInfo.Invoke(list, new object[] {newValue});
}
}
}
field.SetValue(section, list);
}
} else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Dictionary<,>)) {
Type type1 = fieldType.GetGenericArguments()[0];
Type type2 = fieldType.GetGenericArguments()[1];
LOG.Info(String.Format("Found Dictionary<{0},{1}>",type1.Name, type2.Name));
} else {
if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition().Equals(typeof(Nullable<>))) {
// We are dealing with a generic type that is nullable
fieldType = Nullable.GetUnderlyingType(fieldType);
}
object newValue = null;
try {
newValue = ConvertValueToFieldType(fieldType, propertyValue);
} catch (Exception e) {
LOG.Warn("Problem converting " + fieldType.FullName + " taking defaults", e);
newValue = ConvertValueToFieldType(fieldType, iniPropertyAttribute.DefaultValue);
}
field.SetValue(section, newValue);
} }
} }
} }
@ -250,6 +214,66 @@ namespace Greenshot.Core {
return section; return section;
} }
/// <summary>
/// Helper method for creating a value
/// </summary>
/// <param name="fieldType">Type of the value to create</param>
/// <param name="propertyValue">Value as string</param>
/// <returns>object instance of the value</returns>
private static object CreateFieldValue(Type fieldType, string sectionName, string propertyName, string propertyValue) {
// Now set the value
if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(List<>)) {
// Logic for List<>
string[] arrayValues = propertyValue.Split(new Char[] {','});
if (arrayValues != null) {
object list = Activator.CreateInstance(fieldType);
MethodInfo addMethodInfo = fieldType.GetMethod("Add");
foreach(string arrayValue in arrayValues) {
if (arrayValue != null && arrayValue.Length > 0) {
object newValue = null;
try {
newValue = ConvertValueToFieldType(fieldType.GetGenericArguments()[0], arrayValue);
} catch (Exception e) {
LOG.Error("Problem converting " + fieldType.FullName, e);
}
if (newValue != null) {
LOG.Debug("Adding: " + newValue);
addMethodInfo.Invoke(list, new object[] {newValue});
}
}
}
return list;
}
} else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Dictionary<,>)) {
// Logic for Dictionary<,>
Type type1 = fieldType.GetGenericArguments()[0];
Type type2 = fieldType.GetGenericArguments()[1];
LOG.Info(String.Format("Found Dictionary<{0},{1}>",type1.Name, type2.Name));
object dictionary = Activator.CreateInstance(fieldType);
MethodInfo addMethodInfo = fieldType.GetMethod("Add");
Dictionary<string, string> properties = iniProperties[sectionName];
foreach(string key in properties.Keys) {
if (key != null && key.StartsWith(propertyName + ".")) {
// What "key" do we need to store it under?
string subPropertyName = key.Substring(propertyName.Length + 1);
string stringValue = properties[key];
object newValue1 = ConvertValueToFieldType(type1, subPropertyName);
object newValue2 = ConvertValueToFieldType(type2, stringValue);
addMethodInfo.Invoke(dictionary, new object[] {newValue1, newValue2});
}
}
return dictionary;
} else {
if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition().Equals(typeof(Nullable<>))) {
// We are dealing with a generic type that is nullable
fieldType = Nullable.GetUnderlyingType(fieldType);
}
return ConvertValueToFieldType(fieldType, propertyValue);
}
return null;
}
private static object ConvertValueToFieldType(Type fieldType, string valueString) { private static object ConvertValueToFieldType(Type fieldType, string valueString) {
if (valueString == null || valueString.Length == 0) { if (valueString == null || valueString.Length == 0) {
return null; return null;
@ -429,6 +453,22 @@ namespace Greenshot.Core {
} }
} }
writer.WriteLine(); writer.WriteLine();
} else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Dictionary<,>)) {
// Handle dictionaries.
// Get the methods we need to deal with dictionaries.
var keys = fieldType.GetProperty("Keys").GetValue(value, null);
var item = fieldType.GetProperty("Item");
var enumerator = keys.GetType().GetMethod("GetEnumerator").Invoke(keys, null);
var moveNext = enumerator.GetType().GetMethod("MoveNext");
var current = enumerator.GetType().GetProperty("Current").GetGetMethod();
// Get all the values.
while ((bool)moveNext.Invoke(enumerator, null)) {
var key = current.Invoke(enumerator, null);
var valueObject = item.GetValue(value, new object[] { key });
// Write to ini file!
writer.WriteLine("{0}.{1}={2}", iniPropertyAttribute.Name, ConvertValueToString(key), ConvertValueToString(valueObject));
}
} else { } else {
writer.WriteLine("{0}={1}", iniPropertyAttribute.Name, ConvertValueToString(value)); writer.WriteLine("{0}={1}", iniPropertyAttribute.Name, ConvertValueToString(value));
} }