Skip to content

Commit bbb5a02

Browse files
SplamySplamy
committed
appv test v3
1 parent 46f41bb commit bbb5a02

11 files changed

+327
-242
lines changed

‎GitVersion.yml

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@ branches:
55
tag: ''
66
increment: Patch
77
prevent-increment-of-merged-branch-version: true
8-
track-merge-target: false
98
regex: ^master$
10-
tracks-release-branches: false
11-
is-release-branch: false
129
is-mainline: true
1310
develop:
11+
mode: ContinuousDeployment
1412
tag: alpha
1513
increment: Minor
16-
prevent-increment-of-merged-branch-version: false
17-
track-merge-target: true
14+
prevent-increment-of-merged-branch-version: true
1815
regex: ^develop$
19-
tracks-release-branches: true
20-
is-release-branch: false
2116
ignore:
2217
sha: []
2318
merge-message-formats: {}

‎TS3AudioBot/Config/ConfigStructs.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class ConfFactories : ConfigTable
5555
{
5656
public ConfPath Media { get; } = Create<ConfPath>("media",
5757
"The default path to look for local resources.");
58-
public ConfResolverYoutube Youtube = Create<ConfResolverYoutube>("youtube");
58+
public ConfResolverYoutube Youtube { get; } = Create<ConfResolverYoutube>("youtube");
5959
}
6060

6161
public class ConfResolverYoutube : ConfigTable

‎TS3AudioBot/Setup.cs

+15-9
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ internal static class Setup
2727
{
2828
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
2929

30-
public static void Main(string[] args)
31-
{
32-
DedicatedTaskScheduler.FromCurrentThread(() => MainAsync(args));
33-
}
30+
public const int ExitCodeOk = 0;
31+
public const int ExitCodeMalformedArguments = 1;
32+
public const int ExitCodeLibopusLoadError = 2;
3433

35-
public static async void MainAsync(string[] args)
34+
public static int Main(string[] args)
3635
{
3736
Thread.CurrentThread.Name = "TAB Main";
3837
Tools.SetLogId("Core");
@@ -52,13 +51,13 @@ public static async void MainAsync(string[] args)
5251
h.Copyright = "";
5352
return HelpText.DefaultParsingErrorsHandler(parsedArgs, h);
5453
}));
55-
System.Environment.Exit(1);
54+
return ExitCodeMalformedArguments;
5655
}
5756

5857
if (setup.ShowVersion)
5958
{
6059
Console.WriteLine(SystemData.AssemblyData.ToLongString());
61-
return;
60+
return ExitCodeOk;
6261
}
6362

6463
if (setup.ShowStatsExample)
@@ -68,18 +67,25 @@ public static async void MainAsync(string[] args)
6867
Console.WriteLine("Please keep this feature enabled to help us improve and grow.");
6968
Console.WriteLine("An example stats packet looks like this:");
7069
Console.WriteLine(Stats.CreateExample());
71-
return;
70+
return ExitCodeOk;
7271
}
7372

7473
SetupLog();
75-
if (!SetupLibopus()) System.Environment.Exit(1);
74+
if (!SetupLibopus())
75+
return ExitCodeLibopusLoadError;
7676

7777
if (setup.Llgc)
7878
EnableLlgc();
7979

8080
if (!setup.HideBanner)
8181
LogHeader();
8282

83+
DedicatedTaskScheduler.FromCurrentThread(() => StartBot(setup));
84+
return ExitCodeOk;
85+
}
86+
87+
private static async void StartBot(ParameterData setup)
88+
{
8389
// Initialize the actual core
8490
var core = new Core((DedicatedTaskScheduler)TaskScheduler.Current, setup.ConfigFile);
8591

‎TSLib/Declarations

‎TSLib/Full/TsFullClient.gen.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1294,4 +1294,4 @@ private void InvokeEvent(LazyNotification lazyNotification)
12941294
partial void ProcessEachTokenUsed(TokenUsed notifies);
12951295

12961296
}
1297-
}
1297+
}

‎TSLib/Generated/NotificationUtil.ttinclude

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ HashSet<string> sharedNotifications = new HashSet<string> {
1717
public void GenNtfyDecls(IEnumerable<Messages.Msg> enu, bool root = false) {
1818
PushIndent("\t\t");
1919
WriteLine("");
20-
var modifier = root ? " virtual" : " override";
20+
var modifier = root ? " abstract" : " override";
2121

2222
foreach(var ntfy in enu)
2323
{

‎TSLib/Generated/TsVersion.gen.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,22 @@ partial class TsVersionSigned
2828
public static TsVersionSigned VER_LIN_3_X_X { get; } = new TsVersionSigned("3.?.? [Build: 5680278000]", "Linux", ClientPlatform.Linux, 5680278000UL, "Hjd+N58Gv3ENhoKmGYy2bNRBsNNgm5kpiaQWxOj5HN2DXttG6REjymSwJtpJ8muC2gSwRuZi0R+8Laan5ts5CQ==");
2929
public static TsVersionSigned VER_IOS_3_X_X { get; } = new TsVersionSigned("3.?.? [Build: 5680278000]", "iOS", ClientPlatform.Ios, 5680278000UL, "XrAf+Buq6Eb0ehEW/niFp06YX+nGGOS0Ke4MoUBzn+cX9q6G5C0A/d5XtgcNMe8r9jJgV/adIYVpsGS3pVlSAA==");
3030
public static TsVersionSigned VER_AND_3_X_X { get; } = new TsVersionSigned("3.?.? [Build: 5680278000]", "Android", ClientPlatform.Android, 5680278000UL, "AWb948BY32Z7bpIyoAlQguSmxOGcmjESPceQe1DpW5IZ4+AW1KfTk2VUIYNfUPsxReDJMCtlhVKslzhR2lf0AA==");
31-
public static TsVersionSigned VER_WIN_3_5_3 { get; } = new TsVersionSigned("3.5.3 [Build: 1586353391]", "Windows", ClientPlatform.Windows, 1586353391UL, "knmVmUvvQTTfOUCWlQncjWFWHXFqZMntUbIPIi/YLcxdW4iP3woJQgVTaIZPEiluMT5A7tb2lSk/r+Byh5R6Dw==");
32-
public static TsVersionSigned VER_WIN_5_0_0 { get; } = new TsVersionSigned("5.0.0-test.104 [Build: 1586348340]", "Windows", ClientPlatform.Windows, 1586348340UL, "h/lwYRBPj+GeQZqUNyXOOvVfWlue4rr9FfGgHt7vMlPWCddPH2fNjDf9K7dNGoXMm5DDdVHUfPgcKfC6+nBWBw==");
33-
public static TsVersionSigned VER_MAC_5_0_0 { get; } = new TsVersionSigned("5.0.0-test.104 [Build: 1586348340]", "macOS", ClientPlatform.MacOs, 1586348340UL, "O29jwgoTOWgTnZYjhQobrMh607sddxbOlesu8xBU1oMtm74mLZ65dajvMJPb20jpsXhdCqk+KHt8TcMvNx5fDQ==");
34-
public static TsVersionSigned VER_MAC_3_5_3 { get; } = new TsVersionSigned("3.5.3 [Build: 1586172156]", "OS X", ClientPlatform.MacOs, 1586172156UL, "8+NprKwynOC+wGqVZnaYc5g2A31f9MdoChKK3RYKd19lZEVRZngk5FFB1lIyI9TQKdNC4opfhGL3dvu9bAtEDw==");
35-
public static TsVersionSigned VER_LIN_3_5_3 { get; } = new TsVersionSigned("3.5.3 [Build: 1586172156]", "Linux", ClientPlatform.Linux, 1586172156UL, "GRdePYP+MJpGf6wtKmB2CEMZJ2x1wJLIX81CKqr9mVUDWyp8LTBzOJYxaldUboH+UGh2LOByHNR5EpHA3gdNCw==");
31+
public static TsVersionSigned VER_MAC_5_0_0 { get; } = new TsVersionSigned("5.0.0-beta.25 [Build: 1588064367]", "macOS", ClientPlatform.MacOs, 1588064367UL, "+Y1iB58sLO38/4AI1YRUlEhXhhrbkAVbaSmOcZj0IrTmQm1eY+prEYJPQgF8StFdjWmAGmMG3ezzb0wEzRE3CQ==");
32+
public static TsVersionSigned VER_LIN_5_0_0 { get; } = new TsVersionSigned("5.0.0-beta.25 [Build: 1588064367]", "Linux", ClientPlatform.Linux, 1588064367UL, "L5rpK9OLT84Hgpg/NXSCwpHfrRc/JTtMa/kFfaD2rlF7c/YHiEnly/4+A9y0iowA70+5JEzyH6CBjkniiz4DAw==");
33+
public static TsVersionSigned VER_WIN_3_5_3 { get; } = new TsVersionSigned("3.5.3 [Build: 1587971024]", "Windows", ClientPlatform.Windows, 1587971024UL, "Kvmj7qX6wJCPI5GVT71samfmhz/bvs7M+OTXWB/JWxdQbxDe17xda7dzUWLX7pjvdJTqZmbse1HBmTxThPKvAg==");
34+
public static TsVersionSigned VER_LIN_3_5_3 { get; } = new TsVersionSigned("3.5.3 [Build: 1587971024]", "Linux", ClientPlatform.Linux, 1587971024UL, "59chu1YQ1W4DdVj+yJOVmwhJK7s9p9FatqIjQRxEDmIb0CcDDO/K8CrbVnBHbD67/cExJbC3PjC/o/n0pDbiCg==");
35+
public static TsVersionSigned VER_WIN_5_0_0 { get; } = new TsVersionSigned("5.0.0-test.111 [Build: 1587633723]", "Windows", ClientPlatform.Windows, 1587633723UL, "60DETVUkR9veo0Cc9WCV+t3r0w836CfRZTgw/sZH0LL6AwtAab8sbcYNcOBybSssn+QgZI37kdc7B9YViszgCw==");
36+
public static TsVersionSigned VER_MAC_3_5_3 { get; } = new TsVersionSigned("3.5.3 [Build: 1586955962]", "OS X", ClientPlatform.MacOs, 1586955962UL, "/9gsbyyJoyHW1okwykGgXrn2j29wvnEfnw6/Hvft2WS12CURxTv5L9uLuu36I5u3TzWOxyB9dEbD1FeZ201uCQ==");
3637
public static TsVersionSigned VER_WIN_3_5_2 { get; } = new TsVersionSigned("3.5.2 [Build: 1585812952]", "Windows", ClientPlatform.Windows, 1585812952UL, "6HIIG9j6bIUavbDFJR50Hk3hwl1j4BL/1hQS5Q4JfAS0oerwLNBbdAfXM963aOlE8yan9d/LWiXnuSKhQXAKAQ==");
3738
public static TsVersionSigned VER_MAC_3_5_2 { get; } = new TsVersionSigned("3.5.2 [Build: 1585812952]", "OS X", ClientPlatform.MacOs, 1585812952UL, "VhEA3HpeSCbV06Dfh5wonQ+XMuC8dG96ZXvU5HCNLvkSatAfOsDGLaQNLfbkVZVcs0Hvf9oPFgWvAseSX96rCw==");
3839
public static TsVersionSigned VER_LIN_3_5_2 { get; } = new TsVersionSigned("3.5.2 [Build: 1585812952]", "Linux", ClientPlatform.Linux, 1585812952UL, "Fy5GNeXUzrP5chKDWhG4G7T3jj8tjg0JkoTNRl+tgrONOWNbNf1zBD+I2LNqJREJXvaSrXcMB1pOQQrWKIXqDQ==");
3940
public static TsVersionSigned VER_WIN_3_5_1 { get; } = new TsVersionSigned("3.5.1 [Build: 1584955996]", "Windows", ClientPlatform.Windows, 1584955996UL, "LY20d0yqDFwknHND8FYADnvsKnq81kya6lAEnJEQ+87oN0k8KqTXMDpy/0z0yC54+B8Mo/P8kSjrpRugaVAPDA==");
4041
public static TsVersionSigned VER_MAC_3_5_1 { get; } = new TsVersionSigned("3.5.1 [Build: 1584955996]", "OS X", ClientPlatform.MacOs, 1584955996UL, "xk8NdgtqWPihDy1gUPGVtcLkfrl5Fd2lfigB0N7d9K0VGyCxC4ZvQOdX6kM/StTX1xulCnENp0wb+gqwjO5nBA==");
4142
public static TsVersionSigned VER_LIN_3_5_1 { get; } = new TsVersionSigned("3.5.1 [Build: 1584955996]", "Linux", ClientPlatform.Linux, 1584955996UL, "YtR6uJ0zzFwlAXoV1ikV8DVD9y7ka0WCh46wvALArdCBw9zaBLE7ese6Uu3U2Dmg4//ook5cNvupeOlzHcGPDQ==");
42-
public static TsVersionSigned VER_LIN_5_0_0 { get; } = new TsVersionSigned("5.0.0-beta.24 [Build: 1584621089]", "Linux", ClientPlatform.Linux, 1584621089UL, "iTRafOxViAWbIg4Uc2je7KrxkNTdc8WjEtQvceCAsvPY/wL1tgd21Sy19iqASdAOJeQ302Kb06ajsq+8SdfhCA==");
4343
public static TsVersionSigned VER_WIN_3_5_0 { get; } = new TsVersionSigned("3.5.0 [Build: 1584610661]", "Windows", ClientPlatform.Windows, 1584610661UL, "8um3guYdjDlKHOUZMYqt//4nT9k+SBYnAAP/9CarVp5pUXEzYaTZlflyOi6hjYIDn5cQ7gdvrKmdXLOXBJiqCA==");
4444
public static TsVersionSigned VER_MAC_3_5_0 { get; } = new TsVersionSigned("3.5.0 [Build: 1584610661]", "OS X", ClientPlatform.MacOs, 1584610661UL, "RZJrT/fysauFMv9ugB82ZAZN/t/MSWeJmFLu35FXx/r+3O1QZrM8rDfU5Iq/moG68hPRcc12KloOvrlVTdfiBg==");
4545
public static TsVersionSigned VER_LIN_3_5_0 { get; } = new TsVersionSigned("3.5.0 [Build: 1584610661]", "Linux", ClientPlatform.Linux, 1584610661UL, "kHfR/JyZ6Ah06rW/t+dFIHkOgLGFth5CCbRr9T3xfPd2gqL5CeYei47LGBjA9K9GrVVRivF0L5eo5MrxGh/QDA==");
46+
public static TsVersionSigned VER_IOS_3_5_1 { get; } = new TsVersionSigned("3.5.1 [Build: 1582118844]", "iOS", ClientPlatform.Ios, 1582118844UL, "3ZiKmiSA9g1xUhb67wgAPz7duV97QCoMQn4OmjqXUffVN5cvztaUhIBm0oZ8n0DEXsgx8hulbqWBFIN8QgAIBA==");
4647
public static TsVersionSigned VER_AND_3_5_0 { get; } = new TsVersionSigned("3.5.0 [Build: 1582117478]", "Android", ClientPlatform.Android, 1582117478UL, "vASJQFPECG2TpUh5ATsR2c/gVrvsuZ9QlMpKN51F+HnanYNH3oCSGoievQX6ACjsKH3OZihNFQZ6f5HRU/MAAg==");
4748
public static TsVersionSigned VER_IOS_3_5_0 { get; } = new TsVersionSigned("3.5.0 [Build: 1574357871]", "iOS", ClientPlatform.Ios, 1574357871UL, "9m9E+yrIfJKmRDvujRH5IsbHXClEbgm9zRms+iL9ikLhiM1gzIBWBVVUKFqmtpSSZDq3lnmkN9DmaC8gxhvPBw==");
4849
public static TsVersionSigned VER_WIN_3_3_2 { get; } = new TsVersionSigned("3.3.2 [Build: 1566767614]", "Windows", ClientPlatform.Windows, 1566767614UL, "fAjM3pPl95eGXrhFcsvCXgdI6Epr8XpafOJZlYbFws2VMllYy/4DUleSVzPuVqu/TCgrTaqb0wP+KANse3/vAw==");

‎TSLib/Query/TsQueryClient.gen.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,4 @@ private void InvokeEvent(LazyNotification lazyNotification)
193193
}
194194
}
195195
}
196-
}
196+
}

0 commit comments

Comments
 (0)