Timerix/DTLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warnings fixed

Browse Source
This commit is contained in:
Timerix22 2023-02-24 20:51:23 +06:00
parent d7a699f8d1
commit 148ad19fae
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DTLib.Dtsod/DtsodV21.cs
View File

@ -261,7 +261,7 @@ public class DtsodV21 : Dictionary<string, dynamic>, IDtsod
break; break;
default: default:
throw new Exception($"Dtsod.Parse.ReadValue() error: value= wrong type <u{stringValue[stringValue.Length - 1]}>"); throw new Exception($"Dtsod.Parse.ReadValue() error: value= wrong type <u{stringValue[stringValue.Length - 1]}>");
}; }
} }
// short; long; int // short; long; int
else else
@ -278,7 +278,7 @@ public class DtsodV21 : Dictionary<string, dynamic>, IDtsod
break; break;
} }
break; break;
}; }
} }
StringBuilder defaultValueBuilder = new(); StringBuilder defaultValueBuilder = new();
@ -303,7 +303,8 @@ public class DtsodV21 : Dictionary<string, dynamic>, IDtsod
case ValueType.Default: case ValueType.Default:
ParseValueToRightType(defaultValueBuilder.ToString()); ParseValueToRightType(defaultValueBuilder.ToString());
break; break;
}; }
return value; return value;
case '[': case '[':
value = ReadList(); value = ReadList();

9
DTLib.Dtsod/DtsodV23.cs
View File

@ -202,10 +202,15 @@ public class DtsodV23 : DtsodDict<string, dynamic>, IDtsod
: throw new Exception("can't parse value:" + value_str); : throw new Exception("can't parse value:" + value_str);
default: default:
if (value_str.Contains('.')) if (value_str.Contains('.'))
return (object)(value_str.ToDouble()); // ReSharper disable once RedundantCast
return (object)value_str.ToDouble();
else else
{ {
try { return (object)(value_str.ToInt()); } try
{
// ReSharper disable once RedundantCast
return (object)value_str.ToInt();
}
catch (FormatException) catch (FormatException)
{ {
Log("r", $"can't parse value: {value_str}"); Log("r", $"can't parse value: {value_str}");

4
DTLib.Logging/DependencyInjection/LoggerService.cs
View File

@ -4,12 +4,10 @@ namespace DTLib.Logging.DependencyInjection;
public class LoggerService<TCaller> : ServiceDescriptor public class LoggerService<TCaller> : ServiceDescriptor
{ {
DTLib.Logging.New.ILogger _logger; // ReSharper disable once RedundantNameQualifier
public LoggerService(DTLib.Logging.New.ILogger logger) : base( public LoggerService(DTLib.Logging.New.ILogger logger) : base(
typeof(Microsoft.Extensions.Logging.ILogger<TCaller>), typeof(Microsoft.Extensions.Logging.ILogger<TCaller>),
new MyLoggerWrapper<TCaller>(logger)) new MyLoggerWrapper<TCaller>(logger))
{ {
_logger = logger;
} }
} }

1
DTLib.Logging/DependencyInjection/MyLoggerWrapper.cs
View File

@ -1,5 +1,6 @@
using DTLib.Logging.New; using DTLib.Logging.New;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
// ReSharper disable RedundantNameQualifier
namespace DTLib.Logging.DependencyInjection; namespace DTLib.Logging.DependencyInjection;

2
DTLib.Logging/LogFormats/DefaultLogFormat.cs
View File

@ -27,7 +27,7 @@ public class DefaultLogFormat : ILogFormat
sb.Append('[').Append(severity.ToString()).Append(']'); sb.Append('[').Append(severity.ToString()).Append(']');
if (sb.Length != 0) if (sb.Length != 0)
sb.Append(": "); sb.Append(": ");
sb.Append(message.ToString()); sb.Append(message);
sb.Append('\n'); sb.Append('\n');
return sb.ToString(); return sb.ToString();
} }

2
DTLib/Extensions/StringConverter.cs
View File

@ -162,7 +162,7 @@ public static class StringConverter
public static List<string> SplitToList(this string s, int length) public static List<string> SplitToList(this string s, int length)
{ {
List<string> parts = new(); List<string> parts = new();
int max = (int)(s.Length / length); int max = s.Length / length;
for (int i = 0; i < max; i++) for (int i = 0; i < max; i++)
parts.Add(s.Substring(i * length, length)); parts.Add(s.Substring(i * length, length));
if (max * length != s.Length) parts.Add(s.Substring(max * length, s.Length - max * length)); if (max * length != s.Length) parts.Add(s.Substring(max * length, s.Length - max * length));