Follow XDG Base Directory Specification

[aria2]

Follow XDG Base Directory Specification

[wasamasa]

Here's a patch to make use of XDG for the config file:

3 files changed, 22 insertions(+), 1 deletion(-)
 src/OptionHandlerFactory.cc |  2 +-
 src/util.cc                 | 17 +++++++++++++++++
 src/util.h                  |  4 ++++

    Modified   src/OptionHandlerFactory.cc
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index 768d847..077fc4f 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -174,7 +174,7 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
     OptionHandler* op(new DefaultOptionHandler
                       (PREF_CONF_PATH,
                        TEXT_CONF_PATH,
-                       util::getHomeDir()+"/.aria2/aria2.conf",
+                       util::getConfigFile(),
                        PATH_TO_FILE));
     op->addTag(TAG_ADVANCED);
     handlers.push_back(op);
    Modified   src/util.cc
diff --git a/src/util.cc b/src/util.cc
index 68310aa..16a9ab0 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1336,6 +1336,23 @@ std::string getHomeDir()
 }
 #endif // __MINGW32__

+std::string getXDGConfigHomeDir()
+{
+  const char* p = getenv("XDG_CONFIG_HOME");
+  if (p) {
+    return p;
+  }
+  return getHomeDir()+"/.config";
+}
+
+std::string getConfigFile() {
+  std::string filename = getXDGConfigHomeDir() + "/aria2/aria2.conf";
+  if (File(filename).exists()) {
+    return filename;
+  }
+  return getHomeDir()+"/.aria2/aria2.conf";
+}
+
 int64_t getRealSize(const std::string& sizeWithUnit)
 {
   std::string::size_type p = sizeWithUnit.find_first_of("KMkm");
    Modified   src/util.h
diff --git a/src/util.h b/src/util.h
index 6e5eb8c..a71dbaf 100644
--- a/src/util.h
+++ b/src/util.h
@@ -349,6 +349,10 @@ void setGlobalSignalHandler(int signal, sigset_t* mask,

 std::string getHomeDir();

+std::string getXDGConfigHomeDir();
+
+std::string getConfigFile();
+
 int64_t getRealSize(const std::string& sizeWithUnit);

 std::string abbrevSize(int64_t size);

I'll have to look into corresponding changes for ~/.aria2/dht.dat. ~/.aria2/dht6.dat and the docs.

[tatsuhiro-t]

Thank you! This is awesome. Could you send PR for this once you finish the patch? We can discuss this in detail there.

[wasamasa]

See #395.

[tatsuhiro-t]

Fix committed, closing.