Merge branch 'master' into support_new_upload_endpoint

include/Syncers/Delete.h

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

include/Syncers/Download.h

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

include/Syncers/RetrieveRecords.h

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

include/Syncers/SyncerBase.h

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

include/Syncers/Upload.h

@@ -19,34 +19,36 @@ namespace fs = std::filesystem;
 
 namespace Syncers
 {
-    class Upload
+
+class Upload
+{
+public:
+    Upload(Models::API api, Models::Token token) : m_token(token), api(api)
     {
-        public:
-            Upload(Models::API api, Models::Token token) : m_token(token), api(api)
-            {
-                this->api.endpoint = "song/data";
-            }
+        this->api.endpoint = "song/data";
+    }
 
-            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;
+    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(const nlohmann::json&);
-    };
 }
 
 #endif