Skip to content

Added missing -secondsempty flag from channellist server command #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bonzaii wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added missing -secondsempty flag from channellist server command #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc5744e
Added -secondsempty flag to channellist command
bonzaii Apr 3, 2020
bb77dbb
Added -secondsempty flag to channellist command (code cleaning)
bonzaii Apr 3, 2020
3f30ed4
Hack for null client_icon_id
bonzaii Apr 4, 2020
397fa82
building agenst newer .net core (3.1.0)
bonzaii Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions TS3QueryLib.Net.Core.TestApp/TS3QueryLib.Net.Core.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>TS3QueryLib.Net.Core.TestApp</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>TS3QueryLib.Net.Core.TestApp</PackageId>
<RuntimeFrameworkVersion>2.0.3</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
Expand Down
9 changes: 7 additions & 2 deletions TS3QueryLib.Net.Core/Common/CommandHandling/CommandParameterGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,13 @@ public static T ConvertValue<T>(string parameterName, string parameterValue)
try
{
if (default(T) != null && parameterValue == null)
throw new InvalidCastException(string.Format("Can not cast null value of parameter '{0}' to target type '{1}'.", parameterName, targetType));

{
if (parameterName.Contains("client_icon_id"))
parameterValue = "0";
else
throw new InvalidCastException(string.Format("Can not cast null value of parameter '{0}' to target type '{1}'.", parameterName, targetType));
}

if (parameterValue != null && (targetType == typeof(uint) || targetType == typeof(uint?)))
{
decimal decimalValue = Convert.ToDecimal(parameterValue, CultureInfo.InvariantCulture);
Expand Down
5 changes: 4 additions & 1 deletion TS3QueryLib.Net.Core/Server/Commands/ChannelListCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace TS3QueryLib.Net.Core.Server.Commands
{
public class ChannelListCommand : ExecutableEntityListCommand<ChannelListEntry>
{
public ChannelListCommand(bool includeAll, bool includeTopics = false, bool includeFlags = false, bool includeVoiceInfo = false, bool includeLimits = false, bool includeIcon = false) : base("ChannelList")
public ChannelListCommand(bool includeAll, bool includeTopics = false, bool includeFlags = false, bool includeVoiceInfo = false, bool includeLimits = false, bool includeIcon = false, bool includeSecondsEmpty = false) : base("ChannelList")
{
if (includeTopics || includeAll)
AddOption("topic");
Expand All @@ -21,6 +21,9 @@ public ChannelListCommand(bool includeAll, bool includeTopics = false, bool incl

if (includeIcon || includeAll)
AddOption("icon");

if (includeSecondsEmpty || includeAll)
AddOption("secondsempty");
}
}
}
8 changes: 8 additions & 0 deletions TS3QueryLib.Net.Core/Server/Entitities/ChannelListEntryBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ public SpacerInfo SpacerInfo

public uint? ChannelIconId { get; protected set; }

#endregion

#region SecondsEmpty-Properties

public double? SecondsEmpty { get; protected set; }

#endregion
#endregion

Expand Down Expand Up @@ -106,6 +112,8 @@ protected void ApplyFrom(CommandParameterGroup currrentParameterGroup, CommandPa
MaxClients = currrentParameterGroup.GetParameterValue<int?>("channel_maxclients");
MaxFamilyClients = currrentParameterGroup.GetParameterValue<int?>("channel_maxfamilyclients");
ChannelIconId = currrentParameterGroup.GetParameterValue<uint?>("channel_icon_id");

SecondsEmpty = currrentParameterGroup.GetParameterValue<double?>("seconds_empty");
}

#endregion
Expand Down
2 changes: 1 addition & 1 deletion TS3QueryLib.Net.Core/TS3QueryLib.Net.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Copyright>Copyright © Jens Hofmann 2016</Copyright>
<AssemblyTitle>TS3QueryLib.Net.Core</AssemblyTitle>
<Authors>Jens Hofmann</Authors>
<TargetFrameworks>netstandard1.4;netstandard1.6;netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard1.4;netstandard1.6;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyName>TS3QueryLib.Net.Core</AssemblyName>
<PackageId>TS3QueryLib.Net.Core</PackageId>
<PackageTags>TeamSpeak;Query;C#;CSharp</PackageTags>
Expand Down