From 0822482b4d1af6c773b45e66f14bff445276a347 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Tue, 6 Nov 2012 15:38:15 +0100
Subject: [PATCH] Respect XDG_CACHE_HOME for network & moodbar cache. Fixes
 issue #3264

---
 src/core/utilities.cpp | 39 ++++++++++++++++++++++++++++-----------
 src/core/utilities.h   |  1 +
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index c6996d5df..101638a17 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -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) +
diff --git a/src/core/utilities.h b/src/core/utilities.h
index 93bdd8962..225842962 100644
--- a/src/core/utilities.h
+++ b/src/core/utilities.h
@@ -110,6 +110,7 @@ namespace Utilities {
     Path_DefaultMusicLibrary,
     Path_LocalSpotifyBlob,
     Path_MoodbarCache,
+    Path_CacheRoot,
   };
   QString GetConfigPath(ConfigPath config);