Merge branch 'master' into support_new_upload_endpoint

include/Managers/ActionManager.h

@@ -12,6 +12,9 @@
 
 namespace Managers
 {
+
+
+
 class ActionManager
 {
 public:
@@ -72,8 +75,6 @@ namespace Managers
         }
     }
 
-        std::vector<std::string> parsedFlags();
-
     void printAction() noexcept;
     void printFlags() noexcept;
 
@@ -84,6 +85,7 @@ namespace Managers
     char **params;
     int paramCount;
 };
+
 }
 
 #endif

include/Managers/CommitManager.h

@@ -14,6 +14,7 @@
 
 namespace Managers
 {
+
 class CommitManager
 {
 public:
@@ -21,6 +22,7 @@ namespace Managers
 
     void commitAction();
 
+
     enum class RetrieveTypes
     {
         songs
@@ -49,8 +51,6 @@ namespace Managers
     
     std::map<std::string, ActionValues> mapActions() noexcept;
 
-        Models::Token parseToken(Models::API);
-
     void deleteSong();
     void downloadSong();
     void retrieveObjects();
@@ -204,7 +204,9 @@ namespace Managers
 
 
     Models::IcarusAction icaAction;
+
 };
+
 }
 
 #endif

include/Managers/FileManager.h

@@ -5,6 +5,7 @@
 
 namespace Managers
 {
+
 class FileManager
 {
 public:
@@ -24,6 +25,7 @@ namespace Managers
     bool fileRead;
     int fileBufferLength;
 };
+
 }
 
 #endif

include/Managers/TokenManager.h

@@ -7,6 +7,7 @@
 
 namespace Managers
 {
+
 class TokenManager
 {
 public:
@@ -18,6 +19,7 @@ namespace Managers
     Models::API api;
     Models::User user;
 };
+
 }
 
 #endif

include/Managers/UserManager.h

@@ -8,6 +8,7 @@
 
 namespace Managers
 {
+
 class UserManager
 {
 public:
@@ -21,6 +22,7 @@ namespace Managers
     Models::User user;
     Models::IcarusAction icaAction;
 };
+
 }
 
 #endif

include/Models/API.h

@@ -5,12 +5,15 @@
 
 namespace Models
 {
-    struct API
+
+class API
 {
+public:
     std::string url;
     std::string endpoint;
     std::string version;
 };
+
 }
 
 #endif

include/Models/Flags.h

@@ -5,12 +5,21 @@
 
 namespace Models
 {
+
 class Flags
 {
 public:
     std::string flag;
     std::string value;
 };
+
+
+struct Flags
+{
+    std::string flag;
+    std::string value;
+};
+
 }
 
 #endif

include/Models/IcarusAction.h

@@ -11,6 +11,7 @@
 
 namespace Models
 {
+
 class IcarusAction
 {
 public:
@@ -46,6 +47,7 @@ namespace Models
     std::string action;
     std::vector<Flags> flags;
 };
+
 }
 
 #endif

include/Models/Song.h

@@ -7,6 +7,7 @@
 
 namespace Models
 {
+
 class Song
 {
 public:
@@ -41,6 +42,7 @@ namespace Models
     std::string title;
     std::string path;
 };
+
 } 
 
 #endif

include/Models/Token.h

@@ -5,12 +5,14 @@
 
 namespace Models
 {
+
 struct Token
 {
     std::string accessToken;
     std::string tokenType;
     int expiration;
 };
+
 }
 
 #endif

include/Models/UploadForm.h

@@ -6,11 +6,13 @@
 
 namespace Models
 {
+
 struct UploadForm
 {
     std::string url;
     std::string filePath;
 };
+
 } 
 
 #endif

include/Models/User.h

@@ -5,11 +5,13 @@
 
 namespace Models
 {
+
 struct User
 {
     std::string username;
     std::string password;
 };
+
 }
 
 #endif

include/Parsers/APIParser.h

@@ -6,6 +6,7 @@
 
 namespace Parsers
 {
+
 class APIParser
 {
 public:
@@ -18,6 +19,7 @@ namespace Parsers
     Models::API api;
     Models::IcarusAction icaAct;
 };
+
 }
 
 #endif

include/Syncers/Delete.h

@@ -9,6 +9,7 @@
 
 namespace Syncers
 {
+
 class Delete : SyncerBase
 {
 public:
@@ -18,6 +19,7 @@ namespace Syncers
 private:
     std::string retrieveUrl(Models::Song);
 };
+
 }
 
 #endif

include/Syncers/Download.h

@@ -12,6 +12,7 @@
 
 namespace Syncers
 {
+
 class Download : SyncerBase
 {
 public:
@@ -26,6 +27,7 @@ namespace Syncers
     std::string downloadFilePath;
     void saveSong(Models::Song&);
 };
+
 }
 
 #endif

include/Syncers/RetrieveRecords.h

@@ -8,6 +8,7 @@
 
 namespace Syncers
 {
+
 class RetrieveRecords: public SyncerBase
 {
 public:
@@ -21,6 +22,7 @@ namespace Syncers
     Models::API api;
     Models::Token token;
 };
+
 }
 
 #endif

include/Syncers/SyncerBase.h

@@ -7,6 +7,7 @@
 
 namespace Syncers
 {
+
 class SyncerBase
 {
 protected:
@@ -22,6 +23,7 @@ namespace Syncers
         NOTFOUND = 404
     };
 };
+
 }
 
 #endif

include/Syncers/Upload.h

@@ -19,6 +19,7 @@ namespace fs = std::filesystem;
 
 namespace Syncers
 {
+
 class Upload
 {
 public:
@@ -47,6 +48,7 @@ namespace Syncers
     void printSongDetails(std::vector<Models::Song>&);
     void printJsonData(const nlohmann::json&);
 };
+
 }
 
 #endif

include/UI/AboutWindow.h

@@ -13,6 +13,7 @@
 
 namespace UI
 {
+
 class AboutWindow: public QDialog, public CommonWindow
 {
     Q_OBJECT
@@ -29,6 +30,7 @@ namespace UI
 private slots:
     void closeWindow();
 };
+
 }
 
 #endif

include/UI/CommonWindow.h

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

include/UI/MainWindow.h

@@ -22,6 +22,7 @@
 
 namespace UI
 {
+
 class MainWindow: public QMainWindow, public CommonWindow
 {
     Q_OBJECT
@@ -77,6 +78,7 @@ namespace UI
     void displaySoftwareInformation();
     void setCurrentIndex(int);
 };
+
 }
 
 #endif

include/Utilities/Conversions.h

@@ -6,12 +6,12 @@
 
 namespace Utilities
 {
+
 class Conversions
 {
 public:
     Conversions();
 
-
     static void toLowerChar(char &c)
     {
         if (std::isalpha(c))
@@ -21,11 +21,9 @@ namespace Utilities
     }
 
     void initializeValues();
-
-        template <typename T>
-        void printValue(T);
 private:
 };
+
 }
 
 #endif

src/Managers/ActionManager.cpp

@@ -16,16 +16,17 @@ using Models::IcarusAction;
 
 namespace Managers
 {
-    #pragma
+
+#pragma region Constructors
 ActionManager::ActionManager(char **param, int paramCount) : 
     params(std::move(param)), paramCount(paramCount)
 {
     initialize();
 }
-    #pragma Constructors
+#pragma endregion
 
 
-    #pragma
+#pragma region Functions
 IcarusAction ActionManager::retrieveIcarusAction() const
 {
     IcarusAction icarusAction;
@@ -35,6 +36,14 @@ namespace Managers
     return icarusAction;
 }
 
+bool ActionManager::isNumber(string_view val) noexcept
+{
+    return !val.empty() && std::find_if(val.begin(), 
+        val.end(), [](char c)
+        {
+            return !std::isdigit(c);
+            }) == val.end();
+}
 
 
 void ActionManager::initialize()
@@ -45,7 +54,6 @@ namespace Managers
     transform(action.begin(), action.end(),
             action.begin(), ::tolower);
 }
-
 void ActionManager::validateFlags()
 {
         cout<<"Validating flags\n";
@@ -80,19 +88,18 @@ namespace Managers
 
 vector<string> ActionManager::parsedFlags()
 {
-        vector<string> parsed;
+    auto parsed = vector<string>();
-        parsed.reserve(paramCount);
     
     for (auto i = 2; i < paramCount; ++i)
     {
         const std::string flag(std::move(*(params + i)));
-            parsed.emplace_back(std::move(flag));
+        parsed.push_back(std::move(flag));
     }
 
     return parsed;
 }
 
-    #pragma
+#pragma region Testing
 void ActionManager::printAction() noexcept
 {
     if (action.empty())
@@ -113,6 +120,7 @@ namespace Managers
         cout<<"value "<<flag.value<<endl;
     }
 }
-    #pragma Testing
+#pragma endregion
-    #pragma Functions
+#pragma endregion
+
 }

src/Managers/CommitManager.cpp

@@ -40,13 +40,14 @@ namespace filesystem = std::filesystem;
 
 namespace Managers
 {
-	#pragma
+
+#pragma region Constructors
 CommitManager::CommitManager(IcarusAction& icaAct) : icaAction(std::move(icaAct))
 { }
-	#pragma Constructors
+#pragma endregion
 
 
-	#pragma
+#pragma region Functions
 void CommitManager::commitAction()
 {
     auto action = icaAction.action;
@@ -75,7 +76,9 @@ namespace Managers
 }
 
 
-    enum class ActionValues;
+
+
+
 
 std::map<std::string, CommitManager::ActionValues> 
     CommitManager::mapActions() noexcept
@@ -92,6 +95,8 @@ namespace Managers
 }
 
 
+
+
 Token CommitManager::parseToken(API api)
 {
     cout<<"fetching token\n";
@@ -186,6 +191,7 @@ namespace Managers
     songs.retrieve(retrieveType);
 
 }
+
 void CommitManager::uploadSong()
 {
     auto uploadSingleSong = true;
@@ -234,6 +240,8 @@ namespace Managers
     }
 }
 
+
+
 void CommitManager::uploadSongWithMetadata()
 {
     cout<<"Uploading single song with metadata\n\n";
@@ -425,5 +433,6 @@ namespace Managers
     std::cout<<"\n";
 }
 
-	#pragma Functions
+#pragma region Functions
+
 }

src/Managers/FileManager.cpp

@@ -11,14 +11,18 @@ using std::string;
 
 namespace Managers
 {
+
+#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)
@@ -63,4 +67,7 @@ namespace Managers
 }
 
 int FileManager::retrieveFileBufferLength() const { return fileBufferLength; }
+
+#pragma endregion
+
 }

src/Managers/TokenManager.cpp

@@ -17,7 +17,8 @@ using Models::User;
 
 namespace Managers
 {
-    #pragma
+
+#pragma region Constructors
 TokenManager::TokenManager(const User& user)
 {
     this->user = user;
@@ -29,10 +30,10 @@ namespace Managers
     this->api.endpoint = "api/" + api.version 
         + "/login";
 }
-    #pragma Constructors
+#pragma endregion
 
 
-    #pragma
+#pragma region Functions
 Token TokenManager::requestToken()
 {
     Token token{};
@@ -56,5 +57,6 @@ namespace Managers
 
     return token;
 }
-    #pragma Functions
+#pragma endregion
+
 }

src/Managers/UserManager.cpp

@@ -12,7 +12,8 @@ using Models::User;
 
 namespace Managers
 {
-    #pragma
+
+#pragma region Constructors
 UserManager::UserManager(User user)
 {
     this->user = user;
@@ -23,10 +24,10 @@ namespace Managers
     this->user = User{};
     parseUserFromActions();
 }
-    #pragma Constructors
+#pragma endregion
 
 
-    #pragma
+#pragma region Functions
 User UserManager::retrieveUser() const
 {
     return user;
@@ -49,5 +50,6 @@ namespace Managers
         }
     }
 }
-    #pragma Functions
+#pragma endregion
+
 }

src/Parsers/APIParser.cpp

@@ -10,7 +10,8 @@ using Models::IcarusAction;
 
 namespace Parsers
 {
-    #pragma
+
+#pragma region Constructors
 APIParser::APIParser(IcarusAction icaAct) : icaAct(icaAct)
 {
     api = API{};
@@ -19,7 +20,7 @@ namespace Parsers
 #pragma endregion
 
 
-    #pragma
+#pragma region Functions
 API APIParser::retrieveAPI() const
 {
     return api;
@@ -40,10 +41,13 @@ namespace Parsers
             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 endregion
+
 }

src/Syncers/Delete.cpp

@@ -16,16 +16,17 @@ using Models::Token;
 
 namespace Syncers
 {
-    #pragma
+
+#pragma region Constructors
 Delete::Delete(API api)
 {
     this->api = api;
     this->api.endpoint = "song/data";
 }
-    #pragma Constructors
+#pragma endregion
 
 
-    #pragma
+#pragma region Functions
 void Delete::deleteSong(const Token token, Song song)
 {
     try
@@ -58,5 +59,6 @@ namespace Syncers
 
     return url;
 }
-    #pragma Functions
+#pragma endregion
+
 }

src/Syncers/Download.cpp

@@ -18,7 +18,8 @@ using Models::Token;
 
 namespace Syncers
 {
-    #pragma
+
+#pragma region Constructors
 Download::Download() { }
 Download::Download(API api)
 {
@@ -29,10 +30,10 @@ namespace Syncers
 {
     downloadFilePath = filePath;
 }
-    #pragma Constructors
+#pragma endregion
 
 
-    #pragma
+#pragma region Functions
 void Download::downloadSong(const Token token, Song song)
 {
     try
@@ -87,5 +88,6 @@ namespace Syncers
     saveSong.write(data, bufferLength);
     saveSong.close();
 }
-    #pragma Functions
+#pragma endregion
+
 }

src/Syncers/RetrieveRecords.cpp

@@ -20,10 +20,13 @@ using Utilities::Conversions;
 namespace Syncers
 {
 
+#pragma region Constructors
 RetrieveRecords::RetrieveRecords() { }
 RetrieveRecords::RetrieveRecords(API api, Token token) 
     : token(token), api(api) { }
+#pragma endregion
 
+#pragma region Functions
 void RetrieveRecords::retrieve(CommitManager::RetrieveTypes type)
 {
     switch (type)
@@ -59,4 +62,6 @@ namespace Syncers
     writeData<<songData.dump(4);
     writeData.close();
 }
+#pragma endregion
+
 }

src/Syncers/Upload.cpp

@@ -25,6 +25,16 @@ using namespace cpr;
 
 namespace Syncers
 {
+
+#pragma region Constructors
+Upload::Upload() { }
+Upload::Upload(API api) : api(api)
+{
+    this->api.endpoint = "song/data";
+}
+#pragma endregion
+
+
 #pragma region Functions
 Song Upload::uploadSong(Song& song)
 {
@@ -89,8 +99,9 @@ namespace Syncers
 
         if (!confirmUpload) 
             {
-                cout << "exiting...\n";
+                confirmUpload = false;
-                std::exit(-1);
+                break;
+            }
         }
 
         cout << "uploading songs\n";
@@ -210,17 +221,7 @@ namespace Syncers
 
 
 #pragma region Testing
-    void Upload::printSongDetails()
+
-    {
-        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;
-    }
 void Upload::printSongDetails(std::vector<Song>& songs)
 {
     for (auto& song: songs)
@@ -236,6 +237,7 @@ namespace Syncers
         cout<<"Path: "<<song.songPath<<endl;
     }
 }
+
 void Upload::printJsonData(const json& obj)
 {
     cout<<endl<<endl<<"JSon data: "<<endl;
@@ -252,4 +254,5 @@ namespace Syncers
 }
 #pragma endregion
 #pragma endregion
+
 }

src/UI/AboutWindow.cpp

@@ -4,12 +4,15 @@ using std::unique_ptr;
 
 namespace UI
 {
+#pragma region Constructors
 AboutWindow::AboutWindow(QWidget* parent): QDialog(parent)
 {
     setupWindow();
 }
+#pragma endregion
 
 
+#pragma region Functions
 void AboutWindow::setupWindow()
 {
     windowWidth = 250;
@@ -44,4 +47,6 @@ namespace UI
 {
     this->hide();   
 }
+#pragma endregion
+
 }

src/UI/MainWindow.cpp

@@ -17,13 +17,17 @@ using Syncers::Upload;
 
 namespace UI
 {
+
+#pragma region Constructors
 MainWindow::MainWindow() 
 {
     setupMainWindow();
     aboutWindow = unique_ptr<AboutWindow>{new AboutWindow};
 }
+#pragma endregion
 
 
+#pragma region Functions
 void MainWindow::configureDownloadSection()
 {
 }
@@ -171,4 +175,6 @@ namespace UI
 
     uploadSongQt->setEnabled(true);
 }
+#pragma endregion
+
 }

src/Utilities/Conversions.cpp

@@ -7,6 +7,7 @@ using std::unique_ptr;
 
 namespace Utilities
 {
+
 Conversions::Conversions()
 {
     initializeValues();
@@ -21,4 +22,5 @@ namespace Utilities
     std::cout<<"going to print value"<<std::endl;
     std::cout<<val<<std::endl;
 }
+
 }