Implement JSON musiclist file loading
This commit is contained in:
Salanto
parent
9cdf1068ac
commit
5115b97721
203
bin/config_sample/music.json
Normal file
203
bin/config_sample/music.json
Normal file
@ -0,0 +1,203 @@
|
||||
[
|
||||
{
|
||||
"category":"==Music==",
|
||||
"songs":[
|
||||
{
|
||||
"name":"Announce The Truth (AA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Announce The Truth (AJ).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Announce The Truth (JFA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Announce The Truth (Miles).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Announce The Truth (T&T).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Confrontation ~ Presto 2009.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Crises of Fate.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Forgotten Legend.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Godot - The Fragrance of Dark Coffee.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Great Revival ~ Franziska von Karma.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Great Revival ~ Miles Edgeworth.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Hotline of Fate.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Interesting People.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Logic and Trick.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Luke Atmey ~ I Just Want Love.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Noisy People.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"OBJECTION (AA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Objection (AJ).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"OBJECTION (JFA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Objection (Miles).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"OBJECTION (T&T).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Others ~ Guilty love.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Prelude (AA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Prelude (AJ).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Prologue (AA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (AA) - variation.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (AA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (AJ).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (DS).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (JFA) - variation.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (JFA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (Miles).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (T&T) - variation.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit (T&T).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Pursuit ~ I Want to Find the Truth(Orchestra).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning AA (Allegro).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning AA (Moderato).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning AJ (Allegro).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning AJ (Moderato).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning JFA (Allegro).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning JFA (Moderato).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning T&T (Allegro).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Questioning T&T (Moderato).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Speak up Pup.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Suspense (AA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"The Great Truth Burglar.opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Trial (AA).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Trial (AJ).opus",
|
||||
"length":-1
|
||||
},
|
||||
{
|
||||
"name":"Trial (Miles).opus",
|
||||
"length":-1
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -1,49 +0,0 @@
|
||||
Announce The Truth (AA).opus
|
||||
Announce The Truth (AJ).opus
|
||||
Announce The Truth (JFA).opus
|
||||
Announce The Truth (Miles).opus
|
||||
Announce The Truth (T&T).opus
|
||||
Confrontation ~ Presto 2009.opus
|
||||
Crises of Fate.opus
|
||||
Forgotten Legend.opus
|
||||
Godot - The Fragrance of Dark Coffee.opus
|
||||
Great Revival ~ Franziska von Karma.opus
|
||||
Great Revival ~ Miles Edgeworth.opus
|
||||
Hotline of Fate.opus
|
||||
Interesting People.opus
|
||||
Logic and Trick.opus
|
||||
Luke Atmey ~ I Just Want Love.opus
|
||||
Noisy People.opus
|
||||
OBJECTION (AA).opus
|
||||
Objection (AJ).opus
|
||||
OBJECTION (JFA).opus
|
||||
Objection (Miles).opus
|
||||
OBJECTION (T&T).opus
|
||||
Others ~ Guilty love.opus
|
||||
Prelude (AA).opus
|
||||
Prelude (AJ).opus
|
||||
Prologue (AA).opus
|
||||
Pursuit (AA) - variation.opus
|
||||
Pursuit (AA).opus
|
||||
Pursuit (AJ).opus
|
||||
Pursuit (DS).opus
|
||||
Pursuit (JFA) - variation.opus
|
||||
Pursuit (JFA).opus
|
||||
Pursuit (Miles).opus
|
||||
Pursuit (T&T) - variation.opus
|
||||
Pursuit (T&T).opus
|
||||
Pursuit ~ I Want to Find the Truth (Orchestra).opus
|
||||
Questioning AA (Allegro).opus
|
||||
Questioning AA (Moderato).opus
|
||||
Questioning AJ (Allegro).opus
|
||||
Questioning AJ (Moderato).opus
|
||||
Questioning JFA (Allegro).opus
|
||||
Questioning JFA (Moderato).opus
|
||||
Questioning T&T (Allegro).opus
|
||||
Questioning T&T (Moderato).opus
|
||||
Speak up Pup.opus
|
||||
Suspense (AA).opus
|
||||
The Great Truth Burglar.opus
|
||||
Trial (AA).opus
|
||||
Trial (AJ).opus
|
||||
Trial (Miles).opus
|
||||
@ -31,6 +31,11 @@
|
||||
#include <QMetaEnum>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
//JSON loading requirements
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
|
||||
/**
|
||||
* @brief The config file handler class.
|
||||
*/
|
||||
@ -73,10 +78,18 @@ class ConfigManager {
|
||||
static QStringList musiclist();
|
||||
|
||||
/**
|
||||
* @brief Returns the content of
|
||||
* @return
|
||||
* @brief Returns the duration of a song in the songlist.
|
||||
* @param The name of the song where duration is requested
|
||||
* @return The duration of the song
|
||||
*/
|
||||
static QSettings *areaData();
|
||||
static int songInformation(const QString& f_songName);
|
||||
|
||||
/**
|
||||
* @brief Returns the content of
|
||||
*
|
||||
* @return See short description.
|
||||
*/
|
||||
static QSettings* areaData();
|
||||
|
||||
/**
|
||||
* @brief Returns a sanitized QStringList of the areas.
|
||||
@ -91,6 +104,7 @@ class ConfigManager {
|
||||
* @return See short description.
|
||||
*/
|
||||
static QStringList rawAreaNames();
|
||||
|
||||
/**
|
||||
* @brief Returns true if the server should advertise to the master server.
|
||||
*
|
||||
@ -481,6 +495,11 @@ private:
|
||||
*/
|
||||
static QElapsedTimer* m_uptimeTimer;
|
||||
|
||||
/**
|
||||
* @brief Contains the musiclist with time durations.
|
||||
*/
|
||||
static QHash<QString,float>* m_musicList;
|
||||
|
||||
/**
|
||||
* @brief Returns a stringlist with the contents of a .txt file from config/text/.
|
||||
*
|
||||
|
||||
@ -24,6 +24,7 @@ QSettings* ConfigManager::m_discord = new QSettings("config/discord.ini", QSetti
|
||||
QSettings* ConfigManager::m_areas = new QSettings("config/areas.ini", QSettings::IniFormat);
|
||||
ConfigManager::CommandSettings* ConfigManager::m_commands = new CommandSettings();
|
||||
QElapsedTimer* ConfigManager::m_uptimeTimer = new QElapsedTimer;
|
||||
QHash<QString,float>* ConfigManager::m_musicList = new QHash<QString,float>;
|
||||
|
||||
bool ConfigManager::verifyServerConfig()
|
||||
{
|
||||
@ -127,16 +128,52 @@ QStringList ConfigManager::backgrounds()
|
||||
|
||||
QStringList ConfigManager::musiclist()
|
||||
{
|
||||
QStringList l_music_list;
|
||||
QFile l_file("config/music.txt");
|
||||
l_file.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
while (!l_file.atEnd()) {
|
||||
l_music_list.append(l_file.readLine().trimmed());
|
||||
QFile l_music_json("config/music.json");
|
||||
l_music_json.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
|
||||
QJsonParseError l_error;
|
||||
QJsonDocument l_music_list_json = QJsonDocument::fromJson(l_music_json.readAll(), &l_error);
|
||||
if (!(l_error.error == QJsonParseError::NoError)) { //Non-Terminating error.
|
||||
qWarning() << "Unable to load musiclist. The following error was encounted : " + l_error.errorString();
|
||||
return QStringList {}; //Server can still run without music.
|
||||
}
|
||||
l_file.close();
|
||||
if(l_music_list[0].contains(".")) // Add a default category if none exists
|
||||
l_music_list.insert(0, "==Music==");
|
||||
return l_music_list;
|
||||
|
||||
// Akashi expects the musiclist to be contained in a JSON array, even if its only a single category.
|
||||
QJsonArray l_Json_root_array = l_music_list_json.array();
|
||||
QJsonObject l_child_obj;
|
||||
QJsonArray l_child_array;
|
||||
for (int i = 0; i <= l_Json_root_array.size() -1; i++){ //Iterate trough entire JSON file to assemble musiclist
|
||||
l_child_obj = l_Json_root_array.at(i).toObject();
|
||||
|
||||
//Technically not a requirement, but neat for organisation.
|
||||
QString l_category_name = l_child_obj["category"].toString();
|
||||
if (!l_category_name.isEmpty()) {
|
||||
m_musicList->insert(l_category_name,0);
|
||||
}
|
||||
else {
|
||||
qWarning() << "Category name not set. This may cause the musiclist to be displayed incorrectly.";
|
||||
}
|
||||
|
||||
l_child_array = l_child_obj["songs"].toArray();
|
||||
for (int i = 0; i <= l_child_array.size() -1; i++){ // Inner for loop because a category can contain multiple songs.
|
||||
QJsonObject l_song_obj = l_child_array.at(i).toObject();
|
||||
QString l_song_name = l_song_obj["name"].toString();
|
||||
int l_song_duration = l_song_obj["length"].toVariant().toFloat();
|
||||
m_musicList->insert(l_song_name,l_song_duration);
|
||||
}
|
||||
}
|
||||
l_music_json.close();
|
||||
|
||||
QStringList l_musiclist = m_musicList->keys();
|
||||
if(!l_musiclist[0].contains("==")) // Add a default category if none exists
|
||||
l_musiclist.insert(0,"==Music==");
|
||||
|
||||
return l_musiclist;
|
||||
}
|
||||
|
||||
int ConfigManager::songInformation(const QString &f_songName)
|
||||
{
|
||||
return m_musicList->value(f_songName);
|
||||
}
|
||||
|
||||
QSettings* ConfigManager::areaData()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user