Merge pull request #17 from kdeng00/cleanup

Cleanup

.gitignore

@@ -0,0 +1,3 @@
+/.vs/*
+/build
+/x64

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)

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
+

IcarusDownloadManager.vcxproj

@@ -39,11 +39,13 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -82,6 +84,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -95,6 +98,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -150,6 +154,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">

IcarusDownloadManager.vcxproj.filters

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\Main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\managers\ActionManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\managers\CommitManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\managers\FileManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\managers\TokenManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\managers\UserManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\models\Song.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\parsers\APIParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\syncers\Delete.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\syncers\Download.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\syncers\RetrieveRecords.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\syncers\Upload.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\utilities\Conversions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\managers\ActionManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\managers\CommitManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\managers\FileManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\managers\TokenManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\managers\UserManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\models\API.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\models\Flags.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\models\IcarusAction.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\models\Song.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\models\Token.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\models\UploadForm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\models\User.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\parsers\APIParser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\syncers\Delete.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\syncers\Download.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\syncers\RetrieveRecords.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\syncers\SyncerBase.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\syncers\Upload.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\utilities\Checks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\utilities\Conversions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

IcarusDownloadManager.vcxproj.user

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>upload-meta -u kverse -p demolaugh -h http://localhost:5002 -smca "D:\OneDrive\media\music\mp3\bb_king\paying_the_cost_to_be_the_boss"</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerCommandArguments>upload-meta -u kverse -p demolaugh -h http://localhost:5002 -smca "D:\OneDrive\media\music\mp3\bb_king\paying_the_cost_to_be_the_boss"</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>

conanfile.txt

@@ -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

include/Managers/CommitManager.h

@@ -3,6 +3,7 @@
 
 #include<map>
 #include<iostream>
+#include<filesystem>
 #include<string>
 #include<string_view>
 
@@ -92,6 +93,8 @@ private:
         // If 1 go with first standard, if 2 go with the second, if 0 then will default to 1 for disc and track
         auto mode = 0;
         const Str &songPath = song.songPath;
+        auto file = std::filesystem::path(songPath);
+        auto filename = file.filename().string();;
 
         auto trd = song.songPath.find("trackd");
         auto tr = song.songPath.find("track");
@@ -107,15 +110,16 @@ private:
         }
 
         auto dl = [](char c, char t){ return c == t; };
-        auto d = Utilities::Checks::itemIterInContainer<char, Str>(songPath, 'd', dl);
-        auto k = Utilities::Checks::itemIterInContainer<char, Str>(songPath, 'k', dl);
-        auto dot = Utilities::Checks::itemIterInContainer<char, Str>(songPath, '.', dl);
+        auto d = Utilities::Checks::itemIterInContainer<char, Str>(filename, 'd', dl);
+        auto k = Utilities::Checks::itemIterInContainer<char, Str>(filename, 'k', dl);
+        auto dot = Utilities::Checks::itemIterInContainer<char, Str>(filename, '.', dl);
 
         switch(mode)
         {
         case 1:
         {
-            if (k != songPath.end() && dot != songPath.end())
+            // if (k != songPath.end() && dot != songPath.end())
+            if (k != filename.end() && dot != filename.end())
             {
                 auto tStr = std::string(++k, dot);
                 std::cout << "TStr: " << tStr<<"\n";
@@ -129,7 +133,8 @@ private:
         }
         case 2:
         {
-            if (k != songPath.end() && dot != songPath.end() && d != songPath.end())
+            // if (k != songPath.end() && dot != songPath.end() && d != songPath.end())
+            if (k != filename.end() && dot != filename.end() && d != filename.end())
             {
                 auto tStr = std::string(++k, d);
                 auto dStr = std::string(++d, dot);

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();
             }
 

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

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()

src/Managers/CommitManager.cpp

@@ -345,6 +345,17 @@ void CommitManager::multiTargetUpload(const std::string &sourcePath)
 
         cout<<"Stem "<<stem<<" Extension "<<extension<<"\n";
 
+        auto validImg = [](const std::string& ext)
+        {
+            std::vector<string> extensions;
+            extensions.reserve(3);
+            extensions.push_back(".jpg");
+            extensions.push_back(".jpeg");
+            extensions.push_back(".");
+
+            return ext.compare(extensions[0]) == 0 || ext.compare(extensions[1]) == 0 || ext.compare(extensions[2]) == 0;
+        };
+
         if (extension.compare(".mp3") == 0)
         {
             Song song;
@@ -354,7 +365,8 @@ void CommitManager::multiTargetUpload(const std::string &sourcePath)
 
             songs.emplace_back(std::move(song));
         }
-        else if (extension.compare(".jpg") == 0 || extension.compare(".png") == 0)
+        // else if (extension.compare(".jpg") == 0 || extension.compare(".png") == 0)
+        else if (validImg(extension.string()))
         {
             cover.path.assign(pp.string());
         }

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";