Added Utility and Type namespaces

This commit is contained in:
kdeng00
2019-09-01 16:56:52 -04:00
parent 1ec3511bc5
commit dfd4906371
30 changed files with 233 additions and 59 deletions
+5
View File
@@ -0,0 +1,5 @@
#include "managers/albumManager.h"
Manager::albumManager::albumManager(const Model::BinaryPath& bConf)
: m_bConf(bConf)
{ }
+5
View File
@@ -0,0 +1,5 @@
#include "managers/artistManager.h"
Manager::artistManager::artistManager(const Model::BinaryPath& bConf)
: m_bConf(bConf)
{ }
+2 -2
View File
@@ -13,7 +13,7 @@ Manager::coverArtManager::coverArtManager(const Model::BinaryPath& bConf) : m_bC
Model::Cover Manager::coverArtManager::saveCover(const Model::Song& song, std::string& rootPath, const std::string& stockCoverPath)
{
metadata_retriever meta;
Utility::metadata_retriever meta;
Model::Cover cov;
cov.imagePath = rootPath;
cov = meta.update_cover_art(song, cov, stockCoverPath);
@@ -23,7 +23,7 @@ Model::Cover Manager::coverArtManager::saveCover(const Model::Song& song, std::s
std::cout << "saving record to the database" << std::endl;
covRepo.saveRecord(cov);
std::cout << "retrieving record from database" << std::endl;
cov = covRepo.retrieveRecord(cov, coverFilter::songTitle);
cov = covRepo.retrieveRecord(cov, Type::coverFilter::songTitle);
return cov;
}
+5
View File
@@ -0,0 +1,5 @@
#include "managers/genreManager.h"
Manager::genreManager::genreManager(const Model::BinaryPath& bConf)
: m_bConf(bConf)
{ }
+3 -3
View File
@@ -26,7 +26,7 @@ Manager::song_manager::song_manager(const Model::BinaryPath& bConf)
void Manager::song_manager::saveSong(Model::Song& song)
{
saveSongTemp(song);
metadata_retriever meta;
Utility::metadata_retriever meta;
auto data = std::move(song.data);
song = meta.retrieve_metadata(song.songPath);
song.data = std::move(data);
@@ -62,12 +62,12 @@ void Manager::song_manager::deleteSong(Model::Song& song)
Database::coverArtRepository covRepo(m_bConf);
Database::songRepository songRepo(m_bConf);
song = songRepo.retrieveRecord(song, songFilter::id);
song = songRepo.retrieveRecord(song, Type::songFilter::id);
songRepo.deleteRecord(song);
Model::Cover cov;
cov.id = song.coverArtId;
cov = covRepo.retrieveRecord(cov, coverFilter::id);
cov = covRepo.retrieveRecord(cov, Type::coverFilter::id);
covRepo.deleteRecord(cov);
auto paths = Manager::directory_manager::pathConfigContent(m_bConf);
+3 -3
View File
@@ -86,7 +86,7 @@ Model::loginResult Manager::token_manager::retrieve_token(const Model::BinaryPat
return lr;
}
bool Manager::token_manager::is_token_valid(std::string& auth, Scope scope)
bool Manager::token_manager::is_token_valid(std::string& auth, Type::Scope scope)
{
auto authPair = fetch_auth_header(auth);
@@ -103,10 +103,10 @@ bool Manager::token_manager::is_token_valid(std::string& auth, Scope scope)
auto scopes = extract_scopes(jwt::decode(token));
switch (scope) {
case Scope::upload:
case Type::Scope::upload:
return token_supports_scope(scopes, "upload:songs");
break;
case Scope::download:
case Type::Scope::download:
return token_supports_scope(scopes, "download:songs");
default:
break;
+5
View File
@@ -0,0 +1,5 @@
#include "managers/yearManager.h"
Manager::yearManager::yearManager(const Model::BinaryPath& bConf)
: m_bConf(bConf)
{ }