Update README.md

Merge pull request #15 from kdeng00/v0.3
2022-08-07 21:40:23 -04:00 · 2022-08-07 21:40:01 -04:00 · 2022-08-07 21:37:39 -04:00 · 2022-08-07 21:35:55 -04:00 · 2022-08-07 21:34:41 -04:00 · 2022-08-07 21:15:54 -04:00
49 changed files with 2380 additions and 1817 deletions
@@ -0,0 +1,3 @@
+[submodule "3rdparty/vcpkg"]
+	path = 3rdparty/vcpkg
+	url = https://github.com/microsoft/vcpkg
@@ -1,31 +1,63 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.23.3)
+
+set(VCPKG_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/vcpkg)
+
+message("The vcpkg root path ${VCPKG_ROOT_PATH}")
+
+if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+    set(TOOLCHAIN_PATH ${VCPKG_ROOT_PATH}/scripts/buildsystems/vcpkg.cmake)
+
+    set(CMAKE_TOOLCHAIN_FILE
+        "${TOOLCHAIN_PATH}"
+        CACHE STRING "Vcpkg toolchain file")
+
+    message("Using default toolchain file")
+endif()


-include("cmake/HunterGate.cmake")
-HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.23.184.tar.gz"
-    SHA1 "fe3fb05d51c21499c7eebbe7d0e102742a54a9cd"
-)
-
-project(IcarusDownloadManager)
+set(SOFTWARE_DESCRIPTION
+    "A tool to interact with the Icarus Music streaming API")
+set(SOFTWARE_VERSION
+    "0.3.0")


+project(IcarusDownloadManager VERSION ${SOFTWARE_VERSION} DESCRIPTION ${SOFTWARE_DESCRIPTION} LANGUAGES CXX)
+
+
+message(STATUS "Checking compiler flags for C++20 support.")
+
+# Set C++20 support flags for various compilers
+include(CheckCXXCompilerFlag)
+
+if(WIN32)
+  message("Windows environment")
+
+  if (MSVC_VERSION GREATER_EQUAL "1900")
+    message("Visual Studio version is at least ${vs_ver}")

-if(NOT ${CMAKE_VERSION} LESS 3.2)
-    set(CMAKE_CXX_STANDARD 11)
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-else()
-    message(STATUS "Checking compiler flags for C++17 support.")
-    # Set C++17 support flags for various compilers
    include(CheckCXXCompilerFlag)
-    check_cxx_compiler_flag("-std=c++17" COMPILER_SUPPORTS_CXX17)
+    CHECK_CXX_COMPILER_FLAG("/std:c++20" _cpp_latest_flag_supported)
+    if (_cpp_latest_flag_supported)
+        add_compile_options("/std:c++20")
+    endif()
+
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  endif()
+else()
+    check_cxx_compiler_flag("-std=c++20" COMPILER_SUPPORTS_CXX20)
    check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-    if(COMPILER_SUPPORTS_CXX17)
-        message(STATUS "C++17 is supported.")
+
+    if(COMPILER_SUPPORTS_CXX20)
+        message(STATUS "C++20 is supported.")
+
+        set(CMAKE_CXX_STANDARD 20)
+        set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
        if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -stdlib=libc++")
        else()
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
        endif()
    elseif(COMPILER_SUPPORTS_CXX0X)
        message(STATUS "C++0x is supported.")
@@ -35,7 +67,7 @@ else()
            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
        endif()
    else()
-        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++17 support. Please use a different C++ compiler.")
+        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++20 support. Please use a different C++ compiler.")
    endif()
 endif()

@@ -47,6 +79,7 @@ set(SOURCES
    src/Managers/FileManager.cpp
    src/Managers/TokenManager.cpp
    src/Managers/UserManager.cpp
+    src/Models/Song.cpp
    src/Parsers/APIParser.cpp
    src/Syncers/Delete.cpp
    src/Syncers/Download.cpp
@@ -54,36 +87,20 @@ set(SOURCES
    src/Syncers/Upload.cpp
    src/Utilities/Conversions.cpp
 )
-set(HEADERS
-    include/Managers/ActionManager.h
-    include/Managers/CommitManager.h
-    include/Managers/FileManager.h
-    include/Managers/TokenManager.h
-    include/Managers/UserManager.h
-    include/Models/API.h
-    include/Models/Flags.h
-    include/Models/IcarusAction.h
-    include/Models/Song.h
-    include/Models/Token.h
-    include/Models/UploadForm.h
-    include/Models/User.h
-    include/Parsers/APIParser.h
-    include/Syncers/Delete.h
-    include/Syncers/Download.h
-    include/Syncers/RetrieveRecords.h
-    include/Syncers/SyncerBase.h
-    include/Syncers/Upload.h
-    include/Utilities/Conversions.h
-)

+set(IDM_INCLUDE_DIR
+    "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
+include_directories(${IDM_INCLUDE_DIR})
+
+set(USE_SYSTEM_CURL OFF)
+set(BUILD_CPR_TESTS OFF)

-hunter_add_package(nlohmann_json)
 find_package(nlohmann_json CONFIG REQUIRED)
-
-hunter_add_package(cpr)
+find_package(OpenSSL REQUIRED)
+find_package(CURL REQUIRED)
 find_package(cpr CONFIG REQUIRED)


-add_executable(icd ${SOURCES} ${HEADERS})
-target_link_libraries(icd PUBLIC nlohmann_json::nlohmann_json cpr::cpr)
-include_directories(include/)
+add_executable(icd ${SOURCES})
+target_link_libraries(icd PRIVATE nlohmann_json::nlohmann_json OpenSSL::SSL OpenSSL::Crypto CURL::libcurl cpr::cpr)
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32630.192
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IcarusDownloadManager", "IcarusDownloadManager.vcxproj", "{12955990-643F-4A99-95E5-4752AFA179B0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Debug|x64.ActiveCfg = Debug|x64
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Debug|x64.Build.0 = Debug|x64
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Debug|x86.ActiveCfg = Debug|Win32
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Debug|x86.Build.0 = Debug|Win32
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Release|x64.ActiveCfg = Release|x64
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Release|x64.Build.0 = Release|x64
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Release|x86.ActiveCfg = Release|Win32
+		{12955990-643F-4A99-95E5-4752AFA179B0}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EA22B463-3EA6-4452-9AF1-D300C3BDE72D}
+	EndGlobalSection
+EndGlobal
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <ProjectGuid>{12955990-643F-4A99-95E5-4752AFA179B0}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(ProjectDir)include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(ProjectDir)include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\Main.cpp" />
+    <ClCompile Include="src\managers\ActionManager.cpp" />
+    <ClCompile Include="src\managers\CommitManager.cpp" />
+    <ClCompile Include="src\managers\FileManager.cpp" />
+    <ClCompile Include="src\managers\TokenManager.cpp" />
+    <ClCompile Include="src\managers\UserManager.cpp" />
+    <ClCompile Include="src\models\Song.cpp" />
+    <ClCompile Include="src\parsers\APIParser.cpp" />
+    <ClCompile Include="src\syncers\Delete.cpp" />
+    <ClCompile Include="src\syncers\Download.cpp" />
+    <ClCompile Include="src\syncers\RetrieveRecords.cpp" />
+    <ClCompile Include="src\syncers\Upload.cpp" />
+    <ClCompile Include="src\utilities\Conversions.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\managers\ActionManager.h" />
+    <ClInclude Include="include\managers\CommitManager.h" />
+    <ClInclude Include="include\managers\FileManager.h" />
+    <ClInclude Include="include\managers\TokenManager.h" />
+    <ClInclude Include="include\managers\UserManager.h" />
+    <ClInclude Include="include\models\API.h" />
+    <ClInclude Include="include\models\Flags.h" />
+    <ClInclude Include="include\models\IcarusAction.h" />
+    <ClInclude Include="include\models\Song.h" />
+    <ClInclude Include="include\models\Token.h" />
+    <ClInclude Include="include\models\UploadForm.h" />
+    <ClInclude Include="include\models\User.h" />
+    <ClInclude Include="include\parsers\APIParser.h" />
+    <ClInclude Include="include\syncers\Delete.h" />
+    <ClInclude Include="include\syncers\Download.h" />
+    <ClInclude Include="include\syncers\RetrieveRecords.h" />
+    <ClInclude Include="include\syncers\SyncerBase.h" />
+    <ClInclude Include="include\syncers\Upload.h" />
+    <ClInclude Include="include\utilities\Checks.h" />
+    <ClInclude Include="include\utilities\Conversions.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -1,33 +1,88 @@
 # IcarusDownloadManager

-IcarusDownloadManager is a Linux UI software client application that has the feature of uploading and downloading songs from the [Icarus](https://github.com/amazing-username/Icarus) Music Server. 
-
-
-### Getting Started
-
-Build the project:
-
-```
-export HUNTER_ROOT=/path/to/download/hunter/files/for/dependencies
-mkdir _build
-cd _build
-cmake -H. -B_builds -DHUNTER_STATUS_DEBUG=ON -DCMAKE_BUILD_TYPE=DEBUG
-cmake --build _builds --config Debug
-make
-```
-
-The program has been built and can be executed by the binary file *icd*
+IcarusDownloadManager is a Linux CLI software client application that has the feature of uploading and downloading songs from the [Icarus](https://github.com/kdeng00/Icarus) Music Server. 


 ## Built With

-* C++
+* C++ with C++20 features
 * CMake
-* GCC
-* [Hunter](https://github.com/ruslo/hunter)
-* libCurl
+* GCC >= 10 or Visual Studio >= 17 [2022]
+* [vcpkg](https://github.com/microsoft/vcpkg)
 * [json](https://github.com/nlohmann/json)
-* [cpr](http://whoshuu.github.io/cpr/)
+* [openssl](https://github.com/openssl/openssl)
+* [curl](https://github.com/curl/curl)
+* [cpr](https://github.com/libcpr/cpr)
+
+
+### Getting Started
+
+Clone the repo
+
+```
+git clone --recursive https://github.com/kdeng00/IcarusDownloadManager
+```
+
+Install packages
+
+```
+vcpkg install nlohman-json
+vcpkg install openssl
+vcpkg install curl
+vcpkg install cpr
+```
+
+
+Build the project:
+
+```
+cd IcarusDownloadManager
+mkdir build
+cd build
+
+cmake ..
+cmake --build . --config release -j
+```
+
+The program has been built and can be executed by the binary file *icd*. For information on how to use icd, merely execute the program without any command line arguments.
+
+### Downloading Song
+
+```BASH
+icd download -u spacecadet -p stellar40 -h https://icarus.com -b 15
+```
+
+### Uploading Song
+
+```BASH
+icd upload -u spacecadet -p stellar40 -h https://icarus.com -s /path/of/song.mp3
+```
+
+### Uploading Song with metadata
+
+```BASH
+icd upload-meta -u spacecadet -p stellar40 -h https://icarus.com -s /path/of/song.mp3 -t 1 -m /path/to/metadata/config/collection.json -ca /path/to/cover/art/image.png
+```
+
+### Uploading Song with metadata from directory
+
+```BASH
+icd upload-meta -u spacecadet -p stellar40 -h https://icarus.com -smca /path/where/songs/and/metadata/exists/
+```
+
+
+### Retrieving Song in json
+
+```Bash
+icd retrieve -u spacecadet -p stellar40 -h https://icarus.com -rt songs
+```
+
+### Deleting Song
+
+```BASH
+icd delete -u spacecadet -p stellar40 -h https://icarus.com -D 15
+```
+

 ## Contributing

@@ -35,13 +90,16 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on the code of conduc

 ## Versioning

-[v0.1.0](https://github.com/amazing-username/IcarusDownloadManager/releases/tag/0.1.0)
+[v0.3.0](https://github.com/kdeng00/IcarusDownloadManager/releases/tag/v0.3.0)  
+[v0.2.0](https://github.com/kdeng00/IcarusDownloadManager/releases/tag/v0.2.0)  
+[v0.1.1](https://github.com/kdeng00/IcarusDownloadManager/releases/tag/v0.1.1)  
+[v0.1.0](https://github.com/kdeng00/IcarusDownloadManager/releases/tag/0.1.0)

 ## Authors

-* **Kun Deng** - [amazing-username](https://github.com/amazing-username)
+* **Kun Deng** - [kdeng00](https://github.com/kdeng00)

-See also the list of [contributors](https://github.com/amazing-username/Icarus/graphs/contributors) who participated in this project.
+See also the list of [contributors](https://github.com/kdeng00/Icarus/graphs/contributors) who participated in this project.

 ## License

@@ -1,528 +0,0 @@
-# Copyright (c) 2013-2019, Ruslan Baratov
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This is a gate file to Hunter package manager.
-# Include this file using `include` command and add package you need, example:
-#
-#     cmake_minimum_required(VERSION 3.2)
-#
-#     include("cmake/HunterGate.cmake")
-#     HunterGate(
-#         URL "https://github.com/path/to/hunter/archive.tar.gz"
-#         SHA1 "798501e983f14b28b10cda16afa4de69eee1da1d"
-#     )
-#
-#     project(MyProject)
-#
-#     hunter_add_package(Foo)
-#     hunter_add_package(Boo COMPONENTS Bar Baz)
-#
-# Projects:
-#     * https://github.com/hunter-packages/gate/
-#     * https://github.com/ruslo/hunter
-
-option(HUNTER_ENABLED "Enable Hunter package manager support" ON)
-
-if(HUNTER_ENABLED)
-  if(CMAKE_VERSION VERSION_LESS "3.2")
-    message(
-        FATAL_ERROR
-        "At least CMake version 3.2 required for Hunter dependency management."
-        " Update CMake or set HUNTER_ENABLED to OFF."
-    )
-  endif()
-endif()
-
-include(CMakeParseArguments) # cmake_parse_arguments
-
-option(HUNTER_STATUS_PRINT "Print working status" ON)
-option(HUNTER_STATUS_DEBUG "Print a lot info" OFF)
-option(HUNTER_TLS_VERIFY "Enable/disable TLS certificate checking on downloads" ON)
-
-set(HUNTER_ERROR_PAGE "https://docs.hunter.sh/en/latest/reference/errors")
-
-function(hunter_gate_status_print)
-  if(HUNTER_STATUS_PRINT OR HUNTER_STATUS_DEBUG)
-    foreach(print_message ${ARGV})
-      message(STATUS "[hunter] ${print_message}")
-    endforeach()
-  endif()
-endfunction()
-
-function(hunter_gate_status_debug)
-  if(HUNTER_STATUS_DEBUG)
-    foreach(print_message ${ARGV})
-      string(TIMESTAMP timestamp)
-      message(STATUS "[hunter *** DEBUG *** ${timestamp}] ${print_message}")
-    endforeach()
-  endif()
-endfunction()
-
-function(hunter_gate_error_page error_page)
-  message("------------------------------ ERROR ------------------------------")
-  message("    ${HUNTER_ERROR_PAGE}/${error_page}.html")
-  message("-------------------------------------------------------------------")
-  message("")
-  message(FATAL_ERROR "")
-endfunction()
-
-function(hunter_gate_internal_error)
-  message("")
-  foreach(print_message ${ARGV})
-    message("[hunter ** INTERNAL **] ${print_message}")
-  endforeach()
-  message("[hunter ** INTERNAL **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
-  message("")
-  hunter_gate_error_page("error.internal")
-endfunction()
-
-function(hunter_gate_fatal_error)
-  cmake_parse_arguments(hunter "" "ERROR_PAGE" "" "${ARGV}")
-  if("${hunter_ERROR_PAGE}" STREQUAL "")
-    hunter_gate_internal_error("Expected ERROR_PAGE")
-  endif()
-  message("")
-  foreach(x ${hunter_UNPARSED_ARGUMENTS})
-    message("[hunter ** FATAL ERROR **] ${x}")
-  endforeach()
-  message("[hunter ** FATAL ERROR **] [Directory:${CMAKE_CURRENT_LIST_DIR}]")
-  message("")
-  hunter_gate_error_page("${hunter_ERROR_PAGE}")
-endfunction()
-
-function(hunter_gate_user_error)
-  hunter_gate_fatal_error(${ARGV} ERROR_PAGE "error.incorrect.input.data")
-endfunction()
-
-function(hunter_gate_self root version sha1 result)
-  string(COMPARE EQUAL "${root}" "" is_bad)
-  if(is_bad)
-    hunter_gate_internal_error("root is empty")
-  endif()
-
-  string(COMPARE EQUAL "${version}" "" is_bad)
-  if(is_bad)
-    hunter_gate_internal_error("version is empty")
-  endif()
-
-  string(COMPARE EQUAL "${sha1}" "" is_bad)
-  if(is_bad)
-    hunter_gate_internal_error("sha1 is empty")
-  endif()
-
-  string(SUBSTRING "${sha1}" 0 7 archive_id)
-
-  set(
-      hunter_self
-      "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked"
-  )
-
-  set("${result}" "${hunter_self}" PARENT_SCOPE)
-endfunction()
-
-# Set HUNTER_GATE_ROOT cmake variable to suitable value.
-function(hunter_gate_detect_root)
-  # Check CMake variable
-  string(COMPARE NOTEQUAL "${HUNTER_ROOT}" "" not_empty)
-  if(not_empty)
-    set(HUNTER_GATE_ROOT "${HUNTER_ROOT}" PARENT_SCOPE)
-    hunter_gate_status_debug("HUNTER_ROOT detected by cmake variable")
-    return()
-  endif()
-
-  # Check environment variable
-  string(COMPARE NOTEQUAL "$ENV{HUNTER_ROOT}" "" not_empty)
-  if(not_empty)
-    set(HUNTER_GATE_ROOT "$ENV{HUNTER_ROOT}" PARENT_SCOPE)
-    hunter_gate_status_debug("HUNTER_ROOT detected by environment variable")
-    return()
-  endif()
-
-  # Check HOME environment variable
-  string(COMPARE NOTEQUAL "$ENV{HOME}" "" result)
-  if(result)
-    set(HUNTER_GATE_ROOT "$ENV{HOME}/.hunter" PARENT_SCOPE)
-    hunter_gate_status_debug("HUNTER_ROOT set using HOME environment variable")
-    return()
-  endif()
-
-  # Check SYSTEMDRIVE and USERPROFILE environment variable (windows only)
-  if(WIN32)
-    string(COMPARE NOTEQUAL "$ENV{SYSTEMDRIVE}" "" result)
-    if(result)
-      set(HUNTER_GATE_ROOT "$ENV{SYSTEMDRIVE}/.hunter" PARENT_SCOPE)
-      hunter_gate_status_debug(
-          "HUNTER_ROOT set using SYSTEMDRIVE environment variable"
-      )
-      return()
-    endif()
-
-    string(COMPARE NOTEQUAL "$ENV{USERPROFILE}" "" result)
-    if(result)
-      set(HUNTER_GATE_ROOT "$ENV{USERPROFILE}/.hunter" PARENT_SCOPE)
-      hunter_gate_status_debug(
-          "HUNTER_ROOT set using USERPROFILE environment variable"
-      )
-      return()
-    endif()
-  endif()
-
-  hunter_gate_fatal_error(
-      "Can't detect HUNTER_ROOT"
-      ERROR_PAGE "error.detect.hunter.root"
-  )
-endfunction()
-
-function(hunter_gate_download dir)
-  string(
-      COMPARE
-      NOTEQUAL
-      "$ENV{HUNTER_DISABLE_AUTOINSTALL}"
-      ""
-      disable_autoinstall
-  )
-  if(disable_autoinstall AND NOT HUNTER_RUN_INSTALL)
-    hunter_gate_fatal_error(
-        "Hunter not found in '${dir}'"
-        "Set HUNTER_RUN_INSTALL=ON to auto-install it from '${HUNTER_GATE_URL}'"
-        "Settings:"
-        "  HUNTER_ROOT: ${HUNTER_GATE_ROOT}"
-        "  HUNTER_SHA1: ${HUNTER_GATE_SHA1}"
-        ERROR_PAGE "error.run.install"
-    )
-  endif()
-  string(COMPARE EQUAL "${dir}" "" is_bad)
-  if(is_bad)
-    hunter_gate_internal_error("Empty 'dir' argument")
-  endif()
-
-  string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" is_bad)
-  if(is_bad)
-    hunter_gate_internal_error("HUNTER_GATE_SHA1 empty")
-  endif()
-
-  string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" is_bad)
-  if(is_bad)
-    hunter_gate_internal_error("HUNTER_GATE_URL empty")
-  endif()
-
-  set(done_location "${dir}/DONE")
-  set(sha1_location "${dir}/SHA1")
-
-  set(build_dir "${dir}/Build")
-  set(cmakelists "${dir}/CMakeLists.txt")
-
-  hunter_gate_status_debug("Locking directory: ${dir}")
-  file(LOCK "${dir}" DIRECTORY GUARD FUNCTION)
-  hunter_gate_status_debug("Lock done")
-
-  if(EXISTS "${done_location}")
-    # while waiting for lock other instance can do all the job
-    hunter_gate_status_debug("File '${done_location}' found, skip install")
-    return()
-  endif()
-
-  file(REMOVE_RECURSE "${build_dir}")
-  file(REMOVE_RECURSE "${cmakelists}")
-
-  file(MAKE_DIRECTORY "${build_dir}") # check directory permissions
-
-  # Disabling languages speeds up a little bit, reduces noise in the output
-  # and avoids path too long windows error
-  file(
-      WRITE
-      "${cmakelists}"
-      "cmake_minimum_required(VERSION 3.2)\n"
-      "project(HunterDownload LANGUAGES NONE)\n"
-      "include(ExternalProject)\n"
-      "ExternalProject_Add(\n"
-      "    Hunter\n"
-      "    URL\n"
-      "    \"${HUNTER_GATE_URL}\"\n"
-      "    URL_HASH\n"
-      "    SHA1=${HUNTER_GATE_SHA1}\n"
-      "    DOWNLOAD_DIR\n"
-      "    \"${dir}\"\n"
-      "    TLS_VERIFY\n"
-      "    ${HUNTER_TLS_VERIFY}\n"
-      "    SOURCE_DIR\n"
-      "    \"${dir}/Unpacked\"\n"
-      "    CONFIGURE_COMMAND\n"
-      "    \"\"\n"
-      "    BUILD_COMMAND\n"
-      "    \"\"\n"
-      "    INSTALL_COMMAND\n"
-      "    \"\"\n"
-      ")\n"
-  )
-
-  if(HUNTER_STATUS_DEBUG)
-    set(logging_params "")
-  else()
-    set(logging_params OUTPUT_QUIET)
-  endif()
-
-  hunter_gate_status_debug("Run generate")
-
-  # Need to add toolchain file too.
-  # Otherwise on Visual Studio + MDD this will fail with error:
-  # "Could not find an appropriate version of the Windows 10 SDK installed on this machine"
-  if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
-    get_filename_component(absolute_CMAKE_TOOLCHAIN_FILE "${CMAKE_TOOLCHAIN_FILE}" ABSOLUTE)
-    set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=${absolute_CMAKE_TOOLCHAIN_FILE}")
-  else()
-    # 'toolchain_arg' can't be empty
-    set(toolchain_arg "-DCMAKE_TOOLCHAIN_FILE=")
-  endif()
-
-  string(COMPARE EQUAL "${CMAKE_MAKE_PROGRAM}" "" no_make)
-  if(no_make)
-    set(make_arg "")
-  else()
-    # Test case: remove Ninja from PATH but set it via CMAKE_MAKE_PROGRAM
-    set(make_arg "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
-  endif()
-
-  execute_process(
-      COMMAND
-      "${CMAKE_COMMAND}"
-      "-H${dir}"
-      "-B${build_dir}"
-      "-G${CMAKE_GENERATOR}"
-      "${toolchain_arg}"
-      ${make_arg}
-      WORKING_DIRECTORY "${dir}"
-      RESULT_VARIABLE download_result
-      ${logging_params}
-  )
-
-  if(NOT download_result EQUAL 0)
-    hunter_gate_internal_error(
-        "Configure project failed."
-        "To reproduce the error run: ${CMAKE_COMMAND} -H${dir} -B${build_dir} -G${CMAKE_GENERATOR} ${toolchain_arg} ${make_arg}"
-        "In directory ${dir}"
-    )
-  endif()
-
-  hunter_gate_status_print(
-      "Initializing Hunter workspace (${HUNTER_GATE_SHA1})"
-      "  ${HUNTER_GATE_URL}"
-      "  -> ${dir}"
-  )
-  execute_process(
-      COMMAND "${CMAKE_COMMAND}" --build "${build_dir}"
-      WORKING_DIRECTORY "${dir}"
-      RESULT_VARIABLE download_result
-      ${logging_params}
-  )
-
-  if(NOT download_result EQUAL 0)
-    hunter_gate_internal_error("Build project failed")
-  endif()
-
-  file(REMOVE_RECURSE "${build_dir}")
-  file(REMOVE_RECURSE "${cmakelists}")
-
-  file(WRITE "${sha1_location}" "${HUNTER_GATE_SHA1}")
-  file(WRITE "${done_location}" "DONE")
-
-  hunter_gate_status_debug("Finished")
-endfunction()
-
-# Must be a macro so master file 'cmake/Hunter' can
-# apply all variables easily just by 'include' command
-# (otherwise PARENT_SCOPE magic needed)
-macro(HunterGate)
-  if(HUNTER_GATE_DONE)
-    # variable HUNTER_GATE_DONE set explicitly for external project
-    # (see `hunter_download`)
-    set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
-  endif()
-
-  # First HunterGate command will init Hunter, others will be ignored
-  get_property(_hunter_gate_done GLOBAL PROPERTY HUNTER_GATE_DONE SET)
-
-  if(NOT HUNTER_ENABLED)
-    # Empty function to avoid error "unknown function"
-    function(hunter_add_package)
-    endfunction()
-
-    set(
-        _hunter_gate_disabled_mode_dir
-        "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/disabled-mode"
-    )
-    if(EXISTS "${_hunter_gate_disabled_mode_dir}")
-      hunter_gate_status_debug(
-          "Adding \"disabled-mode\" modules: ${_hunter_gate_disabled_mode_dir}"
-      )
-      list(APPEND CMAKE_PREFIX_PATH "${_hunter_gate_disabled_mode_dir}")
-    endif()
-  elseif(_hunter_gate_done)
-    hunter_gate_status_debug("Secondary HunterGate (use old settings)")
-    hunter_gate_self(
-        "${HUNTER_CACHED_ROOT}"
-        "${HUNTER_VERSION}"
-        "${HUNTER_SHA1}"
-        _hunter_self
-    )
-    include("${_hunter_self}/cmake/Hunter")
-  else()
-    set(HUNTER_GATE_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}")
-
-    string(COMPARE NOTEQUAL "${PROJECT_NAME}" "" _have_project_name)
-    if(_have_project_name)
-      hunter_gate_fatal_error(
-          "Please set HunterGate *before* 'project' command. "
-          "Detected project: ${PROJECT_NAME}"
-          ERROR_PAGE "error.huntergate.before.project"
-      )
-    endif()
-
-    cmake_parse_arguments(
-        HUNTER_GATE "LOCAL" "URL;SHA1;GLOBAL;FILEPATH" "" ${ARGV}
-    )
-
-    string(COMPARE EQUAL "${HUNTER_GATE_SHA1}" "" _empty_sha1)
-    string(COMPARE EQUAL "${HUNTER_GATE_URL}" "" _empty_url)
-    string(
-        COMPARE
-        NOTEQUAL
-        "${HUNTER_GATE_UNPARSED_ARGUMENTS}"
-        ""
-        _have_unparsed
-    )
-    string(COMPARE NOTEQUAL "${HUNTER_GATE_GLOBAL}" "" _have_global)
-    string(COMPARE NOTEQUAL "${HUNTER_GATE_FILEPATH}" "" _have_filepath)
-
-    if(_have_unparsed)
-      hunter_gate_user_error(
-          "HunterGate unparsed arguments: ${HUNTER_GATE_UNPARSED_ARGUMENTS}"
-      )
-    endif()
-    if(_empty_sha1)
-      hunter_gate_user_error("SHA1 suboption of HunterGate is mandatory")
-    endif()
-    if(_empty_url)
-      hunter_gate_user_error("URL suboption of HunterGate is mandatory")
-    endif()
-    if(_have_global)
-      if(HUNTER_GATE_LOCAL)
-        hunter_gate_user_error("Unexpected LOCAL (already has GLOBAL)")
-      endif()
-      if(_have_filepath)
-        hunter_gate_user_error("Unexpected FILEPATH (already has GLOBAL)")
-      endif()
-    endif()
-    if(HUNTER_GATE_LOCAL)
-      if(_have_global)
-        hunter_gate_user_error("Unexpected GLOBAL (already has LOCAL)")
-      endif()
-      if(_have_filepath)
-        hunter_gate_user_error("Unexpected FILEPATH (already has LOCAL)")
-      endif()
-    endif()
-    if(_have_filepath)
-      if(_have_global)
-        hunter_gate_user_error("Unexpected GLOBAL (already has FILEPATH)")
-      endif()
-      if(HUNTER_GATE_LOCAL)
-        hunter_gate_user_error("Unexpected LOCAL (already has FILEPATH)")
-      endif()
-    endif()
-
-    hunter_gate_detect_root() # set HUNTER_GATE_ROOT
-
-    # Beautify path, fix probable problems with windows path slashes
-    get_filename_component(
-        HUNTER_GATE_ROOT "${HUNTER_GATE_ROOT}" ABSOLUTE
-    )
-    hunter_gate_status_debug("HUNTER_ROOT: ${HUNTER_GATE_ROOT}")
-    if(NOT HUNTER_ALLOW_SPACES_IN_PATH)
-      string(FIND "${HUNTER_GATE_ROOT}" " " _contain_spaces)
-      if(NOT _contain_spaces EQUAL -1)
-        hunter_gate_fatal_error(
-            "HUNTER_ROOT (${HUNTER_GATE_ROOT}) contains spaces."
-            "Set HUNTER_ALLOW_SPACES_IN_PATH=ON to skip this error"
-            "(Use at your own risk!)"
-            ERROR_PAGE "error.spaces.in.hunter.root"
-        )
-      endif()
-    endif()
-
-    string(
-        REGEX
-        MATCH
-        "[0-9]+\\.[0-9]+\\.[0-9]+[-_a-z0-9]*"
-        HUNTER_GATE_VERSION
-        "${HUNTER_GATE_URL}"
-    )
-    string(COMPARE EQUAL "${HUNTER_GATE_VERSION}" "" _is_empty)
-    if(_is_empty)
-      set(HUNTER_GATE_VERSION "unknown")
-    endif()
-
-    hunter_gate_self(
-        "${HUNTER_GATE_ROOT}"
-        "${HUNTER_GATE_VERSION}"
-        "${HUNTER_GATE_SHA1}"
-        _hunter_self
-    )
-
-    set(_master_location "${_hunter_self}/cmake/Hunter")
-    get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE)
-    set(_done_location "${_archive_id_location}/DONE")
-    set(_sha1_location "${_archive_id_location}/SHA1")
-
-    # Check Hunter already downloaded by HunterGate
-    if(NOT EXISTS "${_done_location}")
-      hunter_gate_download("${_archive_id_location}")
-    endif()
-
-    if(NOT EXISTS "${_done_location}")
-      hunter_gate_internal_error("hunter_gate_download failed")
-    endif()
-
-    if(NOT EXISTS "${_sha1_location}")
-      hunter_gate_internal_error("${_sha1_location} not found")
-    endif()
-    file(READ "${_sha1_location}" _sha1_value)
-    string(COMPARE EQUAL "${_sha1_value}" "${HUNTER_GATE_SHA1}" _is_equal)
-    if(NOT _is_equal)
-      hunter_gate_internal_error(
-          "Short SHA1 collision:"
-          "  ${_sha1_value} (from ${_sha1_location})"
-          "  ${HUNTER_GATE_SHA1} (HunterGate)"
-      )
-    endif()
-    if(NOT EXISTS "${_master_location}")
-      hunter_gate_user_error(
-          "Master file not found:"
-          "  ${_master_location}"
-          "try to update Hunter/HunterGate"
-      )
-    endif()
-    include("${_master_location}")
-    set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
-  endif()
-endmacro()
@@ -0,0 +1,20 @@
+[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
@@ -1,7 +1,9 @@
 #ifndef ACTIONMANAGER_H_
 #define ACTIONMANAGER_H_

+#include<algorithm>
 #include<string>
+#include<string_view>
 #include<array>
 #include<vector>

@@ -10,35 +12,82 @@

 namespace Managers
 {
-    class ActionManager
+
+
+
+class ActionManager
+{
+public:
+    ActionManager(char**, int);
+
+    Models::IcarusAction retrieveIcarusAction() const;
+private:
+    constexpr std::array<const char*, 16> supportedFlags() noexcept
    {
-    public:
-        ActionManager(char**, int);
+        constexpr std::array<const char*, 16> allFlags{"-u", "-p", "-t", "-h", "-s",
+            "-sd", "-sr", "-d", "-D", "-b", "-rt", "-nc",
+            "-m", "-ca", "-smca", "-t"};

-        Models::IcarusAction retrieveIcarusAction() const;
-    private:
-        bool isNumber(std::string);
+        return allFlags;
+    }
+    constexpr std::array<const char*, 4> supportedActions() noexcept;

-        void initialize();
-        void validateFlags();
+    void initialize();
+    void validateFlags();
+    // Checks to see if the flag is valid
+    template<typename Str>
+    bool isValidFlag(const Str flag)
+    {
+        const auto flags = supportedFlags();
+        const auto i = std::find_if(flags.begin(), flags.end(), [&](const Str &f)
+        {
+            return f.compare(flag) == 0 ? true : false;
+        });

-        std::vector<std::string> parsedFlags();
+        auto result = i != flags.end() ? true : false;

-        void printAction();
-        void printFlags();
+        return result;
+    }
+
+    template<typename Str>
+    bool doesFlagHaveValue(const Str flag)
+    {
+        const auto flags = parsedFlags();
+        auto i = std::find_if(flags.begin(), flags.end(), [&](const Str &f)
+        {
+            return f.compare(flag) == 0 ? true : false;
+        });
+
+        if (i != flags.end())
+        {
+            if (++i != flags.end() && !isValidFlag<Str>(*i))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    void printAction() noexcept;
+    void printFlags() noexcept;
+
+    std::vector<std::string> parsedFlags();
+
+    std::string action;
+    
+    std::vector<Models::Flags> flags;
+
+    char **params;
+    int paramCount;
+};

-        std::string action;
-        std::array<std::string, 4> supportedActions{
-            "download", "upload", "retrieve", "delete"
-        };
-        std::array<std::string, 11> supportedFlags{
-            "-u", "-p", "-t", "-h", "-s", "-sd",
-            "-sr", "-d", "-D", "-b", "-rt"
-        };
-        std::vector<Models::Flags> flags;
-        char **params;
-        int paramCount;
-    };
 }

 #endif
@@ -2,50 +2,214 @@
 #define COMMITMANAGER_H_

 #include<map>
+#include<iostream>
 #include<string>
+#include<string_view>

 #include"Models/API.h"
-#include"Models/Token.h"
 #include"Models/IcarusAction.h"
+#include"Models/Song.h"
+#include"Models/Token.h"
+#include"Utilities/Checks.h"

 namespace Managers
 {
-    class CommitManager
+
+class CommitManager
+{
+public:
+    CommitManager(Models::IcarusAction&);
+
+    void commitAction();
+
+
+    enum class RetrieveTypes
+    {
+        songs
+    };
+    
+        // Used for parsing songs from the metadata file
+    class Album
    {
    public:
-        CommitManager(Models::IcarusAction&);
+        Album() = default;

-        void commitAction();
+        void printInfo();

-        enum RetrieveTypes
-        {
-            songs
-        };

-    private:
-        Models::Token parseToken(Models::API);
-
-        void deleteSong();
-        void downloadSong();
-        void retrieveObjects();
-        void uploadSong();
-
-        enum ActionValues
-        {
-            deleteAct,
-            downloadAct,
-            retrieveAct,
-            uploadAct
-        };
-
-        std::map<std::string, ActionValues> mapActions{
-			{"delete", deleteAct}, {"download", downloadAct},
-			{"retrieve", retrieveAct},
-			{"upload", uploadAct}
-		};
-
-        Models::IcarusAction icaAction;
+        std::string album;
+        std::string albumArtist;
+        std::string genre;
+        int year;
+        int trackCount;
+        int discCount;
+        std::vector<Models::Song> songs;
    };
+
+private:
+    enum class ActionValues;
+    
+    std::map<std::string, ActionValues> mapActions() noexcept;
+
+    void deleteSong();
+    void downloadSong();
+    void retrieveObjects();
+    void uploadSong();
+
+    Models::Token parseToken(Models::API);
+
+    // Uploads a single song. The song is constructed from a metadata file that contains
+    // information about the album the song is from. Also, the cover art of the song must
+    // be present.
+    //
+    // Expects
+    // * Song - mp3 file path
+    // * TrackID - track number to chose from when retrieving metadata. "1" and "1:1" are similar
+    // * Metadata - Source file containing metadata of the song
+    // * Cover art - path to image cover art
+    void uploadSongWithMetadata();
+
+    // Expects the song path, trackID, metadata file path, and cover path
+    void singTargetUpload(const std::string &songPath, const std::string &trackID, 
+        const std::string &metaPath, const std::string &coverPath);
+    // Expects the source directory that contains songs, a metadata file, and cover image
+    // Disc and Track is retrieved from the filename if the filename conforms to a standard.
+    // If not, then the disc and track will default to 1
+    //
+    // Standards
+    // * track01.mp3 - Disc 1, Track 1
+    // * track05d02.mp3 - Disc 2, Track 5
+    void multiTargetUpload(const std::string &sourcePath);
+
+    // Standards
+    // * track01.mp3 - Disc 1, Track 1
+    // * track05d02.mp3 - Disc 2, Track 5
+    template<typename Song, typename Str>
+    void initializeDiscAndTrack(Song &song)
+    {
+        auto disc = 1;
+        auto track = 1;
+        // 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 trd = song.songPath.find("trackd");
+        auto tr = song.songPath.find("track");
+
+        if (tr != Str::npos)
+        {
+            mode = 1;
+        }
+
+        if (trd != Str::npos)
+        {
+            mode = 2;
+        }
+
+        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);
+
+        switch(mode)
+        {
+        case 1:
+        {
+            if (k != songPath.end() && dot != songPath.end())
+            {
+                auto tStr = std::string(++k, dot);
+                std::cout << "TStr: " << tStr<<"\n";
+
+                if (Utilities::Checks::isNumber(tStr))
+                {
+                    track = std::atoi(tStr.c_str());
+                }
+            }
+            break;
+        }
+        case 2:
+        {
+            if (k != songPath.end() && dot != songPath.end() && d != songPath.end())
+            {
+                auto tStr = std::string(++k, d);
+                auto dStr = std::string(++d, dot);
+                std::cout<<"DStr: "<<dStr<<" TStr: " << tStr<<"\n";
+
+                if (Utilities::Checks::isNumber(tStr))
+                {
+                    track = std::atoi(tStr.c_str());
+                }
+                else if (Utilities::Checks::isNumber(dStr))
+                {
+                    disc = std::atoi(dStr.c_str());
+                }
+            }
+            break;
+        }
+        }
+
+
+        song.disc = disc;
+        song.track = track;
+    }
+
+    template<typename Song, typename Str>
+    void parseDiscAndTrack(Song &song, const Str &trackID)
+    {
+        auto sep = [](char c, char t) { return c == t; };
+        auto separator = Utilities::Checks::itemIterInContainer<char, Str>(trackID, ':', sep);
+
+        if (separator != trackID.end())
+        {
+            auto dStr = Str(trackID.begin(), separator);
+            auto tStr = Str(++separator, trackID.end());
+
+            song.disc = std::atoi(dStr.c_str());
+            song.track = std::atoi(tStr.c_str());
+        }
+        else
+        {
+            auto isNumber = Utilities::Checks::isNumber(trackID);
+            if (isNumber)
+            {
+                song.track = std::atoi(trackID.c_str());
+            }
+        }
+    }
+
+
+    // Checks for the no confirm flag. Used when uploading songs from a directory
+    bool checkForNoConfirm()
+    {
+        for (const auto &arg: this->icaAction.flags)
+        {
+            if (arg.flag.compare("-nc") == 0)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    Album retrieveMetadata(const std::string_view path);
+    std::string retrieveFileContent(const std::string_view path);
+
+    enum class ActionValues
+    {
+        deleteAct,
+        downloadAct,
+        retrieveAct,
+        uploadAct,
+        UPLOAD_SONG_WITH_METADATA // Uploads the song with metadata, including cover art
+    };
+
+
+    Models::IcarusAction icaAction;
+
+};
+
 }

 #endif
@@ -5,25 +5,27 @@

 namespace Managers
 {
-    class FileManager
-    {
-    public:
-        FileManager();
-        FileManager(std::string);

-        void saveFile(std::string);
-        void modifyFilePath(std::string);
+class FileManager
+{
+public:
+    FileManager();
+    FileManager(std::string);

-        char* retrieveFileBuffer() const;
-        int retrieveFileBufferLength() const;
-    private:
-        void readFile();
+    void saveFile(std::string);
+    void modifyFilePath(std::string);
+
+    char* retrieveFileBuffer() const;
+    int retrieveFileBufferLength() const;
+private:
+    void readFile();
+
+    std::string filePath;
+    char* fileBuffer;
+    bool fileRead;
+    int fileBufferLength;
+};

-        std::string filePath;
-        char* fileBuffer;
-        bool fileRead;
-        int fileBufferLength;
-    };
 }

 #endif
@@ -7,17 +7,19 @@

 namespace Managers
 {
-    class TokenManager
-    {
-    public:
-        TokenManager(const Models::User&);
-        TokenManager(const Models::User&, Models::API&);

-        Models::Token requestToken();
-    private:
-        Models::API api;
-        Models::User user;
-    };
+class TokenManager
+{
+public:
+    TokenManager(const Models::User&);
+    TokenManager(const Models::User&, Models::API&);
+
+    Models::Token requestToken();
+private:
+    Models::API api;
+    Models::User user;
+};
+
 }

 #endif
@@ -8,19 +8,21 @@

 namespace Managers
 {
-    class UserManager
-    {
-    public:
-        UserManager(Models::User);
-        UserManager(const Models::IcarusAction);

-        Models::User retrieveUser() const;
-    private:
-        void parseUserFromActions();
+class UserManager
+{
+public:
+    UserManager(Models::User);
+    UserManager(const Models::IcarusAction);
+
+    Models::User retrieveUser() const;
+private:
+    void parseUserFromActions();
+
+    Models::User user;
+    Models::IcarusAction icaAction;
+};

-        Models::User user;
-        Models::IcarusAction icaAction;
-    };
 }

 #endif
@@ -5,12 +5,15 @@

 namespace Models
 {
-    struct API
-    {
-        std::string url;
-        std::string endpoint;
-        std::string version;
-    };
+
+class API
+{
+public:
+    std::string url;
+    std::string endpoint;
+    std::string version;
+};
+
 }

 #endif
@@ -5,11 +5,14 @@

 namespace Models
 {
-    struct Flags
-    {
-        std::string flag;
-        std::string value;
-    };
+
+class Flags
+{
+public:
+    std::string flag;
+    std::string value;
+};
+
 }

 #endif
@@ -2,17 +2,52 @@
 #define ICARUSACTION_H_

 #include<string>
+#include<algorithm>
+#include<string_view>
 #include<vector>
+#include<iostream>

 #include"Flags.h"

 namespace Models
 {
-    struct IcarusAction
+
+class IcarusAction
+{
+public:
+    std::string retrieveFlagValue(const std::string_view flag)
    {
-        std::string action;
-        std::vector<Flags> flags;
-    };
+        std::string value;
+
+        const auto fg = std::find_if(flags.begin(), flags.end(), [&](Flags f)
+        {
+            return f.flag.compare(flag) == 0 ? true : false;
+        });
+
+        if (fg != flags.end())
+        {
+            value.assign(fg->value);
+        }
+
+        return value;
+    }
+    void print_action_and_flags() noexcept
+    {
+        std::cout<<"Action: "<<this->action<<"\n";
+        std::cout<<"Flag count: "<<this->flags.size()<<"\n";
+
+        for (const auto &flag : this->flags)
+        {
+            std::cout<<"flag "<<flag.flag<<" value "<<flag.value<<"\n";
+        }
+
+        std::cout<<"\n";
+    }
+
+    std::string action;
+    std::vector<Flags> flags;
+};
+
 }

 #endif
@@ -1,24 +1,90 @@
 #ifndef SONG_H_
 #define SONG_H_

-#include<string>
+#include <string>
+#include <iostream>
+#include <sstream>


 namespace Models
 {
-    struct Song
+
+class Song
+{
+public:
+    Song() = default;
+
+    void printInfo()
    {
-        int id;
-        std::string title;
-        std::string artist;
-        std::string album;
-        std::string genre;
-        int year;
-        int duration;
-        int track;
-        std::string data;
-        std::string songPath;
-    };
+        std::cout<<"Title: "<<this->title<<"\n";
+        std::cout<<"\n";
+    }
+
+    std::string song_path() noexcept
+    {
+        std::stringstream buffer;
+
+        buffer << this->directory;
+
+        const auto count = this->directory.size();
+
+        if (this->directory.at(count - 1) != '/' || this->directory.at(count - 1) != '\\')
+        {
+            buffer << "/";
+        }
+
+        buffer << this->filename;
+
+        return buffer.str();
+    }
+
+    int generate_filename_from_track()
+    {
+        auto result = 0;
+        std::stringstream buffer;
+        buffer << "track";
+
+        // NOTE: Multiple discs in one directory is not being addressed
+        if (this->track < 10)
+        {
+            buffer << "0";
+        }
+
+        buffer << this->track << ".mp3";
+
+
+        this->filename.assign(buffer.str());
+
+        return result;
+    }
+
+    std::string toMetadataJson();
+
+
+    int id;
+    std::string title;
+    std::string artist;
+    std::string album;
+    std::string genre;
+    int year;
+    int duration;
+    int track;
+    int disc;
+    std::string data;
+    [[deprecated("Use song_path() function instead")]]
+    std::string songPath;
+    std::string filename;
+    std::string directory;
+};
+
+class CoverArt
+{
+public:
+    int id;
+    std::string title;
+    std::string path;
+};
+
 } 

 #endif
@@ -5,12 +5,14 @@

 namespace Models
 {
-    struct Token
-    {
-        std::string accessToken;
-        std::string tokenType;
-        int expiration;
-    };
+
+struct Token
+{
+    std::string accessToken;
+    std::string tokenType;
+    int expiration;
+};
+
 }

 #endif
@@ -6,11 +6,13 @@

 namespace Models
 {
-    struct UploadForm
-    {
-        std::string url;
-        std::string filePath;
-    };
+
+struct UploadForm
+{
+    std::string url;
+    std::string filePath;
+};
+
 } 

 #endif
@@ -5,11 +5,13 @@

 namespace Models
 {
-    struct User
-    {
-        std::string username;
-        std::string password;
-    };
+
+struct User
+{
+    std::string username;
+    std::string password;
+};
+
 }

 #endif
@@ -6,18 +6,20 @@

 namespace Parsers
 {
-    class APIParser
-    {
-    public:
-        APIParser(Models::IcarusAction);

-        Models::API retrieveAPI() const;
-    private:
-        void parseAPI();
+class APIParser
+{
+public:
+    APIParser(Models::IcarusAction);
+
+    Models::API retrieveAPI() const;
+private:
+    void parseAPI();
+
+    Models::API api;
+    Models::IcarusAction icaAct;
+};

-        Models::API api;
-        Models::IcarusAction icaAct;
-    };
 }

 #endif
@@ -9,15 +9,17 @@

 namespace Syncers
 {
-    class Delete : SyncerBase
-    {
-    public:
-        Delete(Models::API);

-        void deleteSong(const Models::Token, Models::Song);
-    private:
-        std::string retrieveUrl(Models::Song);
-    };
+class Delete : SyncerBase
+{
+public:
+    Delete(Models::API);
+
+    void deleteSong(const Models::Token, Models::Song);
+private:
+    std::string retrieveUrl(Models::Song);
+};
+
 }

 #endif
@@ -12,20 +12,22 @@

 namespace Syncers
 {
-    class Download : SyncerBase
-    {
-    public:
-        Download();
-        Download(Models::API);
-        Download(std::string);

-        void downloadSong(const Models::Token token, Models::Song);
-    private:
-        std::string retrieveUrl(Models::Song);
+class Download : SyncerBase
+{
+public:
+    Download();
+    Download(Models::API);
+    Download(std::string);
+
+    void downloadSong(const Models::Token token, Models::Song);
+private:
+    std::string retrieveUrl(Models::Song);
+
+    std::string downloadFilePath;
+    void saveSong(Models::Song&);
+};

-        std::string downloadFilePath;
-        void saveSong(Models::Song&);
-    };
 }

 #endif
@@ -8,19 +8,21 @@

 namespace Syncers
 {
-    class RetrieveRecords: public SyncerBase
-    {
-    public:
-        RetrieveRecords();
-        RetrieveRecords(Models::API, Models::Token);

-        void retrieve(Managers::CommitManager::RetrieveTypes);
-    private:
-        void fetchSongs();
+class RetrieveRecords: public SyncerBase
+{
+public:
+    RetrieveRecords();
+    RetrieveRecords(Models::API, Models::Token);
+
+    void retrieve(Managers::CommitManager::RetrieveTypes);
+private:
+    void fetchSongs();
+
+    Models::API api;
+    Models::Token token;
+};

-        Models::API api;
-        Models::Token token;
-    };
 }

 #endif
@@ -7,14 +7,23 @@

 namespace Syncers
 {
-    class SyncerBase
+
+class SyncerBase
+{
+protected:
+    Models::API api;
+    const int OK = 200;
+    const int UNAUTHORIZED = 401;
+    const int NOTFOUND = 404;
+
+    enum class Result 
    {
-    protected:
-        Models::API api;
-        const int OK = 200;
-        const int UNAUTHORIZED = 401;
-        const int NOTFOUND = 404;
+        OK = 200,
+        UNAUTHORIZED = 401,
+        NOTFOUND = 404
    };
+};
+
 }

 #endif
@@ -1,47 +1,55 @@
 #ifndef UPLOAD_H_
 #define UPLOAD_H_

-#include<filesystem>
-#include<string>
-#include<vector>
+#include <filesystem>
+#include <string>
+#include <vector>

-#include<nlohmann/json.hpp>
+#include <nlohmann/json.hpp>

-#include"Managers/FileManager.h"
-#include"Models/API.h"
-#include"Models/Song.h"
-#include"Models/Token.h"
-#include"Models/UploadForm.h"
+#include "Managers/CommitManager.h"
+#include "Managers/FileManager.h"
+#include "Models/API.h"
+#include "Models/Song.h"
+#include "Models/Token.h"
+#include "Models/UploadForm.h"

 namespace fs = std::filesystem;


 namespace Syncers
 {
-    class Upload
+
+class Upload
+{
+public:
+    Upload() = default;
+    Upload(Models::API api, Models::Token token) : m_token(token), api(api)
    {
-        public:
-            Upload();
-            Upload(Models::API);
+        this->api.endpoint = "song/data";
+    }

-            Models::Song uploadSong(const Models::Token&, Models::Song&);
-            void uploadSongsFromDirectory(const Models::Token&, const std::string&, bool);
-        private:
-            Managers::FileManager fMgr;
-            Models::API api;
-            Models::Song song;
+    Models::Song uploadSong(Models::Song&);
+    void uploadSongsFromDirectory(const std::string&, const bool, bool);
+    void uploadSongWithMetadata(Managers::CommitManager::Album&, Models::Song&, Models::CoverArt&);
+private:
+    Managers::FileManager fMgr;
+    Models::API api;
+    Models::Song song;
+    Models::Token m_token;

-            std::vector<Models::Song> retrieveAllSongsFromDirectory(const std::string&,
-                bool);
+    std::vector<Models::Song> retrieveAllSongsFromDirectory(const std::string&,
+        bool);

-            std::string retrieveUrl();
+    std::string retrieveUrl();

-            Models::Song retrieveSongPath(fs::directory_entry&);
+    Models::Song retrieveSongPath(fs::directory_entry&);
+
+    void printSongDetails();
+    void printSongDetails(std::vector<Models::Song>&);
+    void printJsonData(const nlohmann::json&);
+};

-            void printSongDetails();
-            void printSongDetails(std::vector<Models::Song>&);
-            void printJsonData(nlohmann::json);
-    };
 }

 #endif
@@ -13,22 +13,24 @@

 namespace UI
 {
-    class AboutWindow: public QDialog, public CommonWindow
-    {
-        Q_OBJECT
-    public:
-        AboutWindow(QWidget* parent=0);
-        ~AboutWindow() = default;

-    private:
-        void connections();
-        void setupWindow();
+class AboutWindow: public QDialog, public CommonWindow
+{
+    Q_OBJECT
+public:
+    AboutWindow(QWidget* parent=0);
+    ~AboutWindow() = default;

-        std::unique_ptr<QLabel> appName;
+private:
+    void connections();
+    void setupWindow();
+
+    std::unique_ptr<QLabel> appName;
+
+private slots:
+    void closeWindow();
+};

-    private slots:
-        void closeWindow();
-    };
 }

 #endif
@@ -10,6 +10,9 @@
 #include<QPushButton>


+namespace UI
+{
+
 class CommonWindow
 {
 public:
@@ -24,4 +27,7 @@ protected:
    std::unique_ptr<QVBoxLayout> subLayoutTwoQt;
    int windowHeight, windowWidth;
 };
+
+}
+
 #endif
@@ -22,61 +22,63 @@

 namespace UI
 {
-    class MainWindow: public QMainWindow, public CommonWindow
-    {
-        Q_OBJECT
-    public:
-        MainWindow();
-        ~MainWindow() = default;
-    private:
-        void configureDownloadSection();
-        void configureUploadSection();
-        void configureWindowDimensions();
-        void configureWindowProperties();
-        void connections();
-        void createMenus();
-        void setupMainWidget();
-        void setupMainWindow();
-        void setupWindowLists();
+
+class MainWindow: public QMainWindow, public CommonWindow
+{
+    Q_OBJECT
+public:
+    MainWindow();
+    ~MainWindow() = default;
+private:
+    void configureDownloadSection();
+    void configureUploadSection();
+    void configureWindowDimensions();
+    void configureWindowProperties();
+    void connections();
+    void createMenus();
+    void setupMainWidget();
+    void setupMainWindow();
+    void setupWindowLists();


-        std::unique_ptr<QStackedWidget> widgetStack;
+    std::unique_ptr<QStackedWidget> widgetStack;

-        std::unique_ptr<QVBoxLayout> stackLayout;
+    std::unique_ptr<QVBoxLayout> stackLayout;

-            std::unique_ptr<QHBoxLayout> urlPortion;
-            std::unique_ptr<QHBoxLayout> songPathPortion;
+        std::unique_ptr<QHBoxLayout> urlPortion;
+        std::unique_ptr<QHBoxLayout> songPathPortion;

-        std::unique_ptr<QWidget> mainWidgetQt;
-        std::unique_ptr<QWidget> uploadSongWidgetQt;
+    std::unique_ptr<QWidget> mainWidgetQt;
+    std::unique_ptr<QWidget> uploadSongWidgetQt;

-        std::unique_ptr<QDockWidget> MainDockWidgetQt;
+    std::unique_ptr<QDockWidget> MainDockWidgetQt;

-        std::unique_ptr<QComboBox> windowComboBox;
-        
-        std::unique_ptr<QPushButton> uploadSongQt;
+    std::unique_ptr<QComboBox> windowComboBox;
+    
+    std::unique_ptr<QPushButton> uploadSongQt;

-        std::unique_ptr<QTextEdit> urlQt;
-        std::unique_ptr<QTextEdit> sourceFilePathQt;
+    std::unique_ptr<QTextEdit> urlQt;
+    std::unique_ptr<QTextEdit> sourceFilePathQt;

-            std::unique_ptr<QLabel> urlLabel;
-            std::unique_ptr<QLabel> songPath;
+        std::unique_ptr<QLabel> urlLabel;
+        std::unique_ptr<QLabel> songPath;

-        std::unique_ptr<QMenu> fileMenuQt;
-        std::unique_ptr<QMenu> editMenuQt;
-        std::unique_ptr<QMenu> helpMenuQt;
+    std::unique_ptr<QMenu> fileMenuQt;
+    std::unique_ptr<QMenu> editMenuQt;
+    std::unique_ptr<QMenu> helpMenuQt;

-        std::unique_ptr<QAction> closeApplicationQt;
-        std::unique_ptr<QAction> aboutApplicationQt;
+    std::unique_ptr<QAction> closeApplicationQt;
+    std::unique_ptr<QAction> aboutApplicationQt;
+
+    std::unique_ptr<AboutWindow> aboutWindow;
+signals:
+private slots:
+    void uploadSong();
+    void exitApplication();
+    void displaySoftwareInformation();
+    void setCurrentIndex(int);
+};

-        std::unique_ptr<AboutWindow> aboutWindow;
-    signals:
-    private slots:
-        void uploadSong();
-        void exitApplication();
-        void displaySoftwareInformation();
-        void setCurrentIndex(int);
-    };
 }

 #endif
@@ -0,0 +1,69 @@
+#ifndef CHECKS_H_
+#define CHECKS_H_
+
+#include<algorithm>
+#include<string>
+#include<cstdlib>
+#include<ctype.h>
+
+namespace Utilities
+{
+    class Checks
+    {
+    public:
+        Checks() = delete;
+
+        static auto isNumber(const std::string &val)
+        {
+            return !val.empty() && std::find_if(val.begin(), 
+                val.end(), [](char c)
+                {
+                    return !std::isdigit(c);
+                    }) == val.end();
+        }
+
+        // Note: Not implemented
+        template<typename Item, typename Container, typename Func>
+        static auto itemInContainer(const Container container, const Item item, Func func)
+        {
+            auto result = false;
+            auto i = std::find_if(container.begin(), container.end(), [&](Item i)
+            {
+                return func(item, i);
+            });
+
+            if (i != container.end())
+            {
+                result = true;
+            }
+
+            return result;
+        }
+
+        template<typename Item, typename Container, typename Func>
+        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();
+            }
+
+            return ii;
+        }
+    private:
+    };
+}
+
+#endif
+
+
+
@@ -6,17 +6,27 @@

 namespace Utilities
 {
-    class Conversions
+
+class Conversions
+{
+public:
+    Conversions();
+
+    static void toLowerChar(char &c)
    {
-    public:
-        Conversions();
+        if (std::isalpha(c))
+        {
+            c = std::tolower(c);
+        }
+    }

-        void initializeValues();
+    void initializeValues();
+
+    template<typename T>
+    void printValue(T val);
+private:
+};

-        template <typename T>
-        void printValue(T);
-    private:
-    };
 }

 #endif
@@ -1 +0,0 @@
-cmake -H. -B_builds -DHUNTER_STATUS_DEBUG=ON -DCMAKE_BUILD_TYPE=DEBUG
@@ -1 +0,0 @@
-cmake --build _builds --config Debug
@@ -1 +0,0 @@
-cmake --build _builds --config Release
@@ -12,6 +12,11 @@ using std::string;
 using Managers::ActionManager;
 using Managers::CommitManager;

+constexpr static auto IcarusDownloadManager_version()
+{
+    return "v0.3.0";
+}
+
 void printHelp()
 {
    cout<<"icd [Action] [flag]\n\n";
@@ -19,6 +24,7 @@ void printHelp()
    cout<<"Actions\n";
    cout<<"download\n";
    cout<<"upload\n";
+    cout<<"upload-meta\n";
    cout<<"retrieve\n";
    cout<<"delete\n\n";

@@ -31,7 +37,15 @@ void printHelp()
    cout<<"Required for upload\n";
    cout<<"-s path of song\n";
    cout<<"-sd directory where to search for songs to upload (Optional)\n";
-    cout<<"-sr directory where to recursively search for songs to upload (Optional)\n\n";
+    cout<<"-sr directory where to recursively search for songs to upload (Optional)\n";
+    cout<<"-nc will not prompt the user when uploading from a directory\n\n";
+
+    cout<<"Required for upload with metadata\n";
+    cout<<"-s path of song\n";
+    cout<<"-t track number\n";
+    cout<<"-m metadata filepath\n";
+    cout<<"-ca coverart filepath\n";
+    cout<<"-scma directory where songs, metadata, and cover art exists and will be uploaded (Optional)\n\n";

    cout<<"Required for download\n";
    cout<<"-b song id\n";
@@ -50,13 +64,15 @@ int main(int argc, char** argv)
    if (argc < 2)
    {
        printHelp();
-        return 1;
+        return -1;
    }

-    ActionManager actMgr{argv, argc};
+    ActionManager actMgr(argv, argc);
    auto chosenAction = actMgr.retrieveIcarusAction();

-    CommitManager commitMgr{chosenAction};
+    chosenAction.print_action_and_flags();
+
+    CommitManager commitMgr(chosenAction);
    commitMgr.commitAction();

    return 0;
@@ -8,6 +8,7 @@
 using std::cout;
 using std::endl;
 using std::string;
+using std::string_view;
 using std::vector;

 using Models::Flags;
@@ -15,111 +16,103 @@ using Models::IcarusAction;

 namespace Managers
 {
-    #pragma
-    ActionManager::ActionManager(char **param, int paramCount) : 
-        params(std::move(param)), paramCount(paramCount)
+
+#pragma region Constructors
+ActionManager::ActionManager(char **param, int paramCount) : 
+    params(std::move(param)), paramCount(paramCount)
+{
+    initialize();
+}
+#pragma endregion
+
+
+#pragma region Functions
+IcarusAction ActionManager::retrieveIcarusAction() const
+{
+    IcarusAction icarusAction;
+    icarusAction.flags = flags;
+    icarusAction.action = action;
+
+    return icarusAction;
+}
+
+
+
+void ActionManager::initialize()
+{
+    validateFlags();
+
+    action = std::move(string{params[1]});
+    transform(action.begin(), action.end(),
+            action.begin(), ::tolower);
+}
+void ActionManager::validateFlags()
+{
+    cout<<"Validating flags\n";
+
+    const auto flagVals = parsedFlags();
+
+    for (auto flag = flagVals.begin(); flag != flagVals.end(); ++flag)
    {
-        initialize();
-    }
-    #pragma Constructors
+        Flags flg;
+        cout<<"Value: "<<*flag<<"\n";

-
-    #pragma
-    IcarusAction ActionManager::retrieveIcarusAction() const
-    {
-        auto icarusAction = IcarusAction{};
-        icarusAction.flags = flags;
-        icarusAction.action = action;
-
-        return icarusAction;
-    }
-
-    bool ActionManager::isNumber(string val)
-    {
-        return !val.empty() && std::find_if(val.begin(), 
-            val.end(), [](char c)
-            {
-                return !std::isdigit(c);
-                }) == val.end();
-    }
-
-    void ActionManager::initialize()
-    {
-        validateFlags();
-
-        action = std::move(string{params[1]});
-        transform(action.begin(), action.end(),
-                action.begin(), ::tolower);
-    }
-    void ActionManager::validateFlags()
-    {
-        cout<<"Validating flags"<<endl;
-
-        auto flagVals = parsedFlags();
-
-        Flags flg{};
-
-        for (auto flag : flagVals)
+        if (isValidFlag<string>(*flag) && doesFlagHaveValue<string>(*flag))
        {
-            if (flag.size() > 3 || isNumber(flag))
-            {
-                flg.value = flag;
-                //cout<<"flag value "<<flg.value<<endl;
-                flags.push_back(flg);
-                flg = Flags{};
-                continue;
-            }
-
-            if (std::any_of(supportedFlags.begin(), supportedFlags.end(), 
-                [&](string& val)
-                {
-                    return !val.compare(flag);
-                }))
-            {
-                //cout<<"flag "<<flag<<endl;
-                flg.flag = flag;
-            }
-            else
-            {
-                cout<<"Action is not valid"<<endl;
-                exit(1);
-            }
+            cout<<"Flag has value\n";
+            flg.flag = *flag;
+            flg.value = *(++flag);
        }
-    }
-
-    vector<string> ActionManager::parsedFlags()
-    {
-        auto parsed = vector<string>{};
-        
-        for (auto i = 2; i < paramCount; ++i)
+        else if (isValidFlag<string>(*flag))
        {
-            parsed.push_back(std::move(*(params + i)));
-        }
-
-        return parsed;
-    }
-
-    #pragma
-    void ActionManager::printAction()
-    {
-        if (action.empty())
-        {
-            printf("Action is empty\n");
+            cout<<"Flag does not have a value\n";
+            flg.flag = *flag;
        }
        else
        {
-            cout<<"Action is "<<action<<endl;
+            cout<<"Flag "<<*flag<<" is not valid"<<endl;
+            exit(1);
        }
+
+        flags.emplace_back(std::move(flg));
    }
-    void ActionManager::printFlags()
-    {
-        cout<<"\nPrinting flags..."<<endl;
-        for (auto flag: flags)
-        {
-            cout<<"flag "<<flag.flag<<endl;
-            cout<<"value "<<flag.value<<endl;
-        }
-    }
-    #pragma Testing
-    #pragma Functions
+}
+
+vector<string> ActionManager::parsedFlags()
+{
+    auto parsed = vector<string>();
+    
+    for (auto i = 2; i < paramCount; ++i)
+    {
+        const std::string flag(std::move(*(params + i)));
+        parsed.push_back(std::move(flag));
+    }
+
+    return parsed;
+}
+
+#pragma region Testing
+void ActionManager::printAction() noexcept
+{
+    if (action.empty())
+    {
+        printf("Action is empty\n");
+    }
+    else
+    {
+        cout<<"Action is "<<action<<endl;
+    }
+}
+void ActionManager::printFlags() noexcept
+{
+    cout<<"\nPrinting flags..."<<endl;
+    for (auto flag: flags)
+    {
+        cout<<"flag "<<flag.flag<<endl;
+        cout<<"value "<<flag.value<<endl;
+    }
+}
+#pragma endregion
+#pragma endregion
+
 }
@@ -1,18 +1,23 @@
 #include"Managers/CommitManager.h"

-#include<iostream>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <filesystem>

-#include"Models/API.h"
-#include"Models/Song.h"
-#include"Models/Token.h"
-#include"Parsers/APIParser.h"
-#include"Syncers/Delete.h"
-#include"Syncers/Download.h"
-#include"Syncers/RetrieveRecords.h"
-#include"Syncers/Upload.h"
+#include "nlohmann/json.hpp"

-#include"Managers/TokenManager.h"
-#include"Managers/UserManager.h"
+#include "Models/API.h"
+#include "Models/Song.h"
+#include "Models/Token.h"
+#include "Parsers/APIParser.h"
+#include "Syncers/Delete.h"
+#include "Syncers/Download.h"
+#include "Syncers/RetrieveRecords.h"
+#include "Syncers/Upload.h"
+
+#include "Managers/TokenManager.h"
+#include "Managers/UserManager.h"

 using std::cout;
 using std::endl;
@@ -31,175 +36,410 @@ using Syncers::Download;
 using Syncers::RetrieveRecords;
 using Syncers::Upload;

+namespace filesystem = std::filesystem;
+
 namespace Managers
 {
-	#pragma
-	CommitManager::CommitManager(IcarusAction& icaAct) : icaAction(std::move(icaAct))
-	{ }
-	#pragma Constructors;
+
+#pragma region Constructors
+CommitManager::CommitManager(IcarusAction& icaAct) : icaAction(std::move(icaAct))
+{ }
+#pragma endregion


-	#pragma
-	void CommitManager::commitAction()
-	{
-		auto action = icaAction.action;
-		cout<<"Commiting "<<action<<" action"<<endl;
-		switch (mapActions[action])
-		{
-			case deleteAct:
-				deleteSong();
-				break;
-			case downloadAct:
-				downloadSong();
-				break;
-			case retrieveAct:
-                retrieveObjects();
-				break;
-			case uploadAct:
-				uploadSong();
-				break;
-		}
-	}
+#pragma region Functions
+void CommitManager::commitAction()
+{
+    auto action = icaAction.action;
+    cout<<"Commiting "<<action<<" action"<<endl;

-    Token CommitManager::parseToken(API api)
+    switch (mapActions()[action])
    {
-        cout<<"fetching token"<<endl;
-		UserManager usrMgr{icaAction};
-		auto user = usrMgr.retrieveUser();
-
-		TokenManager tk{user, api};
-        
-        return tk.requestToken();
+        case ActionValues::deleteAct:
+            deleteSong();
+            break;
+        case ActionValues::downloadAct:
+            downloadSong();
+            break;
+        case ActionValues::retrieveAct:
+            retrieveObjects();
+            break;
+        case ActionValues::uploadAct:
+            uploadSong();
+            break;
+        case ActionValues::UPLOAD_SONG_WITH_METADATA:
+            uploadSongWithMetadata();
+            break;
+        default:
+            break;
    }
-
-	void CommitManager::deleteSong()
-	{
-		APIParser apiPrs{icaAction};
-		auto api = apiPrs.retrieveAPI();
-
-		auto token = parseToken(api);
-
-		Song song{};
-
-		for (auto arg : icaAction.flags)
-		{
-			auto flag = arg.flag;
-			auto value = arg.value;
-
-			if (flag.compare("-D") == 0)
-			{
-				song.id = atoi(value.c_str());
-			}
-		}
-
-		Delete del{api};
-		cout<<"Deleting song..."<<endl;
-		del.deleteSong(token, song);
-	}
-	void CommitManager::downloadSong()
-	{
-		cout<<"Starting downloading process..."<<endl;
-
-		APIParser apiPrs{icaAction};
-		auto api = apiPrs.retrieveAPI();
-
-		auto token = parseToken(api);
-
-		Song song{};
-
-		for (auto arg : icaAction.flags)
-		{
-			auto flag = arg.flag;
-			auto value = arg.value;
-
-			if (flag.compare("-d") == 0)
-			{
-				song.songPath.assign(arg.value);
-			}
-			if (flag.compare("-b") == 0)
-			{
-				song.id = atoi(value.c_str());
-			}
-		}
-
-		Download dnld{api};
-        cout<<"downloading song"<<endl;
-		dnld.downloadSong(token, song);
-	}
-    void CommitManager::retrieveObjects()
-    {
-        cout<<"Starting retrieve process..."<<endl;
-        
-        APIParser apiPrs{icaAction};
-        auto api = apiPrs.retrieveAPI();
-
-        auto token = parseToken(api);
-        RetrieveTypes retrieveType;
-
-        for (auto arg : icaAction.flags)
-        {
-            auto flag = arg.flag;
-            auto value = arg.value;
-
-            if (flag.compare("-rt") == 0)
-            {
-                if (value.compare("songs") == 0)
-                {
-                    retrieveType = RetrieveTypes::songs;
-                    break;
-                }
-            }
-        }
-
-        RetrieveRecords songs{api, token};
-        songs.retrieve(retrieveType);
-
-    }
-	void CommitManager::uploadSong()
-	{
-        bool uploadSingleSong = true;
-        bool recursiveDirectory = false;
-        string songDirectory;
-		APIParser apiPrs{icaAction};
-		auto api = apiPrs.retrieveAPI();
-
-		auto token = parseToken(api);
-
-		Song song;
-
-		for (auto& arg : icaAction.flags)
-		{
-			auto flag = arg.flag;
-			auto value = arg.value;
-
-			if (flag.compare("-s") == 0)
-			{
-				song.songPath.assign(arg.value);
-			}
-            else if (flag.compare("-sd") == 0)
-            {
-                songDirectory = value;
-                uploadSingleSong = false;
-            } 
-            else if (flag.compare("-sr") == 0)
-            {
-                songDirectory = value;
-                uploadSingleSong = false;
-                recursiveDirectory = true;
-            }
-		}
-
-		Upload upld{api};
-        if (uploadSingleSong)
-        {
-		    cout<<"Uploading song..."<<endl;
-		    upld.uploadSong(token, song);
-        }
-        else
-        {
-            cout<<"Uploading songs from " << songDirectory << endl;
-            upld.uploadSongsFromDirectory(token, songDirectory, recursiveDirectory);
-        }
-	}
-	#pragma Functions
+}
+
+
+
+
+
+
+std::map<std::string, CommitManager::ActionValues> 
+    CommitManager::mapActions() noexcept
+{
+    const std::map<std::string, ActionValues> actions{
+        {"delete", ActionValues::deleteAct},
+        {"download", ActionValues::downloadAct},
+        {"retrieve", ActionValues::retrieveAct},
+        {"upload", ActionValues::uploadAct},
+        {"upload-meta", ActionValues::UPLOAD_SONG_WITH_METADATA}
+    };
+
+    return actions;
+}
+
+
+
+
+Token CommitManager::parseToken(API api)
+{
+    cout<<"fetching token\n";
+    UserManager usrMgr{icaAction};
+    auto user = usrMgr.retrieveUser();
+
+    TokenManager tk{user, api};
+    
+    return tk.requestToken();
+}
+
+void CommitManager::deleteSong()
+{
+    APIParser apiPrs{icaAction};
+    auto api = apiPrs.retrieveAPI();
+
+    auto token = parseToken(api);
+
+    Song song{};
+
+    for (auto arg : icaAction.flags)
+    {
+        auto flag = arg.flag;
+        auto value = arg.value;
+
+        if (flag.compare("-D") == 0)
+        {
+            song.id = atoi(value.c_str());
+        }
+    }
+
+    Delete del{api};
+    cout<<"Deleting song..."<<endl;
+    del.deleteSong(token, song);
+}
+void CommitManager::downloadSong()
+{
+    cout<<"Starting downloading process..."<<endl;
+
+    APIParser apiPrs{icaAction};
+    auto api = apiPrs.retrieveAPI();
+
+    auto token = parseToken(api);
+
+    Song song{};
+
+    for (auto arg : icaAction.flags)
+    {
+        auto flag = arg.flag;
+        auto value = arg.value;
+
+        if (flag.compare("-d") == 0)
+        {
+            song.songPath.assign(arg.value);
+        }
+        if (flag.compare("-b") == 0)
+        {
+            song.id = atoi(value.c_str());
+        }
+    }
+
+    Download dnld{api};
+    cout<<"downloading song"<<endl;
+    dnld.downloadSong(token, song);
+}
+void CommitManager::retrieveObjects()
+{
+    cout<<"Starting retrieve process..."<<endl;
+    
+    APIParser apiPrs{icaAction};
+    auto api = apiPrs.retrieveAPI();
+
+    auto token = parseToken(api);
+    RetrieveTypes retrieveType;
+
+    for (auto arg : icaAction.flags)
+    {
+        auto flag = arg.flag;
+        auto value = arg.value;
+
+        if (flag.compare("-rt") == 0)
+        {
+            if (value.compare("songs") == 0)
+            {
+                retrieveType = RetrieveTypes::songs;
+                break;
+            }
+        }
+    }
+
+    RetrieveRecords songs{api, token};
+    songs.retrieve(retrieveType);
+
+}
+
+void CommitManager::uploadSong()
+{
+    auto uploadSingleSong = true;
+    auto recursiveDirectory = false;
+    const auto noConfirm = checkForNoConfirm();
+    string songDirectory;
+    APIParser apiPrs{icaAction};
+    auto api = apiPrs.retrieveAPI();
+
+    auto token = parseToken(api);
+
+    Song song;
+
+    for (auto& arg : icaAction.flags)
+    {
+        auto flag = arg.flag;
+        auto value = arg.value;
+
+        if (flag.compare("-s") == 0)
+        {
+            song.songPath.assign(arg.value);
+        }
+        else if (flag.compare("-sd") == 0)
+        {
+            songDirectory = value;
+            uploadSingleSong = false;
+        } 
+        else if (flag.compare("-sr") == 0)
+        {
+            songDirectory = value;
+            uploadSingleSong = false;
+            recursiveDirectory = true;
+        }
+    }
+
+    Upload upld{api, token};
+    if (uploadSingleSong)
+    {
+        cout<<"Uploading song..."<<endl;
+        upld.uploadSong(song);
+    }
+    else
+    {
+        cout<<"Uploading songs from " << songDirectory << endl;
+        upld.uploadSongsFromDirectory(songDirectory, noConfirm, recursiveDirectory);
+    }
+}
+
+
+
+void CommitManager::uploadSongWithMetadata()
+{
+    cout<<"Uploading single song with metadata\n\n";
+
+    // Either the set of "-s", "-m", "-ca", "-t" flags or "-smca" must exist with values
+    // in order to be valid but not both
+    const auto songPath = this->icaAction.retrieveFlagValue("-s");
+    const auto metadataPath = this->icaAction.retrieveFlagValue("-m");
+    const auto coverPath = this->icaAction.retrieveFlagValue("-ca");
+    const auto trackID = this->icaAction.retrieveFlagValue("-t");
+    const auto singleTarget = !songPath.empty() && !metadataPath.empty() && 
+        !coverPath.empty() && !trackID.empty() ? true : false;
+
+    const auto uni = this->icaAction.retrieveFlagValue("-smca");
+    const auto multiTarget = !uni.empty() ? true : false;
+
+    if (singleTarget && multiTarget)
+    {
+        cout<<"Cannot upload from source and directory\n";
+        return;
+    }
+
+    cout<<"Song path: "<<songPath<<"\n";
+    cout<<"TrackID: "<<trackID<<"\n";
+    cout<<"Metadata path: "<<metadataPath<<"\n";
+    cout<<"Cover Art path: "<<coverPath<<"\n";
+
+    if (singleTarget)
+    {
+        singTargetUpload(songPath, trackID, metadataPath, coverPath);
+    }
+    else if (multiTarget)
+    {
+        multiTargetUpload(uni);
+    }
+}
+
+
+void CommitManager::singTargetUpload(const std::string &songPath, const std::string &trackID, 
+    const std::string &metaPath, const std::string &coverPath)
+{
+    APIParser apiPrs(icaAction);
+    auto api = apiPrs.retrieveAPI();
+    const auto token = parseToken(api);
+
+    auto album = retrieveMetadata(metaPath);
+    album.printInfo();
+
+    Song song;
+    song.track = 1;
+    song.disc = 1;
+
+    cout<<"TrackID: "<<trackID<<"\n";
+
+    parseDiscAndTrack<Song, std::string>(song, trackID);
+
+    auto c = [](const Song &songA, const Song &songB) { return songA.track == songB.track && songA.disc == songB.disc; };
+    auto sng = Utilities::Checks::itemIterInContainer<Song, std::vector<Song>>(album.songs, song, c);
+
+    if (sng == album.songs.end())
+    {
+        cout<<"Not found with disc "<<song.disc<<" track "<<song.track<<"\n";
+        std::exit(-1);
+    }
+
+    song = *sng;
+    const auto p = filesystem::path(songPath);
+    song.directory = p.parent_path().string();
+    song.generate_filename_from_track();
+
+    Models::CoverArt cover;
+    cover.title = song.title;
+    cover.path = coverPath;
+
+    Upload up(api, token);
+    up.uploadSongWithMetadata(album, song, cover);
+}
+
+void CommitManager::multiTargetUpload(const std::string &sourcePath)
+{
+    APIParser apiPrs(icaAction);
+    auto api = apiPrs.retrieveAPI();
+    const auto token = parseToken(api);
+
+    if (!fs::is_directory(sourcePath))
+    {
+        cout<<sourcePath<<" is not a directory\n";
+        std::exit(-1);
+    }
+
+    std::vector<Song> songs;
+    Models::CoverArt cover;
+    string metadataPath;
+
+    for (auto &p: fs::directory_iterator(sourcePath))
+    {
+        const auto &pp = p.path();
+        const auto stem = pp.stem();
+        const auto file = pp.filename();
+        const auto extension = pp.extension();
+
+        cout<<"Stem "<<stem<<" Extension "<<extension<<"\n";
+
+        if (extension.compare(".mp3") == 0)
+        {
+            Song song;
+            song.songPath = pp.string();
+
+            initializeDiscAndTrack<Song, std::string>(song);
+
+            songs.emplace_back(std::move(song));
+        }
+        else if (extension.compare(".jpg") == 0 || extension.compare(".png") == 0)
+        {
+            cover.path.assign(pp.string());
+        }
+        else if (extension.compare(".json") == 0)
+        {
+            metadataPath.assign(pp.string());
+        }
+    }
+
+    auto album = retrieveMetadata(metadataPath);
+    songs.clear();
+    songs.assign(album.songs.begin(), album.songs.end());
+
+    Upload up(api, token);
+
+    for (auto &song : songs)
+    {
+        up.uploadSongWithMetadata(album, song, cover);
+    }
+}
+
+#pragma region private
+CommitManager::Album CommitManager::retrieveMetadata(const std::string_view path)
+{
+    CommitManager::Album album;
+    const auto fileContent = retrieveFileContent(path);
+    cout<<"Parsing...\n";
+    auto serialized = nlohmann::json::parse(fileContent);
+    cout<<"Parsed\n";
+
+    album.album = serialized["album"].get<std::string>();
+    album.albumArtist = serialized["album_artist"].get<std::string>();
+    album.genre = serialized["genre"].get<std::string>();
+    album.year = serialized["year"].get<int>();
+    album.trackCount = serialized["track_count"].get<int>();
+    album.discCount = serialized["disc_count"].get<int>();
+    album.songs.reserve(album.trackCount);
+
+    for (auto &j : serialized["tracks"])
+    {
+        Song song;
+        song.title = j["title"].get<std::string>();
+        song.track = j["track"].get<int>();
+        song.disc = j["disc"].get<int>();
+        song.artist = j["artist"].get<std::string>();
+        song.album = album.album;
+        song.year = album.year;
+        song.genre = album.genre;
+        song.generate_filename_from_track();
+        const auto p = fs::path(path);
+        song.directory = p.parent_path().string();
+
+        album.songs.push_back(song);
+    }
+
+    return album;
+}
+
+string CommitManager::retrieveFileContent(const std::string_view path)
+{
+    string path_str(path);
+    string value;
+
+    std::stringstream buffer;
+    std::fstream file(path_str, std::ios::in);
+    buffer<<file.rdbuf();
+    file.close();
+
+    value.assign(buffer.str());
+
+    return value;
+}
+#pragma endregion
+
+void CommitManager::Album::printInfo()
+{
+    std::cout<<"Album: "<<this->album<<"\n";
+    std::cout<<"Album Artist: "<<this->albumArtist<<"\n";
+    std::cout<<"Genre: "<<this->genre<<"\n";
+    std::cout<<"Year: "<<this->year<<"\n";
+    std::cout<<"Track count: "<<this->trackCount<<"\n";
+    std::cout<<"Disc count: "<<this->discCount<<"\n";
+    std::cout<<"\n";
+}
+
+#pragma region Functions
+
 }
@@ -11,56 +11,63 @@ using std::string;

 namespace Managers
 {
-    FileManager::FileManager() {}
-    FileManager::FileManager(string filePath)
-    {
-        this->filePath = filePath;
+
+#pragma region Constructors
+FileManager::FileManager() {}
+FileManager::FileManager(string filePath)
+{
+    this->filePath = filePath;
+    readFile();
+}   
+#pragma endregion
+
+
+#pragma region Functions
+void FileManager::saveFile(string newFilePath)
+{
+    if (!fileRead)
        readFile();
-    }   

-
-    void FileManager::saveFile(string newFilePath)
-    {
-        if (!fileRead)
-            readFile();
-
-        ofstream of{newFilePath, ofstream::binary};
-        of.write(fileBuffer, fileBufferLength);
-        of.close();
-    }
-
-    void FileManager::readFile()
-    {
-        ifstream is{filePath, ifstream::binary};
-        if (is)
-        {
-            is.seekg (0, is.end);
-            fileBufferLength = is.tellg();
-            is.seekg (0, is.beg);
-
-            fileBuffer = new char [fileBufferLength];
-
-            cout<< "Reading "<<fileBufferLength<<" characters... "<<endl;;
-            is.read (fileBuffer,fileBufferLength);
-
-            if (is)
-                cout<<"all characters read successfully.";
-            else
-                cout<<"error: only "<<is.gcount()<<" could be read";
-            cout<<endl;
-            is.close();
-            fileRead = true;
-        }
-    }
-    void FileManager::modifyFilePath(string filePath)
-    {
-        this->filePath = filePath;
-    }
-
-    char* FileManager::retrieveFileBuffer() const
-    {
-        return fileBuffer;
-    }
-
-    int FileManager::retrieveFileBufferLength() const { return fileBufferLength; }
+    ofstream of{newFilePath, ofstream::binary};
+    of.write(fileBuffer, fileBufferLength);
+    of.close();
+}
+
+void FileManager::readFile()
+{
+    ifstream is{filePath, ifstream::binary};
+    if (is)
+    {
+        is.seekg (0, is.end);
+        fileBufferLength = is.tellg();
+        is.seekg (0, is.beg);
+
+        fileBuffer = new char [fileBufferLength];
+
+        cout<< "Reading "<<fileBufferLength<<" characters... "<<endl;;
+        is.read (fileBuffer,fileBufferLength);
+
+        if (is)
+            cout<<"all characters read successfully.";
+        else
+            cout<<"error: only "<<is.gcount()<<" could be read";
+        cout<<endl;
+        is.close();
+        fileRead = true;
+    }
+}
+void FileManager::modifyFilePath(string filePath)
+{
+    this->filePath = filePath;
+}
+
+char* FileManager::retrieveFileBuffer() const
+{
+    return fileBuffer;
+}
+
+int FileManager::retrieveFileBufferLength() const { return fileBufferLength; }
+
+#pragma endregion
+
 }
@@ -17,44 +17,46 @@ using Models::User;

 namespace Managers
 {
-    #pragma
-    TokenManager::TokenManager(const User& user)
-    {
-        this->user = user;
-    }
-    TokenManager::TokenManager(const User& user, API& api)
-    {
-        this->user = user;
-        this->api = api;
-        this->api.endpoint = "api/" + api.version 
-            + "/login";
-    }
-    #pragma Constructors

-
-    #pragma
-    Token TokenManager::requestToken()
-    {
-        Token token{};
-        json usrObj;
-
-        usrObj["username"] = user.username;
-        usrObj["password"] = user.password;
-
-        cout<<"Sending request for token"<<endl;
-        auto url = api.url + api.endpoint;
-        cout<<url<<endl;
-        auto r = cpr::Post(cpr::Url{url},
-                cpr::Body{usrObj.dump()},
-           cpr::Header{{"Content-Type", "application/json"}});
-
-        json res = json::parse(r.text);
-        token.accessToken = res["token"];
-        token.tokenType = res["token_type"];
-
-        cout<<"status code "<<r.status_code<<endl;
-
-        return token;
-    }
-    #pragma Functions
+#pragma region Constructors
+TokenManager::TokenManager(const User& user)
+{
+    this->user = user;
+}
+TokenManager::TokenManager(const User& user, API& api)
+{
+    this->user = user;
+    this->api = api;
+    this->api.endpoint = "api/" + api.version 
+        + "/login";
+}
+#pragma endregion
+
+
+#pragma region Functions
+Token TokenManager::requestToken()
+{
+    Token token{};
+    json usrObj;
+
+    usrObj["username"] = user.username;
+    usrObj["password"] = user.password;
+
+    cout<<"Sending request for token"<<endl;
+    auto url = api.url + api.endpoint;
+    cout<<url<<endl;
+    auto r = cpr::Post(cpr::Url{url},
+            cpr::Body{usrObj.dump()},
+       cpr::Header{{"Content-Type", "application/json"}});
+
+    json res = json::parse(r.text);
+    token.accessToken = res["token"];
+    token.tokenType = res["token_type"];
+
+    cout<<"status code "<<r.status_code<<endl;
+
+    return token;
+}
+#pragma endregion
+
 }
@@ -12,42 +12,44 @@ using Models::User;

 namespace Managers
 {
-    #pragma
-    UserManager::UserManager(User user)
-    {
-        this->user = user;
-    }
-    UserManager::UserManager(const IcarusAction icaAct)
-    {
-        this->icaAction = icaAct;
-        this->user = User{};
-        parseUserFromActions();
-    }
-    #pragma Constructors
+
+#pragma region Constructors
+UserManager::UserManager(User user)
+{
+    this->user = user;
+}
+UserManager::UserManager(const IcarusAction icaAct)
+{
+    this->icaAction = icaAct;
+    this->user = User{};
+    parseUserFromActions();
+}
+#pragma endregion


-    #pragma
-    User UserManager::retrieveUser() const
-    {
-        return user;
-    }
+#pragma region Functions
+User UserManager::retrieveUser() const
+{
+    return user;
+}

-    void UserManager::parseUserFromActions()
-    {
-        auto args = icaAction.flags;
+void UserManager::parseUserFromActions()
+{
+    auto args = icaAction.flags;

-        for (auto arg : args)
+    for (auto arg : args)
+    {
+        auto flag = arg.flag;
+        if (flag.compare("-u") == 0)
        {
-            auto flag = arg.flag;
-            if (flag.compare("-u") == 0)
-            {
-                user.username = arg.value;
-            }
-            if (flag.compare("-p") == 0)
-            {
-                user.password = arg.value;
-            }
+            user.username = arg.value;
+        }
+        if (flag.compare("-p") == 0)
+        {
+            user.password = arg.value;
        }
    }
-    #pragma Functions
+}
+#pragma endregion
+
 }
@@ -0,0 +1,22 @@
+#include "Models/Song.h"
+
+#include "nlohmann/json.hpp"
+
+using std::string;
+
+namespace Models
+{
+    string Song::toMetadataJson()
+    {
+        nlohmann::json s;
+        s["title"] = this->title;
+        s["artist"] = this->artist;
+        s["album"] = this->album;
+        s["genre"] = this->genre;
+        s["year"] = this->year;
+        s["track"] = this->track;
+        s["disc"] = this->disc;
+
+        return s.dump();
+    }
+}
@@ -1,6 +1,6 @@
-#include"Parsers/APIParser.h"
+#include "Parsers/APIParser.h"

-#include<iostream>
+#include <iostream>

 using std::cout;
 using std::endl;
@@ -10,43 +10,44 @@ using Models::IcarusAction;

 namespace Parsers
 {
-    #pragma
-    APIParser::APIParser(IcarusAction icaAct) : icaAct(icaAct)
-    {
-        api = API{};
-        parseAPI();
-    }
-    #pragma endregion

-
-    #pragma
-    API APIParser::retrieveAPI() const
-    {
-        return api;
-    }
-
-    void APIParser::parseAPI()
-    {
-        auto flags = icaAct.flags;
-        cout<<"Parsing api"<<endl;
-
-        for (auto i =0; i < flags.size(); ++i)
-        {
-            auto arg = flags[i].flag;
-            auto value = flags[i].value;
-
-            if (arg.compare("-h") == 0)
-            {
-                api.url = (value[value.size()-1] == '/') ? value : value + "/";
-                break;
-            }
-
-        }
-
-        // TODO: For now I will hard code
-        // the api version since I am only
-        // on version 1
-        api.version = "v1";
-    }
-    #pragma functions
+#pragma region Constructors
+APIParser::APIParser(IcarusAction icaAct) : icaAct(icaAct)
+{
+    api = API{};
+    parseAPI();
+}
+#pragma endregion
+
+
+#pragma region Functions
+API APIParser::retrieveAPI() const
+{
+    return api;
+}
+
+void APIParser::parseAPI()
+{
+    auto flags = icaAct.flags;
+    cout << "Parsing api" << endl;
+
+    for (auto i =0; i < flags.size(); ++i)
+    {
+        auto arg = flags[i].flag;
+        auto value = flags[i].value;
+
+        if (arg.compare("-h") == 0)
+        {
+            api.url = (value[value.size()-1] == '/') ? value : value + "/";
+            break;
+        }
+    }
+
+    // TODO: For now I will hard code
+    // the api version since I am only
+    // on version 1
+    api.version = "v1";
+}
+#pragma endregion
+
 }
@@ -1,9 +1,9 @@
-#include"Syncers/Delete.h"
+#include "Syncers/Delete.h"

-#include<exception>
-#include<iostream>
+#include <exception>
+#include <iostream>

-#include<cpr/cpr.h>
+#include <cpr/cpr.h>

 using std::cout;
 using std::endl;
@@ -16,47 +16,49 @@ using Models::Token;

 namespace Syncers
 {
-    #pragma
-    Delete::Delete(API api)
-    {
-        this->api = api;
-        this->api.endpoint = "song/data";
-    }
-    #pragma Constructors

-
-    #pragma
-    void Delete::deleteSong(const Token token, Song song)
-    {
-        try
-        {
-            auto url = retrieveUrl(song);
-            string auth{token.tokenType};
-            auth.append(" " + token.accessToken);
-            auto r = cpr::Delete(cpr::Url(url),
-                cpr::Header{{"authorization", auth}});
-
-            auto statusCode = r.status_code;
-
-            cout<<"Status code "<<statusCode<<endl;
-        }
-        catch (exception e)
-        {
-            auto msg = e.what();
-            cout<<msg<<endl;
-        }
-        cout<<"Finished"<<endl;
-    }
-
-    string Delete::retrieveUrl(Song song)
-    {
-        string url{api.url + "api/" + api.version + "/" +
-            api.endpoint + "/"};
-
-        url.append(std::to_string(song.id));
-        cout<<"url "<<url<<endl;
-
-        return url;
-    }
-    #pragma Functions
+#pragma region Constructors
+Delete::Delete(API api)
+{
+    this->api = api;
+    this->api.endpoint = "song/data";
+}
+#pragma endregion
+
+
+#pragma region Functions
+void Delete::deleteSong(const Token token, Song song)
+{
+    try
+    {
+        auto url = retrieveUrl(song);
+        string auth{token.tokenType};
+        auth.append(" " + token.accessToken);
+        auto r = cpr::Delete(cpr::Url(url),
+            cpr::Header{{"authorization", auth}});
+
+        auto statusCode = r.status_code;
+
+        cout<<"Status code "<<statusCode<<endl;
+    }
+    catch (exception e)
+    {
+        auto msg = e.what();
+        cout<<msg<<endl;
+    }
+    cout<<"Finished"<<endl;
+}
+
+string Delete::retrieveUrl(Song song)
+{
+    string url{api.url + "api/" + api.version + "/" +
+        api.endpoint + "/"};
+
+    url.append(std::to_string(song.id));
+    cout<<"url "<<url<<endl;
+
+    return url;
+}
+#pragma endregion
+
 }
@@ -1,10 +1,10 @@
-#include"Syncers/Download.h"
+#include "Syncers/Download.h"

-#include<exception>
-#include<iostream>
-#include<fstream>
+#include <exception>
+#include <iostream>
+#include <fstream>

-#include<cpr/cpr.h>
+#include <cpr/cpr.h>

 using std::cout;
 using std::endl;
@@ -18,74 +18,76 @@ using Models::Token;

 namespace Syncers
 {
-    #pragma
-    Download::Download() { }
-    Download::Download(API api)
-    {
-        this->api = api;
-        this->api.endpoint = "song/data";
-    }
-    Download::Download(string filePath)
-    {
-        downloadFilePath = filePath;
-    }
-    #pragma Constructors

-
-    #pragma
-    void Download::downloadSong(const Token token, Song song)
-    {
-        try
-        {
-            string url = retrieveUrl(song);
-            song.songPath.append("track.mp3");
-            cout<<"song path "<<song.songPath<<endl;
-            string auth{token.tokenType};
-            auth.append(" " + token.accessToken);
-            
-            auto r = cpr::Get(cpr::Url(url),
-                    cpr::Header{{"Content-type", "audio/mpeg"},
-                                {"Authorization", auth}});
-                
-
-            int statusCode = r.status_code;
-
-            if (statusCode == OK) {
-                song.data = r.text;
-                saveSong(song);
-            }
-
-
-            cout<<"finsihed with status code "<<statusCode<<endl;
-        }
-        catch (exception e)
-        {
-            auto msg = e.what();
-            cout<<msg<<endl;
-        }
-    }
-
-    string Download::retrieveUrl(Song song)
-    {
-        string url{api.url + "api/" + api.version + "/" + 
-            api.endpoint + "/"};
-
-        url.append(std::to_string(song.id));
-        cout<<"url "<<url<<endl;
-
-        return url;
-    }
-
-    void Download::saveSong(Song& song)
-    {
-        cout<<"\nSaving song to: "<<song.songPath<<endl;
-        int bufferLength = song.data.length();
-        const char *data = song.data.c_str();
-        cout<<"buff length  "<<bufferLength<<endl;
-
-        ofstream saveSong{song.songPath, std::ios::binary};
-        saveSong.write(data, bufferLength);
-        saveSong.close();
-    }
-    #pragma Functions
+#pragma region Constructors
+Download::Download() { }
+Download::Download(API api)
+{
+    this->api = api;
+    this->api.endpoint = "song/data";
+}
+Download::Download(string filePath)
+{
+    downloadFilePath = filePath;
+}
+#pragma endregion
+
+
+#pragma region Functions
+void Download::downloadSong(const Token token, Song song)
+{
+    try
+    {
+        string url = retrieveUrl(song);
+        song.songPath.append("track.mp3");
+        cout<<"song path "<<song.songPath<<endl;
+        string auth{token.tokenType};
+        auth.append(" " + token.accessToken);
+        
+        auto r = cpr::Get(cpr::Url(url),
+                cpr::Header{{"Content-type", "audio/mpeg"},
+                            {"Authorization", auth}});
+            
+
+        int statusCode = r.status_code;
+
+        if (statusCode == OK) {
+            song.data = r.text;
+            saveSong(song);
+        }
+
+
+        cout<<"finsihed with status code "<<statusCode<<endl;
+    }
+    catch (exception e)
+    {
+        auto msg = e.what();
+        cout<<msg<<endl;
+    }
+}
+
+string Download::retrieveUrl(Song song)
+{
+    string url{api.url + "api/" + api.version + "/" + 
+        api.endpoint + "/"};
+
+    url.append(std::to_string(song.id));
+    cout<<"url "<<url<<endl;
+
+    return url;
+}
+
+void Download::saveSong(Song& song)
+{
+    cout<<"\nSaving song to: "<<song.songPath<<endl;
+    int bufferLength = song.data.length();
+    const char *data = song.data.c_str();
+    cout<<"buff length  "<<bufferLength<<endl;
+
+    ofstream saveSong{song.songPath, std::ios::binary};
+    saveSong.write(data, bufferLength);
+    saveSong.close();
+}
+#pragma endregion
+
 }
@@ -20,43 +20,48 @@ using Utilities::Conversions;
 namespace Syncers
 {

-    RetrieveRecords::RetrieveRecords() { }
-    RetrieveRecords::RetrieveRecords(API api, Token token) 
-        : token(token), api(api) { }
+#pragma region Constructors
+RetrieveRecords::RetrieveRecords() { }
+RetrieveRecords::RetrieveRecords(API api, Token token) 
+    : token(token), api(api) { }
+#pragma endregion

-    void RetrieveRecords::retrieve(CommitManager::RetrieveTypes type)
+#pragma region Functions
+void RetrieveRecords::retrieve(CommitManager::RetrieveTypes type)
+{
+    switch (type)
    {
-        switch (type)
-        {
-            case CommitManager::RetrieveTypes::songs:
-                fetchSongs();
-                break;
-            default:
-                break;
-        }
-    }
-    void RetrieveRecords::fetchSongs()
-    {
-        cout<<"fetching songs"<<endl;
-        auto url = api.url + "api/" + api.version + "/" + "song";
-
-        auto auth = token.tokenType;
-        auth.append(" " + token.accessToken);
-        auto r = cpr::Get(cpr::Url{url},
-             cpr::Header{{"authorization", auth},
-                 });
-
-        if (r.status_code != (int)Result::OK) {
-            cout<<"something went wrong\n";
-            cout<<"status code: "<<r.status_code<<endl;
-            cout<<"message: "<<r.text<<endl;
-            return;
-        }
-        auto songData = nlohmann::json::parse(r.text);
-
-        ofstream writeData{};
-        writeData.open("songs.json");
-        writeData<<songData.dump(4);
-        writeData.close();
+        case CommitManager::RetrieveTypes::songs:
+            fetchSongs();
+            break;
+        default:
+            break;
    }
 }
+void RetrieveRecords::fetchSongs()
+{
+    cout<<"fetching songs"<<endl;
+    auto url = api.url + "api/" + api.version + "/" + "song";
+
+    auto auth = token.tokenType;
+    auth.append(" " + token.accessToken);
+    auto r = cpr::Get(cpr::Url{url},
+         cpr::Header{{"authorization", auth},
+             });
+
+    if (r.status_code != (int)Result::OK) {
+        cout<<"something went wrong\n";
+        cout<<"status code: "<<r.status_code<<endl;
+        cout<<"message: "<<r.text<<endl;
+        return;
+    }
+    auto songData = nlohmann::json::parse(r.text);
+
+    ofstream writeData{};
+    writeData.open("songs.json");
+    writeData<<songData.dump(4);
+    writeData.close();
+}
+#pragma endregion
+
+}
@@ -1,13 +1,14 @@
-#include<iostream>
-#include<filesystem>
-#include<exception>
+#include <iostream>
+#include <filesystem>
+#include <exception>

-#include<cpr/cpr.h>
-#include<nlohmann/json.hpp>
+#include "cpr/cpr.h"

-#include"Syncers/Upload.h"
+#include "Syncers/Upload.h"
+#include "Utilities/Conversions.h"

 using std::cout;
+using std::cin;
 using std::endl;
 using std::exception;
 using std::string;
@@ -23,126 +24,192 @@ using namespace cpr;

 namespace Syncers
 {
-    Upload::Upload() { }
-    Upload::Upload(API api) : api(api)
+
+#pragma region Constructors
+#pragma endregion
+
+
+#pragma region Functions
+Song Upload::uploadSong(Song& song)
+{
+    try
    {
-        this->api.endpoint = "song/data";
-    }
+        auto url = retrieveUrl();

+        cout<<"url "<<url<<endl;
+        string auth{this->m_token.tokenType};
+        auth.append(" " + this->m_token.accessToken);
+        auto r = cpr::Post(cpr::Url{url},
+                    cpr::Multipart{{"key", "small value"},
+                            {"file", cpr::File{song.songPath}}},
+            cpr::Header{{"authorization", auth}}
+            );

-    Song Upload::uploadSong(const Models::Token& token, Song& song)
-    {
-        try
-        {
-            auto url = retrieveUrl();
-
-            cout<<"url "<<url<<endl;
-            string auth{token.tokenType};
-            auth.append(" " + token.accessToken);
-            auto r = cpr::Post(cpr::Url{url},
-                        cpr::Multipart{{"key", "small value"},
-                                {"file", cpr::File{song.songPath}}},
-                cpr::Header{{"authorization", auth}}
-                );
-
-            cout << "status code: " << r.status_code<< std::endl;
-            auto result = nlohmann::json::parse(r.text);
-            cout<<"Finished"<<endl;
-            song.id = result["id"].get<int>();
-            song.title = result["title"].get<std::string>();
-            song.artist = result["artist"].get<std::string>();
-            song.album = result["album"].get<std::string>();
-            song.genre = result["genre"].get<std::string>();
-            song.year = result["year"].get<int>();
-            song.duration = result["duration"].get<int>();
-            song.track = result["track"].get<int>();
-
-            return song;
-        }
-        catch (exception e)
-        {
-            auto msg = e.what();
-            cout<<msg<<endl;
-        }
+        cout << "status code: " << r.status_code<< std::endl;
+        cout << r.text << endl;
+        auto result = nlohmann::json::parse(r.text);
+        cout<<"Finished"<<endl;
+        song.id = result["id"].get<int>();
+        song.title = result["title"].get<std::string>();
+        song.artist = result["artist"].get<std::string>();
+        song.album = result["album"].get<std::string>();
+        song.genre = result["genre"].get<std::string>();
+        song.year = result["year"].get<int>();
+        song.duration = result["duration"].get<int>();
+        song.track = result["track"].get<int>();

        return song;
    }
-
-    void Upload::uploadSongsFromDirectory(const Models::Token& token, 
-        const std::string& directory, 
-        bool recursive = false)
+    catch (exception& e)
    {
-        try
+        auto msg = e.what();
+        cout<<msg<<endl;
+    }
+    
+    return song;
+}
+
+void Upload::uploadSongsFromDirectory(const std::string& directory, 
+    const bool noConfirm, bool recursive = false)
+{
+    try
+    {
+        auto songs = retrieveAllSongsFromDirectory(directory, recursive);
+        auto confirmUpload = true;
+
+        while (!noConfirm) 
        {
-            auto songs = retrieveAllSongsFromDirectory(directory, recursive);
-            for (auto& song: songs)
+            auto answer = 'a';
+            cout << "are you sure you want to upload " << songs.size() << " songs? [y/n]";
+            cin >> answer;
+            Utilities::Conversions::toLowerChar(answer);
+
+            if (answer == 'y' || answer == 'Y') 
            {
-                song = uploadSong(token, song);
-            }
+                confirmUpload = true;
+                break;
+            } 
        }
-        catch (exception& e)
+
+        cout << "uploading songs\n";
+        for (auto& song: songs)
        {
-            cout<<e.what()<<endl;
+            song = uploadSong(song);
+        }
+    }
+    catch (exception& e)
+    {
+        cout<<e.what()<<endl;
+    }
+}
+
+
+void Upload::uploadSongWithMetadata(Managers::CommitManager::Album &album, Models::Song& song, Models::CoverArt &cover)
+{
+    this->api.endpoint.assign("song/data/upload/with/data");
+
+    try
+    {
+        auto url = retrieveUrl();
+
+        cout << "url " << url << "\n";
+        string auth(this->m_token.tokenType);
+        auth.append(" " + this->m_token.accessToken);
+
+        nlohmann::json s;
+        s["title"] = song.title;
+        s["album"] = album.album;
+        s["album_artist"] = album.albumArtist;
+        s["artist"] = song.artist;
+        s["year"] = album.year;
+        s["genre"] = album.genre;
+        s["disc"] = song.disc;
+        s["track"] = song.track;
+        s["disc_count"] = album.discCount;
+        s["track_count"] = album.trackCount;
+
+        const auto meta = s.dump();
+
+        cout<<"\n\nMeta:\n"<<meta<<"\n";
+        cout << "Filepath: " << song.song_path() << "\n";
+
+        auto multipart = cpr::Multipart{{"cover", cpr::File{cover.path}},
+            {"metadata", meta},
+            {"file", cpr::File{song.song_path()}}};
+
+        auto r = cpr::Post(cpr::Url{url}, multipart,
+            cpr::Header{{"authorization", auth}}
+        );
+
+        cout << "status code: " << r.status_code<< std::endl;
+        cout << r.text << endl;
+    }
+    catch (exception &e)
+    {
+        auto msg = e.what();
+        cout<<"Error: "<<msg<<"\n";
+    }
+}
+std::vector<Song> Upload::retrieveAllSongsFromDirectory(const std::string& directory,
+    bool recursive)
+{
+    std::vector<Song> allSongs;
+
+    if (recursive)
+    {
+        for (auto p: fs::recursive_directory_iterator(directory))
+        {
+            auto song = retrieveSongPath(p);
+            if (!song.songPath.empty())
+                allSongs.push_back(song);
+        }
+    }
+    else
+    {
+        for (auto p: fs::directory_iterator(directory))
+        {
+            auto song = retrieveSongPath(p);
+            if (!song.songPath.empty())
+                allSongs.push_back(song);
        }
    }

+    return allSongs;
+}

-    std::vector<Song> Upload::retrieveAllSongsFromDirectory(const std::string& directory,
-        bool recursive)
+
+string Upload::retrieveUrl()
+{
+    const string url{api.url + "api/" + api.version + "/" +
+        api.endpoint};
+        
+    return url;
+}
+
+
+Song Upload::retrieveSongPath(fs::directory_entry& dirEntry)
+{
+    constexpr auto mp3Ext = ".mp3";
+    Song song;
+    if (fs::is_regular_file(dirEntry.path()))
    {
-        std::vector<Song> allSongs;
-        if (recursive)
+        const auto ext = dirEntry.path().extension().string();
+        if (ext.compare(mp3Ext) == 0)
        {
-            for (auto p: fs::recursive_directory_iterator(directory))
-            {
-                auto song = retrieveSongPath(p);
-                if (!song.songPath.empty())
-                    allSongs.push_back(song);
-            }
+            cout << "found mp3 file" << endl;
+            song.songPath = dirEntry.path().string();
        }
-        else
-        {
-            for (auto p: fs::directory_iterator(directory))
-            {
-                auto song = retrieveSongPath(p);
-                if (!song.songPath.empty())
-                    allSongs.push_back(song);
-            }
-        }
-
-        return allSongs;
    }

-
-    string Upload::retrieveUrl()
-    {
-        const string url{api.url + "api/" + api.version + "/" +
-            api.endpoint};
-            
-        return url;
-    }
+    return song;
+}


-    Song Upload::retrieveSongPath(fs::directory_entry& dirEntry)
-    {
-        constexpr auto mp3Ext = ".mp3";
-        Song song;
-        if (fs::is_regular_file(dirEntry.path()))
-        {
-            const auto ext = dirEntry.path().extension().string();
-            if (ext.compare(mp3Ext) == 0)
-            {
-                cout << "found mp3 file" << endl;
-                song.songPath = dirEntry.path().string();
-            }
-        }
+#pragma region Testing

-        return song;
-    }
-
-
-    #pragma
-    void Upload::printSongDetails()
+void Upload::printSongDetails(std::vector<Song>& songs)
+{
+    for (auto& song: songs)
    {
        cout<<"Song details: "<<endl;
        cout<<"Id: "<<song.id<<endl;
@@ -152,36 +219,25 @@ namespace Syncers
        cout<<"Genre: "<<song.genre<<endl;
        cout<<"Year: "<<song.year<<endl;
        cout<<"Duration: "<<song.duration<<endl;
+        cout<<"Path: "<<song.songPath<<endl;
    }
-    void Upload::printSongDetails(std::vector<Song>& songs)
-    {
-        for (auto& song: songs)
-        {
-            cout<<"Song details: "<<endl;
-            cout<<"Id: "<<song.id<<endl;
-            cout<<"Title: "<<song.title<<endl;
-            cout<<"Artist: "<<song.artist<<endl;
-            cout<<"Album: "<<song.album<<endl;
-            cout<<"Genre: "<<song.genre<<endl;
-            cout<<"Year: "<<song.year<<endl;
-            cout<<"Duration: "<<song.duration<<endl;
-            cout<<"Path: "<<song.songPath<<endl;
-        }
-    }
-    void Upload::printJsonData(json obj)
-    {
-        cout<<endl<<endl<<"JSon data: "<<endl;
-        cout<<"id: "<<obj["id"]<<endl;
-        cout<<"title: "<<obj["title"]<<endl;
-        cout<<"artist: "<<obj["artist"]<<endl;
-        cout<<"album: "<<obj["album"]<<endl;
-        cout<<"genre: "<<obj["genre"]<<endl;
-        cout<<"year: "<<obj["year"]<<endl;
-        cout<<"duration: "<<obj["duration"]<<endl;
-        cout<<"song_data: "<<obj["song_data"]<<endl;
-
-        cout<<endl<<endl;;
-    }
-    #pragma Testing
-    #pragma Functions
+}
+
+void Upload::printJsonData(const json& obj)
+{
+    cout<<endl<<endl<<"JSon data: "<<endl;
+    cout<<"id: "<<obj["id"]<<endl;
+    cout<<"title: "<<obj["title"]<<endl;
+    cout<<"artist: "<<obj["artist"]<<endl;
+    cout<<"album: "<<obj["album"]<<endl;
+    cout<<"genre: "<<obj["genre"]<<endl;
+    cout<<"year: "<<obj["year"]<<endl;
+    cout<<"duration: "<<obj["duration"]<<endl;
+    cout<<"song_data: "<<obj["song_data"]<<endl;
+
+    cout<<endl<<endl;
+}
+#pragma endregion
+#pragma endregion
+
 }
@@ -1,47 +1,52 @@
-#include"UI/AboutWindow.h"
+#include "UI/AboutWindow.h"

 using std::unique_ptr;

 namespace UI
 {
-    AboutWindow::AboutWindow(QWidget* parent): QDialog(parent)
-    {
-        setupWindow();
-    }
-
-
-    void AboutWindow::setupWindow()
-    {
-        windowWidth = 250;
-        windowHeight = 300;
-
-        mainLayoutQt = unique_ptr<QVBoxLayout>{new QVBoxLayout};
-
-        appName = unique_ptr<QLabel>{new QLabel(tr("IcarusDownloadManager"))};
-        actionButtonQt = unique_ptr<QPushButton>{new QPushButton(tr("Close"))};
-
-        mainLayoutQt->addWidget(appName.get());
-        mainLayoutQt->addWidget(actionButtonQt.get());
-
-
-        setFixedWidth(windowWidth);
-        setFixedHeight(windowHeight);
-
-        setLayout(mainLayoutQt.get());
-
-        setWindowTitle("About");
-
-        connections();
-    }
-    void AboutWindow::connections()
-    {
-        QObject::connect(actionButtonQt.get(), SIGNAL(clicked()), this, 
-                        SLOT(closeWindow()));
-    }
-
-
-    void AboutWindow::closeWindow()
-    {
-        this->hide();   
-    }
+#pragma region Constructors
+AboutWindow::AboutWindow(QWidget* parent): QDialog(parent)
+{
+    setupWindow();
+}
+#pragma endregion
+
+
+#pragma region Functions
+void AboutWindow::setupWindow()
+{
+    windowWidth = 250;
+    windowHeight = 300;
+
+    mainLayoutQt = unique_ptr<QVBoxLayout>{new QVBoxLayout};
+
+    appName = unique_ptr<QLabel>{new QLabel(tr("IcarusDownloadManager"))};
+    actionButtonQt = unique_ptr<QPushButton>{new QPushButton(tr("Close"))};
+
+    mainLayoutQt->addWidget(appName.get());
+    mainLayoutQt->addWidget(actionButtonQt.get());
+
+
+    setFixedWidth(windowWidth);
+    setFixedHeight(windowHeight);
+
+    setLayout(mainLayoutQt.get());
+
+    setWindowTitle("About");
+
+    connections();
+}
+void AboutWindow::connections()
+{
+    QObject::connect(actionButtonQt.get(), SIGNAL(clicked()), this, 
+                    SLOT(closeWindow()));
+}
+
+
+void AboutWindow::closeWindow()
+{
+    this->hide();   
+}
+#pragma endregion
+
 }
@@ -1,11 +1,11 @@
-#include"UI/MainWindow.h"
+#include "UI/MainWindow.h"

-#include<iostream>
-#include<string>
+#include <iostream>
+#include <string>

-#include"Models/UploadForm.h"
-#include"Syncers/Upload.h"
-#include"Utilities/Conversions.h"
+#include "Models/UploadForm.h"
+#include "Syncers/Upload.h"
+#include "Utilities/Conversions.h"

 using std::cout;
 using std::endl;
@@ -17,158 +17,164 @@ using Syncers::Upload;

 namespace UI
 {
-    MainWindow::MainWindow() 
-    {
-        setupMainWindow();
-        aboutWindow = unique_ptr<AboutWindow>{new AboutWindow};
-    }

-
-    void MainWindow::configureDownloadSection()
-    {
-    }
-    void MainWindow::configureUploadSection()
-    {
-        uploadSongQt = unique_ptr<QPushButton>{new QPushButton(tr("Upload"))};
-        urlQt = unique_ptr<QTextEdit>{new QTextEdit()};
-        sourceFilePathQt = unique_ptr<QTextEdit>{new QTextEdit()};
-
-            urlLabel = unique_ptr<QLabel>{new QLabel(tr("URL"))};
-            songPath = unique_ptr<QLabel>{new QLabel(tr("Song Path"))};
-
-            urlPortion = unique_ptr<QHBoxLayout>{new QHBoxLayout};
-            songPathPortion = unique_ptr<QHBoxLayout>{new QHBoxLayout};
-
-            urlPortion.get()->addWidget(urlLabel.get());
-            urlPortion.get()->addWidget(urlQt.get());
-
-            songPathPortion->addWidget(songPath.get());
-            songPathPortion->addWidget(sourceFilePathQt.get());
-
-        subLayoutOneQt = unique_ptr<QVBoxLayout>{new QVBoxLayout};
-            subLayoutOneQt.get()->addLayout(urlPortion.get());
-            subLayoutOneQt->addLayout(songPathPortion.get());
-        mainLayoutQt.get()->addLayout(subLayoutOneQt.get());
-    }
-    void MainWindow::configureWindowDimensions()
-    {
-        windowWidth = 450;
-        windowHeight = 450;
-    }
-    void MainWindow::configureWindowProperties()
-    {
-        setWindowTitle("IcarusDownloadManager");
-        setFixedHeight(windowHeight);
-        setFixedWidth(windowWidth);
-    }
-    void MainWindow::connections()
-    {
-        QObject::connect(uploadSongQt.get(), SIGNAL(clicked()), this, SLOT(uploadSong()));
-        QObject::connect(closeApplicationQt.get(), SIGNAL(triggered()), this, 
-                        SLOT(exitApplication()));
-        QObject::connect(aboutApplicationQt.get(), SIGNAL(triggered()), this, 
-                        SLOT(displaySoftwareInformation()));
-        QObject::connect(windowComboBox.get(), SIGNAL(activated(int)),
-                                this, SLOT(setCurrentIndex(int)));
-    }
-    void MainWindow::createMenus()
-    {
-        fileMenuQt = unique_ptr<QMenu>{menuBar()->addMenu(tr("File"))};
-        editMenuQt = unique_ptr<QMenu>{menuBar()->addMenu(tr("Edit"))};
-        helpMenuQt = unique_ptr<QMenu>{menuBar()->addMenu(tr("Help"))};
-
-        closeApplicationQt = unique_ptr<QAction>{new QAction(new QObject(nullptr))};
-        closeApplicationQt->setText("Exit Application");
-
-        aboutApplicationQt = unique_ptr<QAction>{new QAction(new QObject(nullptr))};
-        aboutApplicationQt->setText("About");
-
-        fileMenuQt->addAction(closeApplicationQt.get());
-        helpMenuQt->addAction(aboutApplicationQt.get());
-
-    }
-    void MainWindow::setupMainWidget()
-    {
-        mainWidgetQt = unique_ptr<QWidget>{new QWidget};
-
-        windowComboBox = unique_ptr<QComboBox>{new QComboBox};
-        setupWindowLists();
-
-
-        stackLayout = unique_ptr<QVBoxLayout>{new QVBoxLayout};
-        stackLayout->addWidget(windowComboBox.get());
-
-        uploadSongWidgetQt = unique_ptr<QWidget>{new QWidget};
-        uploadSongWidgetQt->setLayout(mainLayoutQt.get());
-
-        stackLayout->addWidget(uploadSongWidgetQt.get());
-
-        mainWidgetQt->setLayout(stackLayout.get());
-    }
-    void MainWindow::setupMainWindow()
-    {
-        configureWindowDimensions();
-
-        mainLayoutQt = unique_ptr<QVBoxLayout>{new QVBoxLayout};
-        widgetStack = unique_ptr<QStackedWidget>{new QStackedWidget};
-
-        configureUploadSection();
-
-        setupMainWidget();
-
-        widgetStack->addWidget(mainWidgetQt.get());
-
-        MainDockWidgetQt = unique_ptr<QDockWidget>{new QDockWidget};
-        MainDockWidgetQt.get()->setWindowTitle(tr("Music Manager"));
-        MainDockWidgetQt->setWidget(widgetStack.get());
-        MainDockWidgetQt.get()->setFeatures(QDockWidget::NoDockWidgetFeatures);
-
-        setCentralWidget(MainDockWidgetQt.get());
-
-        createMenus();
-
-        configureWindowProperties();
-
-        connections();
-    }
-    void MainWindow::setupWindowLists()
-    {
-        windowComboBox->addItem(tr("Upload song"));
-        windowComboBox->addItem(tr("Download song"));
-        windowComboBox->addItem(tr("Display all songs"));
-        windowComboBox->addItem(tr("Display songs"));
-    }
-
-
-    void MainWindow::exitApplication()
-    {
-        exit(0);
-    }
-    void MainWindow::displaySoftwareInformation()
-    {
-        aboutWindow->show();
-    }
-    void MainWindow::setCurrentIndex(int index)
-    {
-        cout<<"index "<<index<<endl;
-        QString qText = windowComboBox->itemText(index);
-        auto cnvert = Utilities::Conversions(qText);
-        auto convertedStr = cnvert.convertQStringToString();
-        cout<<"item text"<<endl;
-    }
-    void MainWindow::uploadSong()
-    {
-        uploadSongQt->setEnabled(false);
-
-        string url = urlQt->toPlainText().toUtf8().constData();
-        string filePath = sourceFilePathQt->toPlainText().toUtf8().constData();
-        cout<<"URL endpoint: "<<url<<endl;
-        cout<<"Music file path: "<<filePath<<endl;
-        UploadForm formData{url, filePath};
-
-        Upload upld{formData};
-        upld.uploadSong();
-
-        uploadSongQt->setEnabled(true);
-    }
+#pragma region Constructors
+MainWindow::MainWindow() 
+{
+    setupMainWindow();
+    aboutWindow = unique_ptr<AboutWindow>{new AboutWindow};
+}
+#pragma endregion
+
+
+#pragma region Functions
+void MainWindow::configureDownloadSection()
+{
+}
+void MainWindow::configureUploadSection()
+{
+    uploadSongQt = unique_ptr<QPushButton>{new QPushButton(tr("Upload"))};
+    urlQt = unique_ptr<QTextEdit>{new QTextEdit()};
+    sourceFilePathQt = unique_ptr<QTextEdit>{new QTextEdit()};
+
+    urlLabel = unique_ptr<QLabel>{new QLabel(tr("URL"))};
+    songPath = unique_ptr<QLabel>{new QLabel(tr("Song Path"))};
+
+    urlPortion = unique_ptr<QHBoxLayout>{new QHBoxLayout};
+    songPathPortion = unique_ptr<QHBoxLayout>{new QHBoxLayout};
+
+    urlPortion.get()->addWidget(urlLabel.get());
+    urlPortion.get()->addWidget(urlQt.get());
+
+    songPathPortion->addWidget(songPath.get());
+    songPathPortion->addWidget(sourceFilePathQt.get());
+
+    subLayoutOneQt = unique_ptr<QVBoxLayout>{new QVBoxLayout};
+    subLayoutOneQt.get()->addLayout(urlPortion.get());
+    subLayoutOneQt->addLayout(songPathPortion.get());
+    mainLayoutQt.get()->addLayout(subLayoutOneQt.get());
+}
+void MainWindow::configureWindowDimensions()
+{
+    windowWidth = 450;
+    windowHeight = 450;
+}
+void MainWindow::configureWindowProperties()
+{
+    setWindowTitle("IcarusDownloadManager");
+    setFixedHeight(windowHeight);
+    setFixedWidth(windowWidth);
+}
+void MainWindow::connections()
+{
+    QObject::connect(uploadSongQt.get(), SIGNAL(clicked()), this, SLOT(uploadSong()));
+    QObject::connect(closeApplicationQt.get(), SIGNAL(triggered()), this, 
+                    SLOT(exitApplication()));
+    QObject::connect(aboutApplicationQt.get(), SIGNAL(triggered()), this, 
+                    SLOT(displaySoftwareInformation()));
+    QObject::connect(windowComboBox.get(), SIGNAL(activated(int)),
+                            this, SLOT(setCurrentIndex(int)));
+}
+void MainWindow::createMenus()
+{
+    fileMenuQt = unique_ptr<QMenu>{menuBar()->addMenu(tr("File"))};
+    editMenuQt = unique_ptr<QMenu>{menuBar()->addMenu(tr("Edit"))};
+    helpMenuQt = unique_ptr<QMenu>{menuBar()->addMenu(tr("Help"))};
+
+    closeApplicationQt = unique_ptr<QAction>{new QAction(new QObject(nullptr))};
+    closeApplicationQt->setText("Exit Application");
+
+    aboutApplicationQt = unique_ptr<QAction>{new QAction(new QObject(nullptr))};
+    aboutApplicationQt->setText("About");
+
+    fileMenuQt->addAction(closeApplicationQt.get());
+    helpMenuQt->addAction(aboutApplicationQt.get());
+
+}
+void MainWindow::setupMainWidget()
+{
+    mainWidgetQt = unique_ptr<QWidget>{new QWidget};
+
+    windowComboBox = unique_ptr<QComboBox>{new QComboBox};
+    setupWindowLists();
+
+
+    stackLayout = unique_ptr<QVBoxLayout>{new QVBoxLayout};
+    stackLayout->addWidget(windowComboBox.get());
+
+    uploadSongWidgetQt = unique_ptr<QWidget>{new QWidget};
+    uploadSongWidgetQt->setLayout(mainLayoutQt.get());
+
+    stackLayout->addWidget(uploadSongWidgetQt.get());
+
+    mainWidgetQt->setLayout(stackLayout.get());
+}
+void MainWindow::setupMainWindow()
+{
+    configureWindowDimensions();
+
+    mainLayoutQt = unique_ptr<QVBoxLayout>{new QVBoxLayout};
+    widgetStack = unique_ptr<QStackedWidget>{new QStackedWidget};
+
+    configureUploadSection();
+
+    setupMainWidget();
+
+    widgetStack->addWidget(mainWidgetQt.get());
+
+    MainDockWidgetQt = unique_ptr<QDockWidget>{new QDockWidget};
+    MainDockWidgetQt.get()->setWindowTitle(tr("Music Manager"));
+    MainDockWidgetQt->setWidget(widgetStack.get());
+    MainDockWidgetQt.get()->setFeatures(QDockWidget::NoDockWidgetFeatures);
+
+    setCentralWidget(MainDockWidgetQt.get());
+
+    createMenus();
+
+    configureWindowProperties();
+
+    connections();
+}
+void MainWindow::setupWindowLists()
+{
+    windowComboBox->addItem(tr("Upload song"));
+    windowComboBox->addItem(tr("Download song"));
+    windowComboBox->addItem(tr("Display all songs"));
+    windowComboBox->addItem(tr("Display songs"));
+}
+
+
+void MainWindow::exitApplication()
+{
+    exit(0);
+}
+void MainWindow::displaySoftwareInformation()
+{
+    aboutWindow->show();
+}
+void MainWindow::setCurrentIndex(int index)
+{
+    cout<<"index "<<index<<endl;
+    QString qText = windowComboBox->itemText(index);
+    auto cnvert = Utilities::Conversions(qText);
+    auto convertedStr = cnvert.convertQStringToString();
+    cout<<"item text"<<endl;
+}
+void MainWindow::uploadSong()
+{
+    uploadSongQt->setEnabled(false);
+
+    string url = urlQt->toPlainText().toUtf8().constData();
+    string filePath = sourceFilePathQt->toPlainText().toUtf8().constData();
+    cout<<"URL endpoint: "<<url<<endl;
+    cout<<"Music file path: "<<filePath<<endl;
+    UploadForm formData{url, filePath};
+
+    Upload upld{formData};
+    upld.uploadSong();
+
+    uploadSongQt->setEnabled(true);
+}
+#pragma endregion
+
 }
@@ -1,24 +1,26 @@
-#include"Utilities/Conversions.h"
+#include "Utilities/Conversions.h"

-#include<iostream>
+#include <iostream>

 using std::string;
 using std::unique_ptr;

 namespace Utilities
 {
-    Conversions::Conversions()
-    {
-        initializeValues();
-    }

-    void Conversions::initializeValues()
-    {
-    }
-    template <typename T>
-    void Conversions::printValue(T val)
-    {
-        std::cout<<"going to print value"<<std::endl;
-        std::cout<<val<<std::endl;
-    }
+Conversions::Conversions()
+{
+    initializeValues();
+}
+
+void Conversions::initializeValues()
+{
+}
+template <typename T>
+void Conversions::printValue(T val)
+{
+    std::cout<<"going to print value\n";
+    std::cout<<val<< "\n";
+}
+
 }
Author	SHA1	Message	Date
Kun Deng	1d88a3ccf6	Update README.md	2022-08-07 21:40:23 -04:00
Kun Deng	2768c1e351	Update README.md	2022-08-07 21:40:01 -04:00
Kun Deng	3955942988	Merge pull request #15 from kdeng00/v0.3 V0.3	2022-08-07 21:37:39 -04:00
Kun Deng	bfd7a02970	Merge pull request #14 from kdeng00/vs Vs	2022-08-07 21:35:55 -04:00
kdeng00	77acd15105	Able to debug with Visual Studio	2022-08-07 21:34:41 -04:00
kdeng00	435a0df941	Added build files Added Visual studio build files	2022-08-07 21:15:54 -04:00
kdeng00	c624c4de51	Missing include	2022-08-07 21:15:07 -04:00
Kun Deng	1d6cd804be	Merge pull request #13 from kdeng00/vcpkg Vcpkg	2022-08-07 20:46:24 -04:00
kdeng00	2743543102	Clean up	2022-08-07 20:44:37 -04:00
kdeng00	3195011f99	vcpkg is operational	2022-08-07 20:42:11 -04:00
kdeng00	ed5ceedb44	vcpkg version Version 2022.07.25	2022-08-07 20:04:57 -04:00
kdeng00	f70acba704	Added vcpkg	2022-08-07 20:04:02 -04:00
Kun Deng	f224b5738b	Merge pull request #12 from kdeng00/build_fix Fixed build issue	2022-08-07 19:59:29 -04:00
kdeng00	c41cd9dbb7	Fixed build issue	2022-08-07 19:51:29 -04:00
Kun Deng	9420ee97b4	Merge pull request #9 from kdeng00/support_new_upload_endpoint Support new upload endpoint	2022-01-09 18:07:50 -05:00
Kun Deng	c46f386d70	Merge branch 'master' into support_new_upload_endpoint	2022-01-09 18:07:44 -05:00
kdeng00	d9962749c8	Ready for release	2022-01-09 18:06:43 -05:00
kdeng00	c8e8c1a460	Changed cmake version	2022-01-09 02:16:51 -05:00
kdeng00	dcfa9951d9	Updated Readme	2022-01-09 02:04:56 -05:00
kdeng00	e90278995a	Saving changes	2022-01-09 00:31:43 -05:00
kdeng00	7c8e77f233	Formatting	2022-01-08 23:52:46 -05:00
Kun Deng	a1b2e5f64a	Merge branch 'master' into support_new_upload_endpoint	2022-01-08 23:46:43 -05:00
kdeng00	25e8774968	Visual Studio support	2022-01-08 21:12:55 -05:00
kdeng00	10ed33d412	Formatting	2022-01-08 21:09:40 -05:00
kdeng00	1ef40bcbfb	Got functionality working	2022-01-01 00:39:35 -05:00
kdeng00	3e25dd77b5	Updates Updating required flags for uploading a song with metadata	2021-12-31 22:15:17 -05:00
kdeng00	14d3c9acc6	Made progress	2021-12-31 19:09:31 -05:00
kdeng00	9930aab985	Updated Readme	2021-12-31 16:00:45 -05:00
kdeng00	0839731ee8	upload-meta command	2021-12-29 15:58:14 -05:00
Kun Deng	7a04b802f0	Merge pull request #8 from kdeng00/package_manager-switch Package manager switch	2021-12-29 15:50:28 -05:00
kdeng00	63d6022d16	Updated Readme Added link to conan repo	2021-12-29 15:47:21 -05:00
kdeng00	db1a6302ad	Updated Readme	2021-12-29 15:45:12 -05:00
kdeng00	bd819f0332	package manager switch Moving from Hunter to conan	2021-12-29 15:38:28 -05:00
kdeng00	7177b01a98	added flag to prevent the user from being prompted when uploading songs from a directory	2019-11-12 22:07:44 -05:00
kdeng00	996b84c25c	Prompt user when uploading songs from a directory	2019-11-11 22:54:53 -05:00
Kun Deng	9d8122df5c	Update README.md	2019-10-26 10:22:12 -04:00
				`@@ -1 +0,0 @@`
				`cmake -H. -B_builds -DHUNTER_STATUS_DEBUG=ON -DCMAKE_BUILD_TYPE=DEBUG`