tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-05-06 15:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic Management Fix

Browse source 
- fixed on Login selection of the Auto-Start option
- added the AutoStartOnLogin option to the sync
This commit is contained in:
Brett Hewitson 2022-08-15 14:51:31 +10:00
parent 0957d51e96
commit 10e6a08a3e
9 changed files with 103 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ARKServerManager/Lib/ServerProfile.cs
View file

@ -6040,19 +6040,23 @@ namespace ServerManagerTool.Lib
private void SyncAutomaticManagement(ServerProfile sourceProfile)
{
this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup);
this.SetValue(EnableAutoStartProperty, sourceProfile.EnableAutoStart);
this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate);
this.SetValue(AutoStartOnLoginProperty, sourceProfile.AutoStartOnLogin);
this.SetValue(EnableAutoShutdown1Property, sourceProfile.EnableAutoShutdown1);
this.SetValue(AutoShutdownTime1Property, sourceProfile.AutoShutdownTime1);
this.SetValue(ShutdownDaysOfTheWeek1Property, sourceProfile.ShutdownDaysOfTheWeek1);
this.SetValue(RestartAfterShutdown1Property, sourceProfile.RestartAfterShutdown1);
this.SetValue(UpdateAfterShutdown1Property, sourceProfile.UpdateAfterShutdown1);
this.SetValue(EnableAutoShutdown2Property, sourceProfile.EnableAutoShutdown2);
this.SetValue(AutoShutdownTime2Property, sourceProfile.AutoShutdownTime2);
this.SetValue(ShutdownDaysOfTheWeek2Property, sourceProfile.ShutdownDaysOfTheWeek2);
this.SetValue(RestartAfterShutdown2Property, sourceProfile.RestartAfterShutdown2);
this.SetValue(UpdateAfterShutdown2Property, sourceProfile.UpdateAfterShutdown2);
this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup);
this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate);
this.SetValue(AutoRestartIfShutdownProperty, sourceProfile.AutoRestartIfShutdown);
}

4
src/ARKServerManager/UserControls/ServerSettingsControl.xaml
View file

@ -1402,8 +1402,8 @@
<cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" Text="{DynamicResource ServerSettings_AutoStartServerLabel}" VerticalAlignment="Bottom" IsChecked="{Binding EnableAutoStart, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AutoStartServerTooltip}" HorizontalAlignment="Left"/>
<StackPanel Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" Orientation="Horizontal">
<RadioButton GroupName="AutoStartServer" Margin="10,0,0,0" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin, Converter={StaticResource InvertBooleanConverter}}" Content="{DynamicResource ServerSettings_AutoStartServerOnBootLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnBootTooltip}"/>
<RadioButton GroupName="AutoStartServer" Margin="5,0,0,0" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin}" Content="{DynamicResource ServerSettings_AutoStartServerOnLoginLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnLoginTooltip}"/>
<RadioButton GroupName="AutoStartServer" Margin="0,0,5,0" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin, Converter={cc:BooleanEqualsConverter}, ConverterParameter=false}" Content="{DynamicResource ServerSettings_AutoStartServerOnBootLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnBootTooltip}"/>
<RadioButton GroupName="AutoStartServer" Margin="5,0,0,0" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin, Converter={cc:BooleanEqualsConverter}, ConverterParameter=true}" Content="{DynamicResource ServerSettings_AutoStartServerOnLoginLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnLoginTooltip}"/>
</StackPanel>
<cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" Name="EnableAutoShutdown1Checkbox" IsChecked="{Binding EnableAutoShutdown1, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableAutoShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}"/>

8
src/ARKServerManager/VersionFeed.xml
View file

@ -5,14 +5,14 @@
<title>Ark Server Manager Version Feed</title>
<subtitle>This is the Ark Server Manager release version feed.</subtitle>
<link href="https://arkservermanager.freeforums.net/" />
<updated>2022-08-08T00:00:00Z</updated>
<updated>2022-08-15T00:00:00Z</updated>
<entry>
<id>urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633</id>
<title>1.1.437 (1.1.437.6)</title>
<summary>1.1.437.6</summary>
<title>1.1.437 (1.1.437.7)</title>
<summary>1.1.437.7</summary>
<link href="" />
<updated>2022-08-09T00:00:00Z</updated>
<updated>2022-08-15T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>

25
src/ARKServerManager/VersionFeedBeta.xml
View file

@ -5,7 +5,30 @@
<title>Ark Server Manager Version Feed</title>
<subtitle>This is the Ark Server Manager beta version feed.</subtitle>
<link href="https://arkservermanager.freeforums.net/" />
<updated>2022-08-09T00:00:00Z</updated>
<updated>2022-08-15T00:00:00Z</updated>
<entry>
<id>urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633</id>
<title>1.1.437 (1.1.437.7)</title>
<summary>1.1.437.7</summary>
<link href="" />
<updated>2022-08-15T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Automatic Management Section - fixed on Login selection of the Auto-Start option.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633</id>

8
src/ConanServerManager/Lib/ServerProfile.cs
View file

@ -1667,19 +1667,23 @@ namespace ServerManagerTool.Lib
private void SyncAutomaticManagement(ServerProfile sourceProfile)
{
this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup);
this.SetValue(EnableAutoStartProperty, sourceProfile.EnableAutoStart);
this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate);
this.SetValue(AutoStartOnLoginProperty, sourceProfile.AutoStartOnLogin);
this.SetValue(EnableAutoShutdown1Property, sourceProfile.EnableAutoShutdown1);
this.SetValue(AutoShutdownTime1Property, sourceProfile.AutoShutdownTime1);
this.SetValue(ShutdownDaysOfTheWeek1Property, sourceProfile.ShutdownDaysOfTheWeek1);
this.SetValue(RestartAfterShutdown1Property, sourceProfile.RestartAfterShutdown1);
this.SetValue(UpdateAfterShutdown1Property, sourceProfile.UpdateAfterShutdown1);
this.SetValue(EnableAutoShutdown2Property, sourceProfile.EnableAutoShutdown2);
this.SetValue(AutoShutdownTime2Property, sourceProfile.AutoShutdownTime2);
this.SetValue(ShutdownDaysOfTheWeek2Property, sourceProfile.ShutdownDaysOfTheWeek2);
this.SetValue(RestartAfterShutdown2Property, sourceProfile.RestartAfterShutdown2);
this.SetValue(UpdateAfterShutdown2Property, sourceProfile.UpdateAfterShutdown2);
this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup);
this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate);
this.SetValue(AutoRestartIfShutdownProperty, sourceProfile.AutoRestartIfShutdown);
}

4
src/ConanServerManager/UserControls/ServerSettingsControl.xaml
View file

@ -983,8 +983,8 @@
<CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" Content="{DynamicResource ServerSettings_AutoStartServerLabel}" VerticalAlignment="Bottom" IsChecked="{Binding EnableAutoStart}" ToolTip="{DynamicResource ServerSettings_AutoStartServerTooltip}" HorizontalAlignment="Left"/>
<StackPanel Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" Orientation="Horizontal">
<RadioButton GroupName="AutoStartServer" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin, Converter={StaticResource InvertBooleanConverter}}" Content="{DynamicResource ServerSettings_AutoStartServerOnBootLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnBootTooltip}"/>
<RadioButton GroupName="AutoStartServer" Margin="5,0,0,0" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin}" Content="{DynamicResource ServerSettings_AutoStartServerOnLoginLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnLoginTooltip}"/>
<RadioButton GroupName="AutoStartServer" Margin="0,0,5,0" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin, Converter={cc:BooleanEqualsConverter}, ConverterParameter=false}" Content="{DynamicResource ServerSettings_AutoStartServerOnBootLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnBootTooltip}"/>
<RadioButton GroupName="AutoStartServer" Margin="5,0,0,0" VerticalAlignment="Bottom" IsEnabled="{Binding EnableAutoStart}" IsChecked="{Binding AutoStartOnLogin, Converter={cc:BooleanEqualsConverter}, ConverterParameter=true}" Content="{DynamicResource ServerSettings_AutoStartServerOnLoginLabel}" ToolTip="{DynamicResource ServerSettings_AutoStartServerOnLoginTooltip}"/>
</StackPanel>
<CheckBox Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" Name="EnableAutoShutdown1Checkbox" IsChecked="{Binding EnableAutoShutdown1}" Content="{DynamicResource ServerSettings_EnableAutoShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}"/>

25
src/ConanServerManager/VersionFeed.xml
View file

@ -5,7 +5,30 @@
<title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager release version feed.</subtitle>
<link href="https://servermanagers.freeforums.net/" />
<updated>2022-08-08T00:00:00Z</updated>
<updated>2022-08-15T00:00:00Z</updated>
<entry>
<id>urn:uuid:BFC591B5-6DF6-48FF-9107-E5B9C41EC1C1</id>
<title>1.1.81 (1.1.81.1)</title>
<summary>1.1.81.1</summary>
<link href="" />
<updated>2022-08-15T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Automatic Management Section - fixed on Login selection of the Auto-Start option.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>

128
src/ConanServerManager/VersionFeedBeta.xml
View file

@ -5,137 +5,21 @@
<title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager beta version feed.</subtitle>
<link href="https://servermanagers.freeforums.net/" />
<updated>2022-08-08T00:00:00Z</updated>
<updated>2022-08-15T00:00:00Z</updated>
<entry>
<id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>
<title>1.1.80 (1.1.80.6)</title>
<summary>1.1.80.6</summary>
<id>urn:uuid:BFC591B5-6DF6-48FF-9107-E5B9C41EC1C1</id>
<title>1.1.81 (1.1.81.1)</title>
<summary>1.1.81.1</summary>
<link href="" />
<updated>2022-08-08T00:00:00Z</updated>
<updated>2022-08-15T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Automatic Management - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>
<title>1.1.80 (1.1.80.5)</title>
<summary>1.1.80.5</summary>
<link href="" />
<updated>2022-08-08T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Support Zip - added missing settings.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>
<title>1.1.80 (1.1.80.4)</title>
<summary>1.1.80.4</summary>
<link href="" />
<updated>2022-08-08T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Automatic Management - rearranged the options so they are grouped correctly.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>
<title>1.1.80 (1.1.80.3)</title>
<summary>1.1.80.3</summary>
<link href="" />
<updated>2022-08-07T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Auto-Start Server Option - added a new option selection for on Boot and on Login.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>
<title>1.1.80 (1.1.80.2)</title>
<summary>1.1.80.2</summary>
<link href="" />
<updated>2022-08-07T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Settings Coloring - Set the coloring of the settings window to Blue when Testlive option selected.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>
<title>1.1.80 (1.1.80.1)</title>
<summary>1.1.80.1</summary>
<link href="" />
<updated>2022-08-07T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Server Details Section - added new option to use the Conan Testlive Dedicated Server files. This new option will switch the steam application id of the server files to use the Conan Testlive Dedicated Server files, instead of the Conan Dedicated Server files.</li>
<li>Server Update - updated the code to determine which set of dedicated server files (Conan or Conan Testlive) is required when performing server and mod file updates. Separate Cache folders will be maintained for each.</li>
<li>Automatic Management Section - fixed on Login selection of the Auto-Start option.</li>
</ul>
</p>
</div>

29
src/ServerManager.Common/Converters/BooleanEqualsConverter.cs Normal file
View file

@ -0,0 +1,29 @@
using System;
using System.Globalization;
using System.Windows.Data;
using System.Windows.Markup;
namespace ServerManagerTool.Common.Converters
{
public class BooleanEqualsConverter : MarkupExtension, IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var convertedValue = System.Convert.ToBoolean(value);
var parameterValue = System.Convert.ToBoolean(parameter);
return convertedValue.Equals(parameterValue);
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
var convertedValue = System.Convert.ToBoolean(value);
var parameterValue = System.Convert.ToBoolean(parameter);
return convertedValue ? parameterValue : Binding.DoNothing;
}
public override object ProvideValue(IServiceProvider serviceProvider)
{
return this;
}
}
}