66#include < iostream>
77#include < utility>
88
9- namespace of {
10- namespace filesystem {
11-
129// general approach to return type:
1310// - use `path` and path &` to wrap std:: return values
1411// - use bool when bool (for self-documenting API)
1512// - use (const) auto (inheriting from std:: implementation) for others
1613
14+ namespace of ::filesystem {
15+
1716class path {
1817private:
1918 std::filesystem::path path_; // simple composition
2019
21- #if defined(TARGET_WIN32)
22- // TODO better (ideal) impl this just copy-pasted for proof of concept
23- mutable std::string cached_narrow_str_;
24- const char * to_narrow_cstr () const {
25- std::mbstate_t state = std::mbstate_t ();
26- size_t size_needed = std::wcstombs (nullptr , wstring ().c_str (), 0 ) + 1 ;
27- if (size_needed == static_cast <size_t >(-1 )) {
28- throw std::runtime_error (" Conversion error from wstring to string"
29- }
30- cached_narrow_str_.resize (size_needed);
31- std::wcstombs (&cached_narrow_str_[0 ], wstring ().c_str (), size_needed);
32- return cached_narrow_str_.c_str ();
33- }
34- #endif
35-
3620public:
3721 // MARK: construction
3822 path () = default ;
@@ -53,15 +37,29 @@ class path {
5337 explicit operator const std::filesystem::path::value_type*() const { return path_.c_str (); }
5438
5539 // MARK: string conversions
56-
57- #if defined(TARGET_WIN32)
40+
41+ #if defined(TARGET_WIN32) // superfluous but usefull to facilitate testing on mac/linux
42+
43+ // TODO better (ideal) impl this just copy-pasted for proof of concept
44+ mutable std::string cached_narrow_str_;
45+ const char * to_narrow_cstr () const {
46+ std::mbstate_t state = std::mbstate_t ();
47+ size_t size_needed = std::wcstombs (nullptr , wstring ().c_str (), 0 ) + 1 ;
48+ if (size_needed == static_cast <size_t >(-1 )) {
49+ throw std::runtime_error (" Conversion error from wstring to string"
50+ }
51+ cached_narrow_str_.resize (size_needed);
52+ std::wcstombs (&cached_narrow_str_[0 ], wstring ().c_str (), size_needed);
53+ return cached_narrow_str_.c_str ();
54+ }
55+
5856 operator std::wstring () const { return path_.wstring (); }
5957 operator const char *() const { return to_narrow_cstr (); } // should try catch on win
6058 operator std::string () const { return path_.string (); } // should try catch on win
6159 explicit operator const std::string () const { return path_.string (); } // should try catch on win
6260#else
6361 operator std::filesystem::path::string_type () const { return path_.string (); }
64- explicit operator const std::filesystem::path::string_type () const { return path_.string (); }
62+ explicit operator const std::filesystem::path::string_type () const { return path_.string (); }
6563#endif
6664
6765 auto wstring () const { return path_.wstring (); }
@@ -76,7 +74,7 @@ class path {
7674 auto u16string () const { return path_.u16string (); }
7775 auto u32string () const { return path_.u32string (); }
7876 const auto c_str () const noexcept { return path_.c_str (); }
79-
77+
8078 const std::filesystem::path& native_path () const { return path_; }
8179
8280 static constexpr auto preferred_separator = std::filesystem::path::preferred_separator;
@@ -96,12 +94,12 @@ class path {
9694 auto file_size () const { return std::filesystem::file_size (path_); }
9795 auto last_write_time () const { return std::filesystem::last_write_time (path_); }
9896 auto get_permissions () const { return std::filesystem::status (path_).permissions (); }
99-
97+
10098 // MARK: path type
10199 path lexically_normal () const {
102100 return path (path_.lexically_normal ());
103101 }
104-
102+
105103 template <typename ... Args>
106104 path lexically_relative (Args&&... args) const {
107105 return path (path_.
lexically_relative (std::forward<Args>(args)...));
@@ -111,7 +109,7 @@ class path {
111109 path lexically_proximate (Args&&... args) const {
112110 return path (path_.
lexically_proximate (std::forward<Args>(args)...));
113111 }
114-
112+
115113 // MARK: comparison
116114 // TODO: C++20: spaceship simplification
117115 template <typename T> bool operator ==(T&& other) const noexcept { return path_ == std::forward<T>(other); }
@@ -122,35 +120,35 @@ class path {
122120 template <typename T> bool operator >=(T&& other) const noexcept { return path_ >= std::forward<T>(other); }
123121
124122 bool operator !() const noexcept { return empty (); }
125-
123+
126124 template <typename ... Args>
127125 auto compare (Args&&... args)
const {
return path_.
compare (std::forward<Args>(args)...); }
128126
129127 void swap (path & other) noexcept { path_.swap (other.path_ ); }
130-
128+
131129
132130 // MARK: path transformation (return *this)
133- path& replace_extension (const path & ext = std::filesystem::path()) {
131+ path& replace_extension (const path & ext = std::filesystem::path()) {
134132 path_.replace_extension (ext);
135133 return *this ;
136134 }
137-
138- path& replace_filename (const path & ext = std::filesystem::path()) {
135+
136+ path& replace_filename (const path & ext = std::filesystem::path()) {
139137 path_.replace_filename (ext);
140138 return *this ;
141139 }
142-
140+
143141 template <typename T>
144142 path& assign (T&& p) noexcept {
145143 path_.assign (std::move (std::forward<T>(p)));
146144 return *this ;
147145 }
148-
146+
149147 path& append (path&& p) noexcept {
150148 path_ /= std::move (p.path_ );
151149 return *this ;
152150 }
153-
151+
154152 path& operator /=(path&& p) noexcept {
155153 path_ /= std::move (p.path_ );
156154 return *this ;
@@ -202,7 +200,7 @@ class path {
202200 const friend path operator +(const path& lhs, const RHS& rhs) {
203201 return path (lhs.path_ .string () + rhs);
204202 }
205-
203+
206204 // MARK: other sub paths
207205 path root_name () const { return path (path_.root_name ()); }
208206 path root_directory () const { return path (path_.root_directory ()); }
@@ -212,7 +210,7 @@ class path {
212210 path filename () const { return path (path_.filename ()); }
213211 path stem () const { return path (path_.stem ()); }
214212 path extension () const { return path (path_.extension ()); }
215-
213+
216214 // MARK: file info
217215 bool has_extension () const { return path_.has_extension (); }
218216 bool has_filename () const { return path_.has_filename (); }
@@ -221,13 +219,10 @@ class path {
221219 bool has_root_directory () const { return path_.has_root_directory (); }
222220 bool has_relative_path () const { return path_.has_relative_path (); }
223221 bool has_stem () const { return path_.has_stem (); }
224-
222+
225223 friend std::ostream& operator <<(std::ostream& os, const path& p) {
226224 return os << p.string ();
227225 }
228226};
229-
230- } // namespace filesystem
231- } // namespace of
232-
227+ }
233228#endif // OF_FILESYSTEM_PATH_H
0 commit comments