Refactor the API

[libs/core.git] / source / dir.cpp

diff --git a/source/dir.cpp b/source/dir.cpp
index c402ec99ee2d61e95e930b07552a0437cbc2e77d..9d23a1388015a89acf8e9ce36cf257c4fd8941a7 100644 (file)
--- a/source/dir.cpp
+++ b/source/dir.cpp
@@ -9,7 +9,11 @@ Distributed under the LGPL
 #include <cerrno>
 #include <dirent.h>
 #include <sys/stat.h>
+#ifdef WIN32
+#include <shlobj.h>
+#endif
 #include <msp/core/except.h>
+#include <msp/strings/regex.h>
 #include "dir.h"
 #include "path.h"
 #include "stat.h"
@@ -35,14 +39,6 @@ void mkdir(const Path &path, int mode)
                throw SystemError("mkdir failed", errno);
 }
 
-/**
-Creates a directory and any parent directories if needed.
-
-@param   path  The path to create
-@param   mode  Access mode for new directories
-
-@return  0 on success, -1 on error
-*/
 void mkpath(const Path &path, int mode)
 {
        Path p;
@@ -92,6 +88,13 @@ void rmdirs(const Path &path)
 
 list<string> list_files(const Path &path)
 {
+       return list_filtered(path, string());
+}
+
+list<string> list_filtered(const Path &path, const string &filter)
+{
+       Regex r_filter(filter);
+
        list<string> result;
        DIR *dir=opendir(path.str().c_str());
        if(dir)
@@ -101,7 +104,8 @@ list<string> list_files(const Path &path)
                        const char *fn=de->d_name;
                        if(fn[0]=='.' && (fn[1]==0 || (fn[1]=='.' && fn[2]==0))) 
                                continue;
-                       result.push_back(fn);
+                       if(r_filter.match(fn))
+                               result.push_back(fn);
                }
                closedir(dir);
        }
@@ -117,13 +121,27 @@ Path getcwd()
 
 Path get_home_dir()
 {
-#ifndef WIN32
+#ifdef WIN32
+       char home[MAX_PATH];
+       if(SHGetFolderPath(0, CSIDL_PERSONAL, 0, 0, home)==S_OK)
+               return home;
+#else
        const char *home=getenv("HOME");
        if(home)
                return home;
+#endif
        return ".";
-#else
+}
+
+Path get_user_data_dir(const string &appname)
+{
+#ifdef WIN32
+       char datadir[MAX_PATH];
+       if(SHGetFolderPath(0, CSIDL_LOCAL_APPDATA, 0, 0, datadir)==S_OK)
+               return Path(datadir)/appname;
        return ".";
+#else
+       return get_home_dir()/("+"+appname);
 #endif
 }