update to recent breaking change with LogNullError

CatPoweredPlugins · May 4, 2022 · 7fd0fb2 · 7fd0fb2
1 parent 3bf0bad
commit 7fd0fb2
Show file tree

Hide file tree

Showing 6 changed files with 456 additions and 12 deletions.
diff --git a/ASFAchievementManager/ASF-Achievement-Manager.csproj b/ASFAchievementManager/ASF-Achievement-Manager.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Authors>Ryzhehvost</Authors>
-    <AssemblyVersion>0.2.2.0</AssemblyVersion>
+    <AssemblyVersion>0.2.2.1</AssemblyVersion>
     <TargetFrameworks>net6.0;net48</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/ASFAchievementManager/ASFAchievementManager.cs b/ASFAchievementManager/ASFAchievementManager.cs
@@ -26,7 +26,7 @@ public Task OnLoaded() {
 		public async Task<string?> OnBotCommand(Bot bot, EAccess access, string message, string[] args, ulong steamID = 0) {
 			switch (args.Length) {
 				case 0:
-					bot.ArchiLogger.LogNullError(nameof(args));
+					bot.ArchiLogger.LogNullError(null, nameof(args));
 
 					return null;
 				case 1:
@@ -68,7 +68,7 @@ public Task OnLoaded() {
 			}
 			if (AchievementHandlers.TryGetValue(bot, out AchievementHandler? AchievementHandler)) {
 				if (AchievementHandler == null) {
-					bot.ArchiLogger.LogNullError(nameof(AchievementHandler));
+					bot.ArchiLogger.LogNullError(AchievementHandler);
 					return null;
 				}
 
@@ -129,7 +129,7 @@ public Task OnLoaded() {
 			}
 
 			if (AchievementHandler == null) {
-				bot.ArchiLogger.LogNullError(nameof(AchievementHandler));
+				bot.ArchiLogger.LogNullError(AchievementHandler);
 				return null;
 			}
 

diff --git a/ASFAchievementManager/AchievementHandler.cs b/ASFAchievementManager/AchievementHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -16,7 +16,7 @@ namespace ASFAchievementManager {
 	public sealed class AchievementHandler : ClientMsgHandler {
 		public override void HandleMsg(IPacketMsg packetMsg) {
 			if (packetMsg == null) {
-				ASF.ArchiLogger.LogNullError(nameof(packetMsg));
+				ASF.ArchiLogger.LogNullError(packetMsg);
 
 				return;
 			}
@@ -192,9 +192,9 @@ internal async Task<string> GetAchievements(Bot bot, ulong gameID) {
 			List<string> responses = new List<string>();
 			List<StatData>? Stats = ParseResponse(response.Response);
 			if (Stats == null) {
-				bot.ArchiLogger.LogNullError(nameof(Stats));
+				bot.ArchiLogger.LogNullError(Stats);
 			} else if (Stats.Count == 0) {
-				bot.ArchiLogger.LogNullError(nameof(Stats));
+				bot.ArchiLogger.LogNullError(null, nameof(Stats));
 			} else {
 
 				foreach (StatData stat in Stats) {
@@ -214,7 +214,7 @@ internal async Task<string> SetAchievements(Bot bot, uint appId, HashSet<uint> a
 
 			GetAchievementsCallback? response = await GetAchievementsResponse(bot, appId);
 			if (response == null) {
-				bot.ArchiLogger.LogNullError(nameof(response));
+				bot.ArchiLogger.LogNullError(response);
 				return "Can't retrieve achievements for " + appId.ToString(); ;
 			}
 
@@ -223,7 +223,7 @@ internal async Task<string> SetAchievements(Bot bot, uint appId, HashSet<uint> a
 			}
 
 			if (response.Response == null) {
-				bot.ArchiLogger.LogNullError(nameof(response.Response));
+				bot.ArchiLogger.LogNullError(response.Response);
 				responses.Add(Strings.WarningFailed);
 				return "\u200B\n" + string.Join(Environment.NewLine, responses);
 			}

diff --git a/ArchiSteamFarm b/ArchiSteamFarm
diff --git a/build.bat b/build.bat
@@ -24,6 +24,16 @@ rem release generic version
 dotnet publish -c "Release" -f "net6.0" -o "out/generic" "/p:LinkDuringPublish=false"
 mkdir .\out\%CurrDirName%
 copy .\out\generic\%CurrDirName%.dll .\out\%CurrDirName%
+rem comment section below (downto :zip label) if you don't want to include documentation 
+if not exist README.md (goto zip)
+where /q pandoc.exe
+if ERRORLEVEL 1 (
+  copy README.md .\out\%CurrDirName%
+  goto zip
+) else (
+  pandoc  --metadata title="%CurrDirName%" --standalone --columns 2000 -f markdown -t html --self-contained -c .\github-pandoc.css -o .\out\%CurrDirName%\README.html README.md
+)
+:zip
 7z a -tzip -mx7 .\out\%CurrDirName%.zip .\out\%CurrDirName%
 rmdir /Q /S out\%CurrDirName%
 
@@ -33,5 +43,15 @@ rem comment section below if you don't target netf ASF version
 dotnet publish -c "Release" -f "net48" -o "out/generic-netf"
 mkdir .\out\%CurrDirName%
 copy .\out\generic-netf\%CurrDirName%.dll .\out\%CurrDirName%
+rem comment section below (downto :zipnetf label) if you don't want to include documentation 
+if not exist README.md (goto zipnetf)
+where /q pandoc.exe
+if ERRORLEVEL 1 (
+  copy README.md .\out\%CurrDirName%
+  goto zipnetf
+) else (
+  pandoc  --metadata title="%CurrDirName%" --standalone --columns 2000 -f markdown -t html --self-contained -c .\github-pandoc.css -o .\out\%CurrDirName%\README.html README.md
+)
+:zipnetf
 7z a -tzip -mx7 .\out\%CurrDirName%-netf.zip .\out\%CurrDirName%
-rmdir /Q /S out\%CurrDirName%
+rmdir /Q /S out\%CurrDirName%