mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 00:57:44 -04:00
Format using clang-format
This commit is contained in:
parent
9f1d6792e2
commit
efe94dca79
|
@ -1,13 +1,13 @@
|
||||||
#include "FileUtil.h"
|
#include "FileUtil.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <stdio.h> /* defines FILENAME_MAX */
|
#include <stdio.h> /* defines FILENAME_MAX */
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <direct.h>
|
#include <direct.h>
|
||||||
#define GetCurrentDir _getcwd
|
#define GetCurrentDir _getcwd
|
||||||
#else
|
#else
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#define GetCurrentDir getcwd
|
#define GetCurrentDir getcwd
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::string FileUtil::GetCurrentWorkingDir() {
|
std::string FileUtil::GetCurrentWorkingDir() {
|
||||||
|
@ -17,20 +17,20 @@ std::string FileUtil::GetCurrentWorkingDir() {
|
||||||
return current_working_dir;
|
return current_working_dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string FileUtil::get_file_path(std::vector<std::string> input) {
|
std::string FileUtil::get_file_path(const std::vector<std::string>& input) {
|
||||||
std::string currentPath = FileUtil::GetCurrentWorkingDir(); // std::filesystem::current_path();
|
std::string currentPath = FileUtil::GetCurrentWorkingDir(); // std::filesystem::current_path();
|
||||||
char dirSeparator;
|
char dirSeparator;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
dirSeparator = '\\';
|
dirSeparator = '\\';
|
||||||
#else
|
#else
|
||||||
dirSeparator = '/';
|
dirSeparator = '/';
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
std::string filePath = currentPath;
|
std::string filePath = currentPath;
|
||||||
for (int i = 0; i < input.size(); i++) {
|
for (int i = 0; i < input.size(); i++) {
|
||||||
filePath = filePath + dirSeparator + input[i];
|
filePath = filePath + dirSeparator + input[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
return filePath;
|
return filePath;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace FileUtil
|
namespace FileUtil {
|
||||||
{
|
std::string GetCurrentWorkingDir();
|
||||||
std::string GetCurrentWorkingDir();
|
std::string get_file_path(std::vector<std::string> input);
|
||||||
std::string get_file_path(std::vector<std::string> input);
|
} // namespace FileUtil
|
||||||
}
|
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
TEST(FileUtil, valid_path) {
|
TEST(FileUtil, valid_path) {
|
||||||
|
|
||||||
std::vector<std::string> test = {"cabbage", "banana", "apple"};
|
std::vector<std::string> test = {"cabbage", "banana", "apple"};
|
||||||
std::string sampleString = FileUtil::get_file_path(test);
|
std::string sampleString = FileUtil::get_file_path(test);
|
||||||
// std::cout << sampleString << std::endl;
|
// std::cout << sampleString << std::endl;
|
||||||
|
|
Loading…
Reference in a new issue