From 98748b383c4abb1a6c04a78663a6c4936f3a14c8 Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Thu, 1 Aug 2019 20:55:09 -0400
Subject: [PATCH] Fixed issue where if / was not provided in the host value
 then it would not send the request. Fixed issue where song records are
 formatted correctly

---
 CMakeLists.txt                  | 60 ++++++++++++++++-----------------
 src/Managers/ActionManager.cpp  |  6 ++--
 src/Managers/TokenManager.cpp   |  4 +--
 src/Parsers/APIParser.cpp       | 10 ++----
 src/Syncers/RetrieveRecords.cpp |  6 ++--
 5 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a95ab6..1530567 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ 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++117support.")
+    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)
@@ -41,39 +41,39 @@ endif()
 
 
 set(SOURCES
-	src/Main.cpp
-	src/Managers/ActionManager.cpp
-	src/Managers/CommitManager.cpp
-	src/Managers/FileManager.cpp
-	src/Managers/TokenManager.cpp
-	src/Managers/UserManager.cpp
-	src/Parsers/APIParser.cpp
-	src/Syncers/Delete.cpp
-	src/Syncers/Download.cpp
+    src/Main.cpp
+    src/Managers/ActionManager.cpp
+    src/Managers/CommitManager.cpp
+    src/Managers/FileManager.cpp
+    src/Managers/TokenManager.cpp
+    src/Managers/UserManager.cpp
+    src/Parsers/APIParser.cpp
+    src/Syncers/Delete.cpp
+    src/Syncers/Download.cpp
     src/Syncers/RetrieveRecords.cpp
-	src/Syncers/Upload.cpp
-	src/Utilities/Conversions.cpp
+    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/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
+    include/Syncers/SyncerBase.h
+    include/Syncers/Upload.h
+    include/Utilities/Conversions.h
 )
 
 
diff --git a/src/Managers/ActionManager.cpp b/src/Managers/ActionManager.cpp
index b1f998b..a922a60 100644
--- a/src/Managers/ActionManager.cpp
+++ b/src/Managers/ActionManager.cpp
@@ -109,7 +109,7 @@ namespace Managers
             if (flag.size() > 3 || isNumber(flag))
             {
                 flg.value = flag;
-                cout<<"flag value "<<flg.value<<endl;
+                //cout<<"flag value "<<flg.value<<endl;
                 flags.push_back(flg);
                 flg = Flags{};
                 continue;
@@ -121,7 +121,7 @@ namespace Managers
                     return !val.compare(flag);
                 }))
             {
-                cout<<"flag "<<flag<<endl;
+                //cout<<"flag "<<flag<<endl;
                 flg.flag = flag;
             }
             else
@@ -140,7 +140,7 @@ namespace Managers
             for (auto i = 2; true; ++i)
             {
                 string val{*(params + i)};
-                cout<<"Parsed flag "<<val<<endl;
+                //cout<<"Parsed flag "<<val<<endl;
                 parsed.push_back(val);
             }
         }
diff --git a/src/Managers/TokenManager.cpp b/src/Managers/TokenManager.cpp
index 088ed96..d402f7b 100644
--- a/src/Managers/TokenManager.cpp
+++ b/src/Managers/TokenManager.cpp
@@ -40,7 +40,6 @@ namespace Managers
 
         usrObj["username"] = user.username;
         usrObj["password"] = user.password;
-        cout<<user.username<<" "<<user.password<<endl;
 
         cout<<"Sending request for token"<<endl;
         auto url = api.url + api.endpoint;
@@ -49,12 +48,11 @@ namespace Managers
                 cpr::Body{usrObj.dump()},
            cpr::Header{{"Content-Type", "application/json"}});
 
-        cout<<r.text<<endl;
         json res = json::parse(r.text);
         token.accessToken = res["token"];
         token.tokenType = res["token_type"];
 
-        //cout<<"status code "<<r.status_code<<endl;
+        cout<<"status code "<<r.status_code<<endl;
 
         return token;
     }
diff --git a/src/Parsers/APIParser.cpp b/src/Parsers/APIParser.cpp
index 5e37116..af34a2b 100644
--- a/src/Parsers/APIParser.cpp
+++ b/src/Parsers/APIParser.cpp
@@ -31,23 +31,17 @@ namespace Parsers
         auto flags = icaAct.flags;
         cout<<"Parsing api"<<endl;
 
-        //for (auto flag :  flags)
         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;
-            }
-            if (value.compare("-h") == 0)
-            {
-                api.url = flags[i + 1].value;
+                api.url = (value[value.size()-1 == '/']) ? value : value + "/";
+                break;
             }
 
-            cout<<"url is "<<api.url<<endl;
         }
 
         // TODO: For now I will hard code
diff --git a/src/Syncers/RetrieveRecords.cpp b/src/Syncers/RetrieveRecords.cpp
index baff397..8f98bc9 100644
--- a/src/Syncers/RetrieveRecords.cpp
+++ b/src/Syncers/RetrieveRecords.cpp
@@ -4,6 +4,7 @@
 #include <fstream>
 
 #include <cpr/cpr.h>
+#include <nlohmann/json.hpp>
 
 using std::cout;
 using std::endl;
@@ -35,7 +36,6 @@ namespace Syncers
     {
         cout<<"fetching songs"<<endl;
         auto url = api.url + "api/" + api.version + "/" + "song";
-        cout<<url<<endl;
 
         auto auth = token.tokenType;
         auth.append(" " + token.accessToken);
@@ -43,9 +43,11 @@ namespace Syncers
              cpr::Header{{"authorization", auth},
                  });
 
+        auto songData = nlohmann::json::parse(r.text);
+
         ofstream writeData{};
         writeData.open("songs.json");
-        writeData<<r.text;
+        writeData<<songData.dump(4);
         writeData.close();
     }
 }