Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-22 05:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

First review code changes (identation and cosmetic changes)

Browse source
This commit is contained in:
Fernando Casas Schössow 2022-11-21 22:27:15 +01:00 committed by trzy
parent d11efb8553
commit 317f8bacde
3 changed files with 67 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Src/OSD/FileSystemPath.h
View file

@ -32,9 +32,9 @@
namespace FileSystemPath
{
enum fsPathType { Analysis, Config, Log, NVRAM, Saves, Screenshots }; // Filesystem path types
enum PathType { Analysis, Config, Log, NVRAM, Saves, Screenshots }; // Filesystem path types
bool PathExists(std::string fileSystemPath); // Checks if a directory exists (returns true if exists, false if it doesn't)
std::string GetPath(fsPathType pathType); // Generates a path to be used by Supermodel files
std::string GetPath(PathType pathType); // Generates a path to be used by Supermodel files
}

88
Src/OSD/Unix/FileSystemPath.cpp
View file

@ -45,45 +45,45 @@ namespace FileSystemPath
}
// Generates a path to be used by Supermodel files
std::string GetPath(fsPathType pathType)
std::string GetPath(PathType pathType)
{
std::string finalPath = "";
std::string homePath = "";
std::string strPathType = "";
struct passwd* pwd = getpwuid(getuid());
struct passwd* pwd = getpwuid(getuid());
// Resolve pathType to string for later use
switch (pathType)
{
case Analysis:
strPathType = "Analysis";
break;
case Config:
strPathType = "Config";
break;
case Log:
strPathType = "Log";
break;
case NVRAM:
strPathType = "NVRAM";
break;
case Saves:
strPathType = "Saves";
break;
case Screenshots:
strPathType = "Screenshots";
break;
case Analysis:
strPathType = "Analysis";
break;
case Config:
strPathType = "Config";
break;
case Log:
strPathType = "Log";
break;
case NVRAM:
strPathType = "NVRAM";
break;
case Saves:
strPathType = "Saves";
break;
case Screenshots:
strPathType = "Screenshots";
break;
}
// Get user's HOME directory
if (pwd)
{
homePath = pwd->pw_dir;
}
else
{
homePath = getenv("HOME");
}
if (pwd)
{
homePath = pwd->pw_dir;
}
else
{
homePath = getenv("HOME");
}
// If Config path exists in current directory or the user doesn't have a HOME directory use current directory
if (FileSystemPath::PathExists("Config") || homePath.empty())
@ -96,10 +96,12 @@ namespace FileSystemPath
else
{
// If directory doesn't exist, create it
if (!FileSystemPath::PathExists(strPathType)) mkdir(strPathType.c_str(), 0775);
if (!FileSystemPath::PathExists(strPathType))
{
mkdir(strPathType.c_str(), 0775);
}
finalPath = strPathType;
}
}
// Check if $HOME/.supermodel exists
else if (FileSystemPath::PathExists(Util::Format() << homePath << "/.supermodel"))
@ -120,25 +122,39 @@ namespace FileSystemPath
{
finalPath = Util::Format() << homePath << "/.config/supermodel";
// If directory doesn't exist, create it
if (!FileSystemPath::PathExists(finalPath)) mkdir(finalPath.c_str(), 0775);
if (!FileSystemPath::PathExists(finalPath))
{
mkdir(finalPath.c_str(), 0775);
}
// If directory doesn't exist, create it
finalPath = Util::Format() << homePath << "/.config/supermodel/Config";
if (!FileSystemPath::PathExists(finalPath)) mkdir(finalPath.c_str(), 0775);
if (!FileSystemPath::PathExists(finalPath))
{
mkdir(finalPath.c_str(), 0775);
}
}
else
{
finalPath = Util::Format() << homePath << "/.local/share/supermodel";
// If directory doesn't exist, create it
if (!FileSystemPath::PathExists(finalPath)) mkdir(finalPath.c_str(), 0775);
if (!FileSystemPath::PathExists(finalPath))
{
mkdir(finalPath.c_str(), 0775);
}
// If directory doesn't exist, create it
finalPath = Util::Format() << homePath << "/.local/share/supermodel/" << strPathType;
if (!FileSystemPath::PathExists(finalPath)) mkdir(finalPath.c_str(), 0775);
if (!FileSystemPath::PathExists(finalPath))
{
mkdir(finalPath.c_str(), 0775);
}
}
}
if (finalPath != "") finalPath = Util::Format() << finalPath << "/";
if (finalPath != "")
{
finalPath = Util::Format() << finalPath << "/";
}
return finalPath;

26
Src/OSD/Windows/FileSystemPath.cpp
View file

@ -25,22 +25,22 @@
namespace FileSystemPath
{
// Generates a path to be used by Supermodel files
std::string GetPath(fsPathType pathType)
std::string GetPath(PathType pathType)
{
switch (pathType)
{
case Analysis:
return "Analysis/";
case Config:
return "Config/";
case Log:
return "";
case NVRAM:
return "NVRAM/";
case Saves:
return "Saves/";
case Screenshots:
return "";
case Analysis:
return "Analysis/";
case Config:
return "Config/";
case Log:
return "";
case NVRAM:
return "NVRAM/";
case Saves:
return "Saves/";
case Screenshots:
return "";
}
}
}