iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for personal mpd collection

Browse Source
This commit is contained in:
craig.p.drummond
2013-09-24 18:33:25 +00:00
committed by craig.p.drummond
parent c57034dcaf
commit 5adcd33786
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/serversettings.cpp
View File

@@ -136,13 +136,14 @@ void ServerSettings::load()
combo->clear();
int idx=0;
haveBasicCollection=false;
foreach (const MPDConnectionDetails &d, all) {
foreach (MPDConnectionDetails d, all) {
combo->addItem(d.getName(), d.name);
if (d.name==currentCon) {
prevIndex=idx;
}
idx++;
if (d.name==MPDUser::constName) {
d.dir=MPDUser::self()->details().dir;
haveBasicCollection=true;
prevBasic=d;
}
@@ -366,6 +367,7 @@ MPDConnectionDetails ServerSettings::getDetails() const
details=MPDUser::self()->details(true);
details.dir=basicDir->text().trimmed();
details.coverName=basicCoverName->text().trimmed();
MPDUser::self()->setMusicFolder(details.dir);
}
details.dirReadable=details.dir.isEmpty() ? false : QDir(details.dir).isReadable();
return details;

9
mpd/mpduser.cpp
View File

@@ -135,6 +135,7 @@ void MPDUser::setMusicFolder(const QString &folder)
if (folder==det.dir) {
return;
}
init(true);
QFile cfgFile(Utils::configDir(constDir, true)+constConfigFile);
QStringList lines;
@@ -247,7 +248,7 @@ void MPDUser::cleanup()
void MPDUser::init(bool create)
{
if (det.dir.isEmpty() || det.hostname.isEmpty() || pidFileName.isEmpty()) {
if (create || det.dir.isEmpty() || det.hostname.isEmpty() || pidFileName.isEmpty()) {
// Read coverFileName from Cantata settings...
det.coverName=Settings::self()->connectionDetails(constName).coverName;
det.dirReadable=false;
@@ -339,7 +340,11 @@ int MPDUser::getPid()
bool MPDUser::controlMpd(bool stop)
{
QStringList args=QStringList() << Utils::configDir(constDir, true)+constConfigFile;
QString confFile=Utils::configDir(constDir, true)+constConfigFile;
if (!QFile::exists(confFile)) {
return false;
}
QStringList args=QStringList() << confFile;
if (stop) {
args+="--kill";
}