From 10bf0fb0e137cca62db510c66912002ff46ab524 Mon Sep 17 00:00:00 2001
From: Kun Deng <kundeng94@outlook.com>
Date: Sun, 28 Aug 2022 10:49:28 -0400
Subject: [PATCH 1/2] Clean up and version change

---
 .gitignore                 |  3 ++
 IcarusDownloadManager.rc   | 99 ++++++++++++++++++++++++++++++++++++++
 include/Utilities/Checks.h |  4 +-
 resource.h                 | 14 ++++++
 src/Main.cpp               |  2 +-
 src/Parsers/APIParser.cpp  |  2 +-
 6 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 IcarusDownloadManager.rc
 create mode 100644 resource.h

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..59f00ad
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/.vs/*
+/build
+/x64
diff --git a/IcarusDownloadManager.rc b/IcarusDownloadManager.rc
new file mode 100644
index 0000000..78870b7
--- /dev/null
+++ b/IcarusDownloadManager.rc
@@ -0,0 +1,99 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,3,2,0
+ PRODUCTVERSION 0,3,2,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Tool to interact with Icarus API"
+            VALUE "FileVersion", "0.3.2.0"
+            VALUE "InternalName", "IcarusDo.exe"
+            VALUE "LegalCopyright", "Copyright (C) 2022"
+            VALUE "OriginalFilename", "IcarusDo.exe"
+            VALUE "ProductName", "IcarusDownloadManager"
+            VALUE "ProductVersion", "0.3.2.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/include/Utilities/Checks.h b/include/Utilities/Checks.h
index eb684ea..8743e53 100644
--- a/include/Utilities/Checks.h
+++ b/include/Utilities/Checks.h
@@ -44,16 +44,14 @@ namespace Utilities
         static auto itemIterInContainer(const Container &container, const Item &item, Func func)
         {
             auto result = false;
-            // std::cout<<container<<"\n";
+
             auto ii = std::find_if(container.begin(), container.end(), [&](Item i)
             {
-                // std::cout<<"iter "<<i<<" target "<<item<<"\n";
                 return func(i, item);
             });
 
             if (ii == container.end())
             {
-                // std::cout<<item<<" not found in container\n";
                 ii = container.end();
             }
 
diff --git a/resource.h b/resource.h
new file mode 100644
index 0000000..3b3ded8
--- /dev/null
+++ b/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by IcarusDownloadManager.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/src/Main.cpp b/src/Main.cpp
index 73a1980..b9072ac 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -14,7 +14,7 @@ using Managers::CommitManager;
 
 constexpr static auto IcarusDownloadManager_version()
 {
-    return "v0.3.0";
+    return "v0.3.2";
 }
 
 void printHelp()
diff --git a/src/Parsers/APIParser.cpp b/src/Parsers/APIParser.cpp
index 783e3ae..379877f 100644
--- a/src/Parsers/APIParser.cpp
+++ b/src/Parsers/APIParser.cpp
@@ -43,7 +43,7 @@ void APIParser::parseAPI()
         }
     }
 
-    // TODO: For now I will hard code
+    // NOTE: For now I will hard code
     // the api version since I am only
     // on version 1
     api.version = "v1";

From 389f41ecea3a31bc7a49ddcc21d96f07600adeb4 Mon Sep 17 00:00:00 2001
From: Kun Deng <kundeng94@outlook.com>
Date: Sun, 28 Aug 2022 10:53:00 -0400
Subject: [PATCH 2/2] Updates

Updated CMakeLists file, removed conan file, and have all windows configs targeting C++20
---
 CMakeLists.txt                |  2 +-
 IcarusDownloadManager.vcxproj |  6 ++++++
 conanfile.txt                 | 20 --------------------
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 conanfile.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c009a5b..1391d63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 set(SOFTWARE_DESCRIPTION
     "A tool to interact with the Icarus Music streaming API")
 set(SOFTWARE_VERSION
-    "0.3.0")
+    "0.3.2")
 
 
 project(IcarusDownloadManager VERSION ${SOFTWARE_VERSION} DESCRIPTION ${SOFTWARE_DESCRIPTION} LANGUAGES CXX)
diff --git a/IcarusDownloadManager.vcxproj b/IcarusDownloadManager.vcxproj
index 7fa6cf8..fc86cd6 100644
--- a/IcarusDownloadManager.vcxproj
+++ b/IcarusDownloadManager.vcxproj
@@ -82,6 +82,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -95,6 +96,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -150,6 +152,10 @@
     <ClInclude Include="include\syncers\Upload.h" />
     <ClInclude Include="include\utilities\Checks.h" />
     <ClInclude Include="include\utilities\Conversions.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="IcarusDownloadManager.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/conanfile.txt b/conanfile.txt
deleted file mode 100644
index cf5429e..0000000
--- a/conanfile.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-[requires]
-nlohmann_json/3.10.4
-openssl/1.1.1l
-libcurl/7.80.0
-cpr/1.7.2
-
-[generators]
-cmake
-
-[options]
-openssl:shared=False
-libcurl:shared=False
-cpr:shared=False
-libcurl:with_ssl=openssl
-libcurl:with_ftp=False
-libcurl:with_gopher=False
-libcurl:with_imap=False
-libcurl:with_pop3=False
-libcurl:with_smb=False
-libcurl:with_smtp=False
\ No newline at end of file