Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved error message in webui: show full path of file if read failed

Browse source
This commit is contained in:
electron128 2015-07-30 14:00:48 +02:00 • committed by cave beat
parent 9897def2cc
commit ff9bf71aa8
4 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/rsserver/rsaccounts.cc
View file

@ -743,7 +743,7 @@ static bool checkAccount(std::string accountdir, AccountDetails &account,std::ma
//#include <CFBundle.h>
#endif
/*static*/ std::string RsAccountsDetail::PathDataDirectory()
/*static*/ std::string RsAccountsDetail::PathDataDirectory(bool check)
{
std::string dataDirectory;
@ -809,6 +809,9 @@ static bool checkAccount(std::string accountdir, AccountDetails &account,std::ma
#endif
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
if(!check)
return dataDirectory;
/* Make sure the directory exists, else return emptyString */
if (!RsDirUtil::checkDirectory(dataDirectory))
{
@ -1246,7 +1249,7 @@ bool RsInit::LoadPassword(const std::string& id, const std::string& inPwd)
// Directories.
std::string RsAccounts::ConfigDirectory() { return rsAccounts->PathBaseDirectory(); }
std::string RsAccounts::DataDirectory() { return RsAccountsDetail::PathDataDirectory(); }
std::string RsAccounts::DataDirectory(bool check) { return RsAccountsDetail::PathDataDirectory(check); }
std::string RsAccounts::PGPDirectory() { return rsAccounts->PathPGPDirectory(); }
std::string RsAccounts::AccountDirectory() { return rsAccounts->PathAccountDirectory(); }

7
libretroshare/src/rsserver/rsaccounts.h
View file

@ -74,7 +74,12 @@ class RsAccountsDetail
bool checkAccountDirectory();
// Paths.
static std::string PathDataDirectory();
/**
* @brief PathDataDirectory
* @param check if set to true and directory does not exist, return empty string
* @return path where global platform independent files are stored, like bdboot.txt or webinterface files
*/
static std::string PathDataDirectory(bool check = true);
std::string PathBaseDirectory();
// PGP Path is only dependent on BaseDirectory.