Add ArgsManager.GetDataDirBase() and ArgsManager.GetDataDirNet() as an intended replacement for ArgsManager.GetDataDirPath(net_identifier)

kiminuo · kiminuo · commit 0f53df47d5b8 · 2021-05-24T10:29:55.000+02:00
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -404,7 +404,7 @@ const fs::path& ArgsManager::GetBlocksDirPath() const
             return path;
         }
     } else {
-        path = GetDataDirPath(false);
+        path = GetDataDirBase();
     }
 
     path /= BaseParams().DataDir();
@@ -513,7 +513,7 @@ bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp) const
     }
     if (filepath) {
         std::string settings = GetArg("-settings", BITCOIN_SETTINGS_FILENAME);
-        *filepath = fsbridge::AbsPathJoin(GetDataDirPath(/* net_specific= */ true), temp ? settings + ".tmp" : settings);
+        *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), temp ? settings + ".tmp" : settings);
     }
     return true;
 }
@@ -804,7 +804,7 @@ fs::path GetDefaultDataDir()
 
 const fs::path &GetDataDir(bool fNetSpecific)
 {
-    return gArgs.GetDataDirPath(fNetSpecific);
+    return fNetSpecific ? gArgs.GetDataDirNet() : gArgs.GetDataDirBase();
 }
 
 bool CheckDataDirOption()
@@ -1361,7 +1361,7 @@ fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific)
     if (path.is_absolute()) {
         return path;
     }
-    return fsbridge::AbsPathJoin(GetDataDir(net_specific), path);
+    return fsbridge::AbsPathJoin(net_specific ? gArgs.GetDataDirNet() : gArgs.GetDataDirBase(), path);
 }
 
 void ScheduleBatchPriority()
diff --git a/src/util/system.h b/src/util/system.h
@@ -119,7 +119,7 @@ UniValue RunCommandParseJSON(const std::string& str_command, const std::string&
  * the datadir if they are not absolute.
  *
  * @param path The path to be conditionally prefixed with datadir.
- * @param net_specific Forwarded to GetDataDir().
+ * @param net_specific Use network specific datadir variant
  * @return The normalized path.
  */
 fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific = true);
@@ -268,6 +268,22 @@ class ArgsManager
      */
     const fs::path& GetBlocksDirPath() const;
 
+    /**
+     * Get data directory path
+     *
+     * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
+     * @post Returned directory path is created unless it is empty
+     */
+    const fs::path& GetDataDirBase() const { return GetDataDirPath(false); }
+
+    /**
+     * Get data directory path with appended network identifier
+     *
+     * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
+     * @post Returned directory path is created unless it is empty
+     */
+    const fs::path& GetDataDirNet() const { return GetDataDirPath(true); }
+
     /**
      * Get data directory path
      *

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ const fs::path& ArgsManager::GetBlocksDirPath() const`
`404`	`404`	`return path;`
`405`	`405`	`}`
`406`	`406`	`} else {`
`407`		`- path = GetDataDirPath(false);`
	`407`	`+ path = GetDataDirBase();`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`path /= BaseParams().DataDir();`
`@@ -513,7 +513,7 @@ bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp) const`
`513`	`513`	`}`
`514`	`514`	`if (filepath) {`
`515`	`515`	`std::string settings = GetArg("-settings", BITCOIN_SETTINGS_FILENAME);`
`516`		`- filepath = fsbridge::AbsPathJoin(GetDataDirPath(/ net_specific= */ true), temp ? settings + ".tmp" : settings);`
	`516`	`+ *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), temp ? settings + ".tmp" : settings);`
`517`	`517`	`}`
`518`	`518`	`return true;`
`519`	`519`	`}`
`@@ -804,7 +804,7 @@ fs::path GetDefaultDataDir()`
`804`	`804`
`805`	`805`	`const fs::path &GetDataDir(bool fNetSpecific)`
`806`	`806`	`{`
`807`		`- return gArgs.GetDataDirPath(fNetSpecific);`
	`807`	`+ return fNetSpecific ? gArgs.GetDataDirNet() : gArgs.GetDataDirBase();`
`808`	`808`	`}`
`809`	`809`
`810`	`810`	`bool CheckDataDirOption()`
`@@ -1361,7 +1361,7 @@ fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific)`
`1361`	`1361`	`if (path.is_absolute()) {`
`1362`	`1362`	`return path;`
`1363`	`1363`	`}`
`1364`		`- return fsbridge::AbsPathJoin(GetDataDir(net_specific), path);`
	`1364`	`+ return fsbridge::AbsPathJoin(net_specific ? gArgs.GetDataDirNet() : gArgs.GetDataDirBase(), path);`
`1365`	`1365`	`}`
`1366`	`1366`
`1367`	`1367`	`void ScheduleBatchPriority()`