AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert incompatible change to Unix wxStandardPaths::GetUserDir()

Browse Source 
There is no reason to break the behaviour of the existing code, which doesn't
call SetFileLayout(FileLayout_XDG), by not returning the correct directories
from GetUserDir(Dir_Downloads) and similar any longer.
This commit is contained in:
Vadim Zeitlin 2017-03-09 17:56:45 +01:00
parent 5cf9fcbb1a
commit a44b61e976
1 changed files with 65 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/unix/stdpaths.cpp
View File

@ -251,81 +251,77 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxString& lang,
wxString wxStandardPaths::GetUserDir(Dir userDir) const wxString wxStandardPaths::GetUserDir(Dir userDir) const
{ {
switch ( GetFileLayout() ) // Note that we do not use the file layout here because there is no reason
// not to respect the XDG convention even if SetFileLayout(FileLayout_XDG)
// hadn't been called: we're not bound by any backwards compatibility
// considerations as there can't be any pre-existing config or data files
// in the home directory that wouldn't be found any longer after updating
// the version of wxWidgets used by the application.
wxLogNull logNull;
wxString homeDir = wxFileName::GetHomeDir();
if (userDir == Dir_Cache)
{ {
case FileLayout_Classic: if (wxGetenv(wxT("XDG_CACHE_HOME")))
// Fall back to the base class below. return wxGetenv(wxT("XDG_CACHE_HOME"));
break; else
return homeDir + wxT("/.cache");
}
case FileLayout_XDG: wxString configPath;
if (wxGetenv(wxT("XDG_CONFIG_HOME")))
configPath = wxGetenv(wxT("XDG_CONFIG_HOME"));
else
configPath = homeDir + wxT("/.config");
wxString dirsFile = configPath + wxT("/user-dirs.dirs");
if (wxFileExists(dirsFile))
{
wxString userDirId;
switch (userDir)
{
case Dir_Desktop:
userDirId = "XDG_DESKTOP_DIR";
break;
case Dir_Downloads:
userDirId = "XDG_DOWNLOAD_DIR";
break;
case Dir_Music:
userDirId = "XDG_MUSIC_DIR";
break;
case Dir_Pictures:
userDirId = "XDG_PICTURES_DIR";
break;
case Dir_Videos:
userDirId = "XDG_VIDEOS_DIR";
break;
default:
userDirId = "XDG_DOCUMENTS_DIR";
break;
}
wxTextFile textFile;
if (textFile.Open(dirsFile))
{
size_t i;
for (i = 0; i < textFile.GetLineCount(); i++)
{ {
wxLogNull logNull; wxString line(textFile[i]);
wxString homeDir = wxFileName::GetHomeDir(); int pos = line.Find(userDirId);
if (userDir == Dir_Cache) if (pos != wxNOT_FOUND)
{ {
if (wxGetenv(wxT("XDG_CACHE_HOME"))) wxString value = line.AfterFirst(wxT('='));
return wxGetenv(wxT("XDG_CACHE_HOME")); value.Replace(wxT("$HOME"), homeDir);
else value.Trim(true);
return homeDir + wxT("/.cache"); value.Trim(false);
} // Remove quotes
value.Replace("\"", "", true /* replace all */);
wxString configPath; if (!value.IsEmpty() && wxDirExists(value))
if (wxGetenv(wxT("XDG_CONFIG_HOME"))) return value;
configPath = wxGetenv(wxT("XDG_CONFIG_HOME")); else
else break;
configPath = homeDir + wxT("/.config");
wxString dirsFile = configPath + wxT("/user-dirs.dirs");
if (wxFileExists(dirsFile))
{
wxString userDirId;
switch (userDir)
{
case Dir_Desktop:
userDirId = "XDG_DESKTOP_DIR";
break;
case Dir_Downloads:
userDirId = "XDG_DOWNLOAD_DIR";
break;
case Dir_Music:
userDirId = "XDG_MUSIC_DIR";
break;
case Dir_Pictures:
userDirId = "XDG_PICTURES_DIR";
break;
case Dir_Videos:
userDirId = "XDG_VIDEOS_DIR";
break;
default:
userDirId = "XDG_DOCUMENTS_DIR";
break;
}
wxTextFile textFile;
if (textFile.Open(dirsFile))
{
size_t i;
for (i = 0; i < textFile.GetLineCount(); i++)
{
wxString line(textFile[i]);
int pos = line.Find(userDirId);
if (pos != wxNOT_FOUND)
{
wxString value = line.AfterFirst(wxT('='));
value.Replace(wxT("$HOME"), homeDir);
value.Trim(true);
value.Trim(false);
// Remove quotes
value.Replace("\"", "", true /* replace all */);
if (!value.IsEmpty() && wxDirExists(value))
return value;
else
break;
}
}
}
} }
} }
break; }
} }
return wxStandardPathsBase::GetUserDir(userDir); return wxStandardPathsBase::GetUserDir(userDir);