add diary record with all addon versions (#188)

gruppe-adler · Jun 16, 2021 · bb456a9 · bb456a9
1 parent e361921
commit bb456a9
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 12 deletions.
diff --git a/addons/ui/XEH_postClientInit.sqf b/addons/ui/XEH_postClientInit.sqf
@@ -4,18 +4,20 @@ if (!hasInterface) exitWith {};
 
 player createDiarySubject [QGVAR(helpSubject),"Gruppe Adler Mod"];
 
-private _helpRecords = missionNamespace getVariable [QGVAR(helpRecords),[]];
-_helpRecords sort true;
+private _helpRecordsQueue = missionNamespace getVariable [QGVAR(helpRecordsQueue),[]];
+_helpRecordsQueue sort true;
+
+ISNILS(GVAR(helpRecords), createHashMap);
 
 {
     _x params ["_title","_text"];
 
-    player createDiaryRecord [QGVAR(helpSubject),[
+    private _record = player createDiaryRecord [QGVAR(helpSubject),[
         _title,
         format ["<img width='32' height='32' image='\x\grad\addons\ui\dialog\logo_128.paa'/><font size='32' color='#D18D1F' face='RobotoCondensedLight'> %1</font><br/><br/>%2",_title,_text]
     ]];
+    GVAR(helpRecords) set [_title, _record];
 
-} forEach _helpRecords;
+} forEach _helpRecordsQueue;
 
-_helpRecords resize 0;
-GVAR(helpRecords) = nil;
+GVAR(helpRecordsQueue) = nil;
diff --git a/addons/ui/cfgFunctions.hpp b/addons/ui/cfgFunctions.hpp
@@ -10,7 +10,8 @@ class CfgFunctions {
 		};
         class help {
 			file = QPATHTOF(functions\help);
-            class addHelpRecord {};
+			class addHelpRecord {};
+			class getHelpRecord {};
 		};
 	};
 };
diff --git a/addons/ui/functions/help/fn_addHelpRecord.sqf b/addons/ui/functions/help/fn_addHelpRecord.sqf
@@ -2,8 +2,6 @@
 
 params [["_title","ERROR: NO TITLE"],["_text","ERROR: NO TEXT"]];
 
-if (isNil QGVAR(helpRecords)) then {
-    GVAR(helpRecords) = [];
-};
+ISNILS(GVAR(helpRecordsQueue), []);
 
-GVAR(helpRecords) pushBack [_title,_text];
+GVAR(helpRecordsQueue) pushBack [_title,_text];
diff --git a/addons/ui/functions/help/fn_getHelpRecord.sqf b/addons/ui/functions/help/fn_getHelpRecord.sqf
@@ -0,0 +1,6 @@
+#include "script_component.hpp"
+
+params ["_title"];
+
+assert(!isNil QGVAR(helpRecords));
+GVAR(helpRecords) getOrDefault [_title, diaryRecordNull];
diff --git a/addons/versionCheck/XEH_preInit.sqf b/addons/versionCheck/XEH_preInit.sqf
@@ -49,3 +49,6 @@ private _settingsGroup = "GRAD Version Check";
     false,
     1
 ] call CBA_settings_fnc_init;
+
+GVAR(addonVersionsTitle) = "Addon Versions";
+[GVAR(addonVersionsTitle), "<execute expression=""call grad_versionCheck_fnc_createDiaryEntry"">Show</execute>"] call EFUNC(ui,addHelpRecord);
diff --git a/addons/versionCheck/cfgFunctions.hpp b/addons/versionCheck/cfgFunctions.hpp
@@ -4,6 +4,7 @@ class cfgFunctions {
 			file = "x\grad\addons\versionCheck\functions";
 
 			class compileDialogText {};
+			class createDiaryEntry {};
 			class determineVersions {};
 			class getVersionNo {};
 			class logResult {};

diff --git a/addons/versionCheck/config.cpp b/addons/versionCheck/config.cpp
@@ -6,7 +6,7 @@ class CfgPatches {
 		name = QUOTE(ADDON);
 		url = "$STR_grad_URL";
 		requiredVersion = 1.0;
-		requiredAddons[] = {"grad_main","ace_common"};
+		requiredAddons[] = {"ace_common", "grad_main", "grad_ui"};
 		units[] = {};
 		weapons[] = {};
 		VERSION_CONFIG;

diff --git a/addons/versionCheck/functions/fn_createDiaryEntry.sqf b/addons/versionCheck/functions/fn_createDiaryEntry.sqf
@@ -0,0 +1,38 @@
+#include "..\script_component.hpp"
+
+private _pad = {
+	params ["_str", "_targetLen"];
+	private _strLen = count _str;
+	if (_strLen >= _targetLen) exitWith {_str};
+
+	private  _a = [];
+	_a resize (_targetLen - _strLen);
+	(_str + ((_a apply {" "}) joinString ""));
+};
+
+private _description = [
+		"   LOCAL    |   SERVER   |   ADDON    <br/>", 
+		"------------|------------|---------- <br/>"
+];
+
+private _addonNames = keys grad_versionCheck_versions;
+_addonNames sort true;
+{
+	private _name = _x;
+
+	private _myVersion = (grad_versionCheck_versions getOrDefault [_name, ["-", false]])#0;
+	if (_myVersion isEqualTo "") then {
+		_myVersion = "-";
+	};
+	_myVersion = [_myVersion, 10] call _pad;
+	private _serverVersion = (grad_versionCheck_versions_server getOrDefault [_name, ["-", false]])#0;
+	if (_serverVersion isEqualTo "") then {
+		_serverVersion = "-";
+	};	
+	_serverVersion = [_serverVersion, 10] call _pad;
+
+	_description pushBack (format [" %1 | %2 | %3 <br/>", _myVersion, _serverVersion, _name]);
+
+} forEach _addonNames;
+
+player setDiaryRecordText [["grad_ui_helpSubject", [GVAR(addonVersionsTitle)] call EFUNC(ui,getHelpRecord)], [GVAR(addonVersionsTitle), "<font face=""EtelkaMonospacePro"" size=""8"">" + (_description joinString "") + "</font>"]]