Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-16 19:31:02 +01:00
Code Issues Releases Wiki Activity

Respect XDG_CACHE_HOME for network & moodbar cache.

Browse Source 
Fixes issue #3264
This commit is contained in:
John Maguire 2012-11-06 15:38:15 +01:00
parent 4fd45e0028
commit 0822482b4d
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/core/utilities.cpp
View File

@ -15,27 +15,32 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/
#include "timeconstants.h"
#include "utilities.h"
#include "core/logging.h"
#include "sha2.h"
#include <stdlib.h>
#include <boost/scoped_array.hpp>
#include <QApplication>
#include <QDateTime>
#include <QDesktopServices>
#include <QDir>
#include <QIODevice>
#include <QMetaEnum>
#include <QMouseEvent>
#include <QStringList>
#include <QTcpServer>
#include <QtDebug>
#include <QTemporaryFile>
#include <QtGlobal>
#include <QUrl>
#include <QWidget>
#include <QXmlStreamReader>
#include <QtDebug>
#include <QtGlobal>
#include <QMetaEnum>
#include "core/logging.h"
#include "timeconstants.h"
#include "sha2.h"
#if defined(Q_OS_UNIX)
# include <sys/statvfs.h>
@ -59,8 +64,6 @@
# include "IOKit/ps/IOPSKeys.h"
#endif
#include <boost/scoped_array.hpp>
namespace Utilities {
static QString tr(const char* str) {
@ -290,14 +293,28 @@ QString GetConfigPath(ConfigPath config) {
}
break;
case Path_CacheRoot: {
#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
char* xdg = getenv("XDG_CACHE_HOME");
if (!xdg || !*xdg) {
return QString("%1/.cache/%2").arg(QDir::homePath(), QCoreApplication::organizationName());
} else {
return QString("%1/%2").arg(xdg, QCoreApplication::organizationName());
}
#else
return GetConfigPath(Path_Root);
#endif
}
break;
case Path_AlbumCovers:
return GetConfigPath(Path_Root) + "/albumcovers";
case Path_NetworkCache:
return GetConfigPath(Path_Root) + "/networkcache";
return GetConfigPath(Path_CacheRoot) + "/networkcache";
case Path_MoodbarCache:
return GetConfigPath(Path_Root) + "/moodbarcache";
return GetConfigPath(Path_CacheRoot) + "/moodbarcache";
case Path_GstreamerRegistry:
return GetConfigPath(Path_Root) +

1
src/core/utilities.h
View File

@ -110,6 +110,7 @@ namespace Utilities {
Path_DefaultMusicLibrary,
Path_LocalSpotifyBlob,
Path_MoodbarCache,
Path_CacheRoot,
};
QString GetConfigPath(ConfigPath config);