Page MenuHomePhabricator (Chris)
Files F126858

No OneTemporary
Actions

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/file-system.cpp b/util/file-system.cpp
index 34fad1fe..2348429b 100644
--- a/util/file-system.cpp
+++ b/util/file-system.cpp
@@ -1,146 +1,173 @@
#include "funcs.h"
#include "file-system.h"
#include "system.h"
#include <dirent.h>
#include <sstream>
#include <exception>
#include <string>
+#ifdef _WIN32
+#define _WIN32_IE 0x400
+#include <shlobj.h>
+#endif
+
using namespace std;
namespace Filesystem{
NotFound::NotFound(const std::string & file):
exception(),
reason(file){
}
NotFound::~NotFound() throw(){
}
-/* FIXME: need a better solution on windows. getenv("HOME") will most likely
- * return NULL on windows which will turn into '0' in the string.
- * use the special directory thing from configuration.cpp
- */
-static string userDirectory(){
+#ifdef _WIN32
+string userDirectory(){
+ ostringstream str;
+ char path[MAX_PATH];
+ SHGetSpecialFolderPathA(0, path, CSIDL_APPDATA, false);
+ str << path << "/paintown/";
+ return str.str();
+}
+
+string configFile(){
+ ostringstream str;
+ char path[MAX_PATH];
+ SHGetSpecialFolderPathA(0, path, CSIDL_APPDATA, false);
+ str << path << "/paintown_configuration.txt";
+ return str.str();
+}
+#else
+string configFile(){
+ ostringstream str;
+ /* what if HOME isn't set? */
+ str << getenv("HOME") << "/.paintownrc";
+ return str.str();
+}
+
+string userDirectory(){
ostringstream str;
+ /* what if HOME isn't set? */
str << getenv("HOME") << "/.paintown/";
return str.str();
}
+#endif
static string lookup(const std::string & path) throw (NotFound){
/* first try the main data directory */
string final = Util::getDataPath2() + path;
if (System::readable(final)){
return final;
}
/* then try the user directory, like ~/.paintown */
final = userDirectory() + path;
if (System::readable(final)){
return final;
}
/* then just look in the cwd */
if (System::readable(path)){
return path;
}
throw NotFound("Cannot find " + path);
}
static vector<string> findDirectoriesIn(const std::string & path){
vector<string> dirs;
DIR * dir = opendir(path.c_str());
if (dir == NULL){
return dirs;
}
struct dirent * entry = readdir(dir);
while (entry != NULL){
string total = path + "/" + entry->d_name;
if (System::isDirectory(total)){
dirs.push_back(total);
}
entry = readdir(dir);
}
closedir(dir);
return dirs;
}
vector<string> findDirectories(const std::string & path){
vector<string> dirs;
vector<string> main_dirs = findDirectoriesIn(Util::getDataPath2() + path);
vector<string> user_dirs = findDirectoriesIn(userDirectory() + path);
vector<string> here_dirs = findDirectoriesIn(path);
dirs.insert(dirs.end(), main_dirs.begin(), main_dirs.end());
dirs.insert(dirs.end(), user_dirs.begin(), user_dirs.end());
dirs.insert(dirs.end(), here_dirs.begin(), here_dirs.end());
return dirs;
}
/* remove extra path separators (/) */
static string sanitize(string path){
size_t double_slash = path.find("//");
while (double_slash != string::npos){
path.erase(double_slash, 1);
double_slash = path.find("//");
}
return path;
}
std::string find(const std::string path) throw (NotFound){
if (path.length() == 0){
throw NotFound("No path given");
}
if (path[0] == '/'){
string str(path);
str.erase(0, 1);
string out = lookup(str);
if (System::isDirectory(out)){
return sanitize(out + "/");
}
return sanitize(out);
}
string out = lookup(path);
if (System::isDirectory(out)){
return sanitize(out + "/");
}
return sanitize(out);
}
std::string cleanse(const std::string & path){
string str = path;
if (str.find(Util::getDataPath2()) == 0){
str.erase(0, Util::getDataPath2().length());
} else if (str.find(userDirectory()) == 0){
str.erase(0, userDirectory().length());
}
return str;
}
std::string stripDir(const std::string & str){
std::string temp = str;
if (str.find( "/") != std::string::npos || str.find( "\\") != std::string::npos){
size_t rem = temp.find_last_of( "/" );
if (rem != std::string::npos){
return str.substr(rem+1,str.size());
}
rem = temp.find_last_of( "\\" );
if( rem != std::string::npos ){
return str.substr(rem+1,str.size());
}
}
return str;
}
std::string removeExtension(const std::string & str){
if (str.find(".") != std::string::npos){
return str.substr(0, str.find_last_of("."));
}
return str;
}
}
diff --git a/util/file-system.h b/util/file-system.h
index fea928bd..4d2c906e 100644
--- a/util/file-system.h
+++ b/util/file-system.h
@@ -1,55 +1,61 @@
#ifndef _paintown_file_system_h
#define _paintown_file_system_h
#include <exception>
#include <string>
#include <vector>
namespace Filesystem{
class NotFound: public std::exception {
public:
NotFound(const std::string & file);
virtual ~NotFound() throw();
const std::string & getReason() const {
return reason;
}
private:
std::string reason;
};
/* relative path should not have the leading data directory on it, just
* the path within the paintown system.
*/
class RelativePath{
};
/* absolute paths should have the entire filesystem path on it */
class AbsolutePath{
};
/* given a relative path like sounds/arrow.png, prepend the proper
* data path to it to give data/sounds/arrow.png
*/
std::string find(const std::string path) throw (NotFound);
/* remove the data path from a string
* data/sounds/arrow.png -> sounds/arrow.png
*/
std::string cleanse(const std::string & path);
/* returns all the directories starting with the given path.
* will look in the main data directory, the user directory, and
* the current working directory.
*/
std::vector<std::string> findDirectories(const std::string & path);
/* basename, just get the filename and remove the directory part */
std::string stripDir(const std::string & str);
/* remove extension. foo.txt -> foo */
std::string removeExtension(const std::string & str);
+
+ /* user specific directory to hold persistent data */
+ std::string userDirectory();
+
+ /* user specific path to store the configuration file */
+ std::string configFile();
}
#endif

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jun 11, 1:19 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
69214
Default Alt Text
(6 KB)

Event Timeline