Mirrors/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-10-30 07:22:35 +01:00
Code Issues Releases Wiki Activity

removed code redundancies.

Browse Source
This commit is contained in:
kay.one 2013-07-26 22:02:25 -07:00
parent 6d3a604677
commit 9a24268ee7
24 changed files with 104 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Exceptron.Client/fastJSON/JSON.cs
View File

@ -93,12 +93,9 @@ namespace Exceptron.Client.fastJSON
string val = "";
if (_tyname.TryGetValue(t, out val))
return val;
else
{
string s = t.AssemblyQualifiedName;
_tyname.Add(t, s);
return s;
}
string s = t.AssemblyQualifiedName;
_tyname.Add(t, s);
return s;
}
readonly SafeDictionary<string, Type> _typecache = new SafeDictionary<string, Type>();
@ -107,12 +104,9 @@ namespace Exceptron.Client.fastJSON
Type val = null;
if (_typecache.TryGetValue(typename, out val))
return val;
else
{
Type t = Type.GetType(typename);
_typecache.Add(typename, t);
return t;
}
Type t = Type.GetType(typename);
_typecache.Add(typename, t);
return t;
}
readonly SafeDictionary<Type, CreateObject> _constrcache = new SafeDictionary<Type, CreateObject>();
@ -126,17 +120,14 @@ namespace Exceptron.Client.fastJSON
{
return c();
}
else
{
DynamicMethod dynMethod = new DynamicMethod("_", objtype, null, true);
ILGenerator ilGen = dynMethod.GetILGenerator();
DynamicMethod dynMethod = new DynamicMethod("_", objtype, null, true);
ILGenerator ilGen = dynMethod.GetILGenerator();
ilGen.Emit(OpCodes.Newobj, objtype.GetConstructor(Type.EmptyTypes));
ilGen.Emit(OpCodes.Ret);
c = (CreateObject)dynMethod.CreateDelegate(typeof(CreateObject));
_constrcache.Add(objtype, c);
return c();
}
ilGen.Emit(OpCodes.Newobj, objtype.GetConstructor(Type.EmptyTypes));
ilGen.Emit(OpCodes.Ret);
c = (CreateObject)dynMethod.CreateDelegate(typeof(CreateObject));
_constrcache.Add(objtype, c);
return c();
}
catch (Exception exc)
{
@ -188,22 +179,19 @@ namespace Exceptron.Client.fastJSON
{
return sd;
}
else
sd = new SafeDictionary<string, myPropInfo>();
var pr = type.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
foreach (var p in pr)
{
sd = new SafeDictionary<string, myPropInfo>();
var pr = type.GetProperties(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
foreach (var p in pr)
{
myPropInfo d = CreateMyProp(p.PropertyType, p.Name);
d.CanWrite = p.CanWrite;
d.setter = CreateSetMethod(p);
d.getter = CreateGetMethod(p);
sd.Add(p.Name, d);
}
_propertycache.Add(typename, sd);
return sd;
myPropInfo d = CreateMyProp(p.PropertyType, p.Name);
d.CanWrite = p.CanWrite;
d.setter = CreateSetMethod(p);
d.getter = CreateGetMethod(p);
sd.Add(p.Name, d);
}
_propertycache.Add(typename, sd);
return sd;
}
private myPropInfo CreateMyProp(Type t, string name)
@ -342,16 +330,16 @@ namespace Exceptron.Client.fastJSON
if (conversionType == typeof(int))
return (int)CreateLong((string)value);
else if (conversionType == typeof(long))
if (conversionType == typeof(long))
return CreateLong((string)value);
else if (conversionType == typeof(string))
if (conversionType == typeof(string))
return value;
else if (conversionType == typeof(Guid))
if (conversionType == typeof(Guid))
return CreateGuid((string)value);
else if (conversionType.IsEnum)
if (conversionType.IsEnum)
return CreateEnum(conversionType, (string)value);
return Convert.ChangeType(value, conversionType, CultureInfo.InvariantCulture);
@ -550,8 +538,7 @@ namespace Exceptron.Client.fastJSON
{
if (s.Length > 30)
return new Guid(s);
else
return new Guid(Convert.FromBase64String(s));
return new Guid(Convert.FromBase64String(s));
}
private DateTime CreateDateTime(string value)
@ -571,8 +558,7 @@ namespace Exceptron.Client.fastJSON
if (UseUTCDateTime == false && utc == false)
return new DateTime(year, month, day, hour, min, sec);
else
return new DateTime(year, month, day, hour, min, sec, DateTimeKind.Utc).ToLocalTime();
return new DateTime(year, month, day, hour, min, sec, DateTimeKind.Utc).ToLocalTime();
}
#if SILVERLIGHT

16
Marr.Data/Converters/BooleanIntConverter.cs
View File

@ -33,17 +33,14 @@ namespace Marr.Data.Converters
{
return true;
}
else if (val == 0)
if (val == 0)
{
return false;
}
else
{
throw new ConversionException(
string.Format(
throw new ConversionException(
string.Format(
"The BooleanCharConverter could not convert the value '{0}' to a boolean.",
dbValue));
}
}
public object ToDB(object clrValue)
@ -54,14 +51,11 @@ namespace Marr.Data.Converters
{
return 1;
}
else if (val == false)
if (val == false)
{
return 0;
}
else
{
return DBNull.Value;
}
return DBNull.Value;
}
public Type DbType

16
Marr.Data/Converters/BooleanYNConverter.cs
View File

@ -33,17 +33,14 @@ namespace Marr.Data.Converters
{
return true;
}
else if (val == "N")
if (val == "N")
{
return false;
}
else
{
throw new ConversionException(
string.Format(
throw new ConversionException(
string.Format(
"The BooleanYNConverter could not convert the value '{0}' to a boolean.",
dbValue));
}
}
public object ToDB(object clrValue)
@ -54,14 +51,11 @@ namespace Marr.Data.Converters
{
return "Y";
}
else if (val == false)
if (val == false)
{
return "N";
}
else
{
return DBNull.Value;
}
return DBNull.Value;
}
public Type DbType

6
Marr.Data/Converters/EnumIntConverter.cs
View File

@ -24,16 +24,14 @@ namespace Marr.Data.Converters
{
if (dbValue == null || dbValue == DBNull.Value)
return null;
else
return Enum.ToObject(map.FieldType, (int)dbValue);
return Enum.ToObject(map.FieldType, (int)dbValue);
}
public object ToDB(object clrValue)
{
if (clrValue == null)
return DBNull.Value;
else
return (int)clrValue;
return (int)clrValue;
}
public Type DbType

6
Marr.Data/Converters/EnumStringConverter.cs
View File

@ -24,16 +24,14 @@ namespace Marr.Data.Converters
{
if (dbValue == null || dbValue == DBNull.Value)
return null;
else
return Enum.Parse(map.FieldType, (string)dbValue);
return Enum.Parse(map.FieldType, (string)dbValue);
}
public object ToDB(object clrValue)
{
if (clrValue == null)
return DBNull.Value;
else
return clrValue.ToString();
return clrValue.ToString();
}
public Type DbType

5
Marr.Data/DataHelper.cs
View File

@ -65,10 +65,7 @@ namespace Marr.Data
{
return col.TryGetAltName();
}
else
{
return col.Name;
}
return col.Name;
}
/// <summary>

9
Marr.Data/DataMapper.cs
View File

@ -174,8 +174,7 @@ namespace Marr.Data
{
if (string.IsNullOrEmpty(sql))
throw new ArgumentNullException("sql", "A SQL query or stored procedure name is required");
else
Command.CommandText = sql;
Command.CommandText = sql;
try
{
@ -197,8 +196,7 @@ namespace Marr.Data
{
if (string.IsNullOrEmpty(sql))
throw new ArgumentNullException("sql", "A SQL query or stored procedure name is required");
else
Command.CommandText = sql;
Command.CommandText = sql;
try
{
@ -223,8 +221,7 @@ namespace Marr.Data
{
if (string.IsNullOrEmpty(sql))
throw new ArgumentNullException("sql", "A SQL query or stored procedure name is required");
else
Command.CommandText = sql;
Command.CommandText = sql;
try
{

18
Marr.Data/MapRepository.cs
View File

@ -105,11 +105,8 @@ namespace Marr.Data
// Return entity specific column map strategy
return _columnMapStrategies[entityType];
}
else
{
// Return the default column map strategy
return _columnMapStrategies[typeof(object)];
}
// Return the default column map strategy
return _columnMapStrategies[typeof(object)];
}
#endregion
@ -219,21 +216,18 @@ namespace Marr.Data
// User registered type converter
return TypeConverters[dataType];
}
else if (TypeConverters.ContainsKey(typeof(Enum)) && dataType.IsEnum)
if (TypeConverters.ContainsKey(typeof(Enum)) && dataType.IsEnum)
{
// A converter is registered to handled enums
return TypeConverters[typeof(Enum)];
}
else if (TypeConverters.ContainsKey(typeof(object)))
if (TypeConverters.ContainsKey(typeof(object)))
{
// User registered default converter
return TypeConverters[typeof(object)];
}
else
{
// No conversion
return null;
}
// No conversion
return null;
}
#endregion

5
Marr.Data/Mapping/ColumnAttribute.cs
View File

@ -109,10 +109,7 @@ namespace Marr.Data.Mapping
{
return AltName;
}
else
{
return Name;
}
return Name;
}
}
}

5
Marr.Data/Mapping/ColumnInfo.cs
View File

@ -26,10 +26,7 @@ namespace Marr.Data.Mapping
{
return AltName;
}
else
{
return Name;
}
return Name;
}
}
}

5
Marr.Data/Mapping/ColumnMapBuilder.cs
View File

@ -216,10 +216,7 @@ namespace Marr.Data.Mapping
fieldName,
typeof(TEntity).Name));
}
else
{
MappedColumns.Add(columnMap);
}
MappedColumns.Add(columnMap);
}
/// <summary>

5
Marr.Data/Mapping/RelationshipBuilder.cs
View File

@ -153,10 +153,7 @@ namespace Marr.Data.Mapping
fieldName,
typeof(TEntity).Name));
}
else
{
Relationships.Add(relationship);
}
Relationships.Add(relationship);
}
/// <summary>

5
Marr.Data/Mapping/Strategies/ReflectionMapStrategyBase.cs
View File

@ -67,10 +67,7 @@ namespace Marr.Data.Mapping.Strategies
{
return (atts[0] as TableAttribute).Name;
}
else
{
return entityType.Name;
}
return entityType.Name;
}
/// <summary>

25
Marr.Data/Parameters/DbTypeBuilder.cs
View File

@ -25,41 +25,40 @@ namespace Marr.Data.Parameters
if (type == typeof(String))
return DbType.String;
else if (type == typeof(Int32))
if (type == typeof(Int32))
return DbType.Int32;
else if (type == typeof(Decimal))
if (type == typeof(Decimal))
return DbType.Decimal;
else if (type == typeof(DateTime))
if (type == typeof(DateTime))
return DbType.DateTime;
else if (type == typeof(Boolean))
if (type == typeof(Boolean))
return DbType.Boolean;
else if (type == typeof(Int16))
if (type == typeof(Int16))
return DbType.Int16;
else if (type == typeof(Single))
if (type == typeof(Single))
return DbType.Single;
else if (type == typeof(Int64))
if (type == typeof(Int64))
return DbType.Int64;
else if (type == typeof(Double))
if (type == typeof(Double))
return DbType.Double;
else if (type == typeof(Byte))
if (type == typeof(Byte))
return DbType.Byte;
else if (type == typeof(Byte[]))
if (type == typeof(Byte[]))
return DbType.Binary;
else if (type == typeof(Guid))
if (type == typeof(Guid))
return DbType.Guid;
else
return DbType.Object;
return DbType.Object;
}
public void SetDbType(IDbDataParameter param, Enum dbType)

23
Marr.Data/Parameters/OleDbTypeBuilder.cs
View File

@ -26,38 +26,37 @@ namespace Marr.Data.Parameters
if (type == typeof(String))
return OleDbType.VarChar;
else if (type == typeof(Int32))
if (type == typeof(Int32))
return OleDbType.Integer;
else if (type == typeof(Decimal))
if (type == typeof(Decimal))
return OleDbType.Decimal;
else if (type == typeof(DateTime))
if (type == typeof(DateTime))
return OleDbType.DBTimeStamp;
else if (type == typeof(Boolean))
if (type == typeof(Boolean))
return OleDbType.Boolean;
else if (type == typeof(Int16))
if (type == typeof(Int16))
return OleDbType.SmallInt;
else if (type == typeof(Int64))
if (type == typeof(Int64))
return OleDbType.BigInt;
else if (type == typeof(Double))
if (type == typeof(Double))
return OleDbType.Double;
else if (type == typeof(Byte))
if (type == typeof(Byte))
return OleDbType.Binary;
else if (type == typeof(Byte[]))
if (type == typeof(Byte[]))
return OleDbType.VarBinary;
else if (type == typeof(Guid))
if (type == typeof(Guid))
return OleDbType.Guid;
else
return OleDbType.Variant;
return OleDbType.Variant;
}
public void SetDbType(IDbDataParameter param, Enum dbType)

25
Marr.Data/Parameters/SqlDbTypeBuilder.cs
View File

@ -26,41 +26,40 @@ namespace Marr.Data.Parameters
if (type == typeof(String))
return SqlDbType.VarChar;
else if (type == typeof(Int32))
if (type == typeof(Int32))
return SqlDbType.Int;
else if (type == typeof(Decimal))
if (type == typeof(Decimal))
return SqlDbType.Decimal;
else if (type == typeof(DateTime))
if (type == typeof(DateTime))
return SqlDbType.DateTime;
else if (type == typeof(Boolean))
if (type == typeof(Boolean))
return SqlDbType.Bit;
else if (type == typeof(Int16))
if (type == typeof(Int16))
return SqlDbType.SmallInt;
else if (type == typeof(Int64))
if (type == typeof(Int64))
return SqlDbType.BigInt;
else if (type == typeof(Double))
if (type == typeof(Double))
return SqlDbType.Float;
else if (type == typeof(Char))
if (type == typeof(Char))
return SqlDbType.Char;
else if (type == typeof(Byte))
if (type == typeof(Byte))
return SqlDbType.Binary;
else if (type == typeof(Byte[]))
if (type == typeof(Byte[]))
return SqlDbType.VarBinary;
else if (type == typeof(Guid))
if (type == typeof(Guid))
return SqlDbType.UniqueIdentifier;
else
return SqlDbType.Variant;
return SqlDbType.Variant;
}
public void SetDbType(IDbDataParameter param, Enum dbType)

5
Marr.Data/QGen/PagingQueryDecorator.cs
View File

@ -32,10 +32,7 @@ namespace Marr.Data.QGen
{
return ComplexPaging();
}
else
{
return SimplePaging();
}
return SimplePaging();
}
/// <summary>

5
Marr.Data/QGen/RowCountQueryDecorator.cs
View File

@ -18,10 +18,7 @@ namespace Marr.Data.QGen
{
return ComplexRowCount();
}
else
{
return SimpleRowCount();
}
return SimpleRowCount();
}
/// <summary>

5
Marr.Data/QGen/SelectQuery.cs
View File

@ -95,10 +95,7 @@ namespace Marr.Data.QGen
{
return columnInfo.AltName;
}
else
{
return columnInfo.Name;
}
return columnInfo.Name;
}
public void BuildFromClause(StringBuilder sql)

5
Marr.Data/QGen/SqlitePagingQueryDecorator.cs
View File

@ -32,10 +32,7 @@ namespace Marr.Data.QGen
{
return ComplexPaging();
}
else
{
return SimplePaging();
}
return SimplePaging();
}
private string SimplePaging()

5
Marr.Data/QGen/WhereBuilder.cs
View File

@ -281,10 +281,7 @@ namespace Marr.Data.QGen
{
return _sb.ToString();
}
else
{
return _constantWhereClause;
}
return _constantWhereClause;
}
}

7
Marr.Data/Reflection/ReflectionHelper.cs
View File

@ -32,14 +32,11 @@ namespace Marr.Data.Reflection
{
return null;
}
else if (fieldType.IsValueType)
if (fieldType.IsValueType)
{
return Activator.CreateInstance(fieldType);
}
else
{
return null;
}
return null;
}
/// <summary>

2
NzbDrone.Common/PathExtensions.cs
View File

@ -11,11 +11,11 @@ namespace NzbDrone.Common
private const string NZBDRONE_LOG_DB = "logs.db";
private const string BACKUP_ZIP_FILE = "NzbDrone_Backup.zip";
private const string NLOG_CONFIG_FILE = "nlog.config";
private const string UPDATE_CLIENT_EXE = "nzbdrone.update.exe";
private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "nzbdrone_update" + Path.DirectorySeparatorChar;
private static readonly string UPDATE_PACKAGE_FOLDER_NAME = "nzbdrone" + Path.DirectorySeparatorChar;
private static readonly string UPDATE_BACKUP_FOLDER_NAME = "nzbdrone_backup" + Path.DirectorySeparatorChar;
private static readonly string UPDATE_CLIENT_EXE = "nzbdrone.update.exe";
private static readonly string UPDATE_CLIENT_FOLDER_NAME = "NzbDrone.Update" + Path.DirectorySeparatorChar;
private static readonly string UPDATE_LOG_FOLDER_NAME = "UpdateLogs" + Path.DirectorySeparatorChar;

7
NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
View File

@ -118,12 +118,9 @@ namespace NzbDrone.Core.Notifications.Xbmc
return null;
}
else
{
var matchingSeries = allSeries.FirstOrDefault(s => s.ImdbNumber == series.TvdbId || s.Label == series.Title);
var matchingSeries = allSeries.FirstOrDefault(s => s.ImdbNumber == series.TvdbId || s.Label == series.Title);
if (matchingSeries != null) return matchingSeries.File;
}
if (matchingSeries != null) return matchingSeries.File;
return null;
}