diff --git a/Resources/Blueprints.png b/Resources/Blueprints.png index aa87586..b83478e 100644 Binary files a/Resources/Blueprints.png and b/Resources/Blueprints.png differ diff --git a/Source/HarmonyLink/Private/HarmonyLinkLibrary.cpp b/Source/HarmonyLink/Private/HarmonyLinkLibrary.cpp index 9a35811..e2de5d4 100644 --- a/Source/HarmonyLink/Private/HarmonyLinkLibrary.cpp +++ b/Source/HarmonyLink/Private/HarmonyLinkLibrary.cpp @@ -7,44 +7,38 @@ bool UHarmonyLinkLibrary::IsWine() { - static bool IsWine_ = HarmonyLinkLib::get_is_wine(); - return IsWine_; + return HarmonyLinkLib::get_is_wine(); } bool UHarmonyLinkLibrary::IsLinux() { - static bool IsLinux_ = #if PLATFORM_WINDOWS - IsWine(); + return IsWine(); #elif PLATFORM_LINUX - true; + return true; #else - false; + return false; #endif - - return IsLinux_; } bool UHarmonyLinkLibrary::IsSteamDeck() { - static bool IsSteamDeck_ = GetDeviceInfo().Device == EDevice::STEAM_DECK; - return IsSteamDeck_; + return GetDeviceInfo().Device == EDeviceEnum::STEAM_DECK; } FCPUInfo UHarmonyLinkLibrary::GetCPUInfo() { - static FCPUInfo CPUInfo(HarmonyLinkLib::get_cpu_info()); - return CPUInfo; + return FCPUInfo(HarmonyLinkLib::get_cpu_info()); } FDevice UHarmonyLinkLibrary::GetDeviceInfo() { - return FDevice(); + return FDevice(HarmonyLinkLib::get_device_info()); } FOSVerInfo UHarmonyLinkLibrary::GetOSInfo() { - return FOSVerInfo(); + return FOSVerInfo(HarmonyLinkLib::get_os_version()); } FBattery UHarmonyLinkLibrary::GetBatteryStatus() diff --git a/Source/HarmonyLink/Private/Structs/Device.cpp b/Source/HarmonyLink/Private/Structs/Device.cpp new file mode 100644 index 0000000..1e2845a --- /dev/null +++ b/Source/HarmonyLink/Private/Structs/Device.cpp @@ -0,0 +1,52 @@ +#include "Structs/Device.h" + +#include + +FDevice::FDevice(HarmonyLinkLib::FDevice* oldDevice) +{ + if (oldDevice) + { + Device = Convert(oldDevice->device); + Platform = Convert(oldDevice->platform); + + oldDevice->free(); + } + else + { + UE_LOG(LogTemp, Error, TEXT("Failed to convert FDevice.")) + } +} + +EDeviceEnum FDevice::Convert(HarmonyLinkLib::EDevice Device) +{ + switch (Device) + { + case HarmonyLinkLib::EDevice::DESKTOP: + return EDeviceEnum::DESKTOP; + case HarmonyLinkLib::EDevice::LAPTOP: + return EDeviceEnum::LAPTOP; + case HarmonyLinkLib::EDevice::HANDHELD: + return EDeviceEnum::HANDHELD; + case HarmonyLinkLib::EDevice::STEAM_DECK: + return EDeviceEnum::STEAM_DECK; + default: + return EDeviceEnum::DESKTOP; + } +} + +EPlatform FDevice::Convert(HarmonyLinkLib::EPlatform Platform) +{ + switch (Platform) + { + case HarmonyLinkLib::EPlatform::WINDOWS: + return EPlatform::WINDOWS; + case HarmonyLinkLib::EPlatform::LINUX: + return EPlatform::LINUX; + case HarmonyLinkLib::EPlatform::MAC: + return EPlatform::MAC; + case HarmonyLinkLib::EPlatform::UNIX: + return EPlatform::UNIX; + default: + return EPlatform::WINDOWS; + } +} diff --git a/Source/HarmonyLink/Private/Structs/OSVerInfo.cpp b/Source/HarmonyLink/Private/Structs/OSVerInfo.cpp new file mode 100644 index 0000000..1d502bb --- /dev/null +++ b/Source/HarmonyLink/Private/Structs/OSVerInfo.cpp @@ -0,0 +1,16 @@ +#include "Structs/OSVerInfo.h" + +FOSVerInfo::FOSVerInfo(HarmonyLinkLib::FOSVerInfo* oldInfo) +{ + if (oldInfo) + { + Name = oldInfo->name.c_str(); + Version = oldInfo->version; + ID = oldInfo->id.c_str(); + PrettyName = oldInfo->pretty_name.c_str(); + VariantID = oldInfo->variant_id.c_str(); + VersionID = oldInfo->version_id.c_str(); + + oldInfo->free(); + } +} diff --git a/Source/HarmonyLink/Public/Enums/Device.h b/Source/HarmonyLink/Public/Enums/DeviceEnum.h similarity index 80% rename from Source/HarmonyLink/Public/Enums/Device.h rename to Source/HarmonyLink/Public/Enums/DeviceEnum.h index 066f952..fe3aa8e 100644 --- a/Source/HarmonyLink/Public/Enums/Device.h +++ b/Source/HarmonyLink/Public/Enums/DeviceEnum.h @@ -1,13 +1,13 @@ #pragma once #include "CoreMinimal.h" -#include "Device.generated.h" +#include "DeviceEnum.generated.h" /** * */ UENUM(BlueprintType) -enum class EDevice : uint8 +enum class EDeviceEnum : uint8 { DESKTOP UMETA(DisplayName = "Desktop"), LAPTOP UMETA(DisplayName = "Laptop"), diff --git a/Source/HarmonyLink/Public/HarmonyLinkLibrary.h b/Source/HarmonyLink/Public/HarmonyLinkLibrary.h index a9ef618..9a3df81 100644 --- a/Source/HarmonyLink/Public/HarmonyLinkLibrary.h +++ b/Source/HarmonyLink/Public/HarmonyLinkLibrary.h @@ -6,7 +6,7 @@ #include "Kismet/BlueprintFunctionLibrary.h" #include "Structs/Battery.h" #include "Structs/CPUInfo.h" -#include "Structs/FDevice.h" +#include "Structs/Device.h" #include "Structs/OSVerInfo.h" #include "HarmonyLinkLibrary.generated.h" diff --git a/Source/HarmonyLink/Public/Structs/Device.h b/Source/HarmonyLink/Public/Structs/Device.h new file mode 100644 index 0000000..00c7ad2 --- /dev/null +++ b/Source/HarmonyLink/Public/Structs/Device.h @@ -0,0 +1,30 @@ +#pragma once + +#include "CoreMinimal.h" +#include "Enums/DeviceEnum.h" +#include "Enums/Platform.h" +#include + +#include "Device.generated.h" + +/** + * + */ +USTRUCT(BlueprintType) +struct FDevice +{ + GENERATED_BODY() + + FDevice() {} + + UPROPERTY(BlueprintReadWrite, EditAnywhere) + EPlatform Platform = EPlatform::WINDOWS; + + UPROPERTY(BlueprintReadWrite, EditAnywhere) + EDeviceEnum Device = EDeviceEnum::DESKTOP; + + FDevice(HarmonyLinkLib::FDevice* oldDevice); + + static EDeviceEnum Convert(HarmonyLinkLib::EDevice Device); + static EPlatform Convert(HarmonyLinkLib::EPlatform Platform); +}; diff --git a/Source/HarmonyLink/Public/Structs/FDevice.h b/Source/HarmonyLink/Public/Structs/FDevice.h deleted file mode 100644 index 7f54b29..0000000 --- a/Source/HarmonyLink/Public/Structs/FDevice.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "Enums/Device.h" -#include "Enums/Platform.h" - -#include "FDevice.generated.h" - -/** - * - */ -USTRUCT(BlueprintType) -struct FDevice -{ - GENERATED_BODY() - - UPROPERTY(BlueprintReadWrite, EditAnywhere) - EPlatform Platform = EPlatform::WINDOWS; - - UPROPERTY(BlueprintReadWrite, EditAnywhere) - EDevice Device = EDevice::DESKTOP; -}; diff --git a/Source/HarmonyLink/Public/Structs/OSVerInfo.h b/Source/HarmonyLink/Public/Structs/OSVerInfo.h index 2cce110..9d4474f 100644 --- a/Source/HarmonyLink/Public/Structs/OSVerInfo.h +++ b/Source/HarmonyLink/Public/Structs/OSVerInfo.h @@ -1,6 +1,8 @@ // Copyright (C) 2023 Jordon Brooks #pragma once +#include + #include "CoreMinimal.h" #include "OSVerInfo.generated.h" @@ -13,6 +15,8 @@ struct FOSVerInfo { GENERATED_BODY() + FOSVerInfo() {} + UPROPERTY(BlueprintReadWrite, EditAnywhere) FString Name; @@ -33,4 +37,6 @@ struct FOSVerInfo UPROPERTY(BlueprintReadWrite, EditAnywhere) FString VariantID; + + FOSVerInfo(HarmonyLinkLib::FOSVerInfo* oldInfo); }; diff --git a/Source/ThirdParty/HarmonyLinkLib/GithubLink.url b/Source/ThirdParty/HarmonyLinkLib/GithubLink.url new file mode 100644 index 0000000..c9448f0 --- /dev/null +++ b/Source/ThirdParty/HarmonyLinkLib/GithubLink.url @@ -0,0 +1,5 @@ +[{000214A0-0000-0000-C000-000000000046}] +Prop3=19,11 +[InternetShortcut] +IDList= +URL=https://github.com/Jordonbc/HarmonyLink diff --git a/Source/ThirdParty/HarmonyLinkLib/LICENSE b/Source/ThirdParty/HarmonyLinkLib/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/Source/ThirdParty/HarmonyLinkLib/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.