mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove filesystem::file_attrib() function

Browse Source
This commit is contained in:
Jinhao 2015-12-30 01:11:07 +08:00
parent 48254b6555
commit 0a396c12c2
7 changed files with 55 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nana/filesystem/filesystem.hpp
View File

@ -100,7 +100,7 @@ namespace filesystem
uintmax_t available; uintmax_t available;
}; };
using file_time_type = std::chrono::time_point< std::chrono::system_clock>;// trivial-clock> ; using file_time_type = std::chrono::time_point<std::chrono::system_clock>;// trivial-clock> ;
class file_status class file_status
{ {
@ -415,7 +415,6 @@ namespace filesystem
file_status status(const path& p); file_status status(const path& p);
bool file_attrib(const nana::string& file, attribute&);
inline bool is_directory(file_status s) { return s.type() == file_type::directory ;} inline bool is_directory(file_status s) { return s.type() == file_type::directory ;}
bool is_directory(const path& p); bool is_directory(const path& p);

4
include/nana/filesystem/fs_utility.hpp
View File

@ -24,10 +24,6 @@ namespace filesystem
tm modified; tm modified;
}; };
bool file_attrib(const ::std::string& file, attribute&);
//long long filesize(const nana::string& file); //deprecated
//bool mkdir(const ::std::string& dir, bool & if_exist); //deprecated
bool modified_file_time(const ::std::string& file, struct tm&); bool modified_file_time(const ::std::string& file, struct tm&);
std::wstring path_user(); std::wstring path_user();

113
source/filesystem/filesystem.cpp
View File

@ -281,13 +281,39 @@ namespace nana { namespace experimental {
#endif #endif
}//end namespace detail }//end namespace detail
bool not_found_error(int errval)
{
#if defined(NANA_WINDOWS)
switch (errval)
{
case ERROR_FILE_NOT_FOUND:
case ERROR_PATH_NOT_FOUND:
case ERROR_INVALID_NAME:
case ERROR_INVALID_DRIVE:
case ERROR_NOT_READY:
case ERROR_INVALID_PARAMETER:
case ERROR_BAD_PATHNAME:
case ERROR_BAD_NETPATH:
return true;
}
return false;
#elif defined(NANA_POSIX)
return (errval == ENOENT || errval == ENOTDIR);
#else
static_assert(false, "Only Windows and Unix are supported now (Mac OS is experimental)");
#endif
}
file_status status(const path& p) file_status status(const path& p)
{ {
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
auto attr = ::GetFileAttributesW(p.c_str()); auto attr = ::GetFileAttributesW(p.c_str());
if(INVALID_FILE_ATTRIBUTES == attr) if (INVALID_FILE_ATTRIBUTES == attr)
return file_status{file_type::unknown}; {
if (not_found_error(static_cast<int>(::GetLastError())))
return file_status{file_type::not_found};
return file_status{ file_type::unknown };
}
return file_status{(FILE_ATTRIBUTE_DIRECTORY & attr) ? file_type::directory : file_type::regular, perms::all}; return file_status{(FILE_ATTRIBUTE_DIRECTORY & attr) ? file_type::directory : file_type::regular, perms::all};
#elif defined(NANA_POSIX) #elif defined(NANA_POSIX)
struct stat path_stat; struct stat path_stat;
@ -326,33 +352,6 @@ namespace nana { namespace experimental {
#endif #endif
} }
bool file_attrib(const nana::string& file, attribute& attr)
{
#if defined(NANA_WINDOWS)
WIN32_FILE_ATTRIBUTE_DATA fad;
if (::GetFileAttributesEx(file.c_str(), GetFileExInfoStandard, &fad))
{
LARGE_INTEGER li;
li.u.LowPart = fad.nFileSizeLow;
li.u.HighPart = fad.nFileSizeHigh;
attr.size = li.QuadPart;
attr.directory = (0 != (fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
detail::filetime_to_c_tm(fad.ftLastWriteTime, attr.modified);
return true;
}
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
struct stat fst;
if (0 == ::stat(static_cast<std::string>(nana::charset(file)).c_str(), &fst))
{
attr.size = fst.st_size;
attr.directory = (0 != (040000 & fst.st_mode));
attr.modified = *(::localtime(&fst.st_ctime));
return true;
}
#endif
return false;
}
bool is_directory(const path& p) bool is_directory(const path& p)
{ {
return (status(p).type() == file_type::directory); return (status(p).type() == file_type::directory);
@ -396,6 +395,7 @@ namespace nana { namespace experimental {
#endif #endif
} }
bool modified_file_time(const std::wstring& file, struct tm& t) bool modified_file_time(const std::wstring& file, struct tm& t)
{ {
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
@ -440,59 +440,6 @@ namespace nana { namespace experimental {
#endif #endif
} }
/*
bool create_directory(const std::wstring& path, bool & if_exist) //deprecated
{
if_exist = false;
if (path.size() == 0) return false;
std::wstring root;
#if defined(NANA_WINDOWS)
if (path.size() > 3 && path[1] == L':')
root = path.substr(0, 3);
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
if (path[0] == L'/')
root = '/';
#endif
bool mkstat = false;
std::size_t beg = root.size();
while (true)
{
beg = path.find_first_not_of(L"/\\", beg);
if (beg == path.npos)
break;
std::size_t pos = path.find_first_of(L"/\\", beg + 1);
if (pos != path.npos)
{
root += path.substr(beg, pos - beg);
mkstat = detail::mkdir_helper(root, if_exist);
if (mkstat == false && if_exist == false)
return false;
#if defined(NANA_WINDOWS)
root += L'\\';
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
root += L'/';
#endif
}
else
{
if (beg + 1 < path.size())
{
root += path.substr(beg);
mkstat = detail::mkdir_helper(root, if_exist);
}
break;
}
beg = pos + 1;
}
return mkstat;
}
*/
bool rmfile(const path& p) bool rmfile(const path& p)
{ {
if(p.empty()) if(p.empty())

120
source/filesystem/fs_utility.cpp
View File

@ -192,73 +192,6 @@ namespace filesystem
#endif #endif
}//end namespace detail }//end namespace detail
bool file_attrib(const std::string& file, attribute& attr)
{
throw_not_utf8(file);
#if defined(NANA_WINDOWS)
WIN32_FILE_ATTRIBUTE_DATA fad;
if(::GetFileAttributesEx(utf8_cast(file).c_str(), GetFileExInfoStandard, &fad))
{
LARGE_INTEGER li;
li.u.LowPart = fad.nFileSizeLow;
li.u.HighPart = fad.nFileSizeHigh;
attr.bytes = li.QuadPart;
attr.is_directory = (0 != (fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
detail::filetime_to_c_tm(fad.ftLastWriteTime, attr.modified);
return true;
}
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
struct stat fst;
if(0 == ::stat(file.c_str(), &fst))
{
attr.bytes = fst.st_size;
attr.is_directory = (0 != (040000 & fst.st_mode));
attr.modified = *(::localtime(&fst.st_ctime));
return true;
}
#endif
return false;
}
/*
long long filesize(const std::string& file) //deprecated
{
#if defined(NANA_WINDOWS)
//Some compilation environment may fail to link to GetFileSizeEx
typedef BOOL (__stdcall *GetFileSizeEx_fptr_t)(HANDLE, PLARGE_INTEGER);
GetFileSizeEx_fptr_t get_file_size_ex = reinterpret_cast<GetFileSizeEx_fptr_t>(::GetProcAddress(::GetModuleHandleA("Kernel32.DLL"), "GetFileSizeEx"));
if(get_file_size_ex)
{
HANDLE handle = ::CreateFile(utf8_cast(file).c_str(), GENERIC_READ, 0, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
if(INVALID_HANDLE_VALUE != handle)
{
LARGE_INTEGER li;
if(!get_file_size_ex(handle, &li))
li.QuadPart = 0;
::CloseHandle(handle);
return li.QuadPart;
}
}
return 0;
#else
auto stream = ::fopen(file.c_str(), "rb");
long long size = 0;
if(stream)
{
#if defined(NANA_LINUX)
fseeko64(stream, 0, SEEK_END);
size = ftello64(stream);
#elif defined(NANA_MACOS)
fseeko(stream, 0, SEEK_END);
size = ftello(stream);
#endif
fclose(stream);
}
return size;
#endif
}
*/
bool modified_file_time(const ::std::string& file, struct tm& t) bool modified_file_time(const ::std::string& file, struct tm& t)
{ {
@ -294,59 +227,6 @@ namespace filesystem
return false; return false;
} }
/*
bool mkdir(const std::string& path, bool & if_exist) //deprecated
{
if_exist = false;
if(path.size() == 0) return false;
std::string root;
#if defined(NANA_WINDOWS)
if(path.size() > 3 && path[1] == ':')
root = path.substr(0, 3);
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
if(path[0] == '/')
root = '/';
#endif
bool mkstat = false;
std::size_t beg = root.size();
while(true)
{
beg = path.find_first_not_of("/\\", beg);
if(beg == path.npos)
break;
std::size_t pos = path.find_first_of("/\\", beg + 1);
if(pos != path.npos)
{
root += path.substr(beg, pos - beg);
mkstat = detail::mkdir_helper(root, if_exist);
if(mkstat == false && if_exist == false)
return false;
#if defined(NANA_WINDOWS)
root += L'\\';
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
root += L'/';
#endif
}
else
{
if(beg + 1 < path.size())
{
root += path.substr(beg);
mkstat = detail::mkdir_helper(root, if_exist);
}
break;
}
beg = pos + 1;
}
return mkstat;
}
*/
bool rmfile(const char* file) bool rmfile(const char* file)
{ {
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)

48
source/gui/filebox.cpp
View File

@ -495,7 +495,6 @@ namespace nana
file_container_.clear(); file_container_.clear();
using namespace nana::filesystem; using namespace nana::filesystem;
attribute fattr;
file_iterator end; file_iterator end;
for(file_iterator i(path); i != end; ++i) for(file_iterator i(path); i != end; ++i)
{ {
@ -503,17 +502,21 @@ namespace nana
continue; continue;
item_fs m; item_fs m;
m.name = i->name; m.name = i->name;
if(file_attrib(path + m.name, fattr))
namespace fs = ::nana::experimental::filesystem;
auto fattr = fs::status(path + m.name);
if(fattr.type() != fs::file_type::not_found && fattr.type() != fs::file_type::unknown)
{ {
m.bytes = fattr.bytes; m.bytes = fs::file_size(path + m.name);
m.directory = fattr.is_directory; m.directory = fs::is_directory(fattr);
m.modified_time = fattr.modified; modified_file_time(path + m.name, m.modified_time);
} }
else else
{ {
m.bytes = 0; m.bytes = 0;
m.directory = i->directory; m.directory = i->directory;
modified_file_time(path + i->name, m.modified_time); modified_file_time(path + i->name, m.modified_time);
} }
file_container_.push_back(m); file_container_.push_back(m);
@ -666,18 +669,6 @@ namespace nana
return; return;
} }
/*
bool if_exist;
if(false == nana::filesystem::mkdir(fb_.addr_.filesystem + path, if_exist)) //deprecated
{
if(if_exist)
mb<<L"The folder is existing, please rename it.";
else
mb<<L"Failed to create the folder, please rename it.";
mb();
return;
}
*/
fb_._m_load_cat_path(fb_.addr_.filesystem); fb_._m_load_cat_path(fb_.addr_.filesystem);
fm_.close(); fm_.close();
} }
@ -762,17 +753,17 @@ namespace nana
else else
tar = addr_.filesystem + file; tar = addr_.filesystem + file;
bool good = true; bool good = true;
nana::filesystem::attribute attr;
if(nana::filesystem::file_attrib(tar, attr) == false) namespace fs = ::nana::experimental::filesystem;
auto fattr = fs::status(tar);
if(fattr.type() == fs::file_type::not_found)
{ {
if(_m_append_def_extension(tar)) good = (_m_append_def_extension(tar) && (fs::status(tar).type() == fs::file_type::not_found));
good = nana::filesystem::file_attrib(tar, attr);
else
good = false;
} }
if(good && attr.is_directory) if(good && fs::is_directory(fattr))
{ {
_m_load_cat_path(tar); _m_load_cat_path(tar);
tb_file_.caption(""); tb_file_.caption("");
@ -954,9 +945,8 @@ namespace nana
} }
else else
{ {
nana::filesystem::attribute attr; namespace fs = ::nana::experimental::filesystem;
if (nana::filesystem::file_attrib(ipstr, attr)) if (fs::is_directory(ipstr))
if (attr.is_directory)
impl_->path = ipstr; impl_->path = ipstr;
} }
return *this; return *this;

7
source/gui/widgets/button.cpp
View File

@ -214,7 +214,8 @@ namespace nana{ namespace drawerbase
{ {
wchar_t shortkey; wchar_t shortkey;
std::string::size_type shortkey_pos; std::string::size_type shortkey_pos;
std::wstring str = to_wstring(API::transform_shortkey_text(wdg_->caption(), shortkey, &shortkey_pos)); std::string mbstr = API::transform_shortkey_text(wdg_->caption(), shortkey, &shortkey_pos);
std::wstring str = to_wstring(mbstr);
nana::size ts = graph.text_extent_size(str); nana::size ts = graph.text_extent_size(str);
nana::size gsize = graph.size(); nana::size gsize = graph.size();
@ -256,8 +257,8 @@ namespace nana{ namespace drawerbase
if(shortkey) if(shortkey)
{ {
unsigned off_w = (shortkey_pos ? graph.text_extent_size(str, static_cast<unsigned>(shortkey_pos)).width : 0); unsigned off_w = (shortkey_pos ? graph.text_extent_size(mbstr.c_str(), static_cast<unsigned>(shortkey_pos)).width : 0);
nana::size shortkey_size = graph.text_extent_size(txtptr + shortkey_pos, 1); nana::size shortkey_size = graph.text_extent_size(to_wstring(mbstr.c_str() + shortkey_pos), 1);
pos.x += off_w; pos.x += off_w;
pos.y += static_cast<int>(shortkey_size.height); pos.y += static_cast<int>(shortkey_size.height);
graph.set_color(colors::black); graph.set_color(colors::black);

2
source/paint/detail/native_paint_interface.cpp
View File

@ -138,7 +138,7 @@ namespace detail
return nana::size(size.cx, size.cy); return nana::size(size.cx, size.cy);
#elif defined(NANA_X11) #elif defined(NANA_X11)
#if defined(NANA_UNICODE) #if defined(NANA_UNICODE)
std::string utf8str = to_utf8(text); std::string utf8str = to_utf8(std::wstring(text, len));
XGlyphInfo ext; XGlyphInfo ext;
XftFont * fs = reinterpret_cast<XftFont*>(dw->font->handle); XftFont * fs = reinterpret_cast<XftFont*>(dw->font->handle);
::XftTextExtentsUtf8(nana::detail::platform_spec::instance().open_display(), fs, ::XftTextExtentsUtf8(nana::detail::platform_spec::instance().open_display(), fs,