Merge pull request #947 from Geode-solutions/fix/expand-folders

fix(Filename): expand predefined folders

Author: panquez

include/geode/basic/detail/geode_input_impl.h

@@ -68,7 +68,8 @@ namespace geode
                 absl::AsciiStrToLower( extension_from_filename( filename ) );
             OPENGEODE_EXCEPTION( Factory::has_creator( extension ),
                 "Unknown extension: ", extension );
-            return Factory::create( extension, filename );
+            return Factory::create(
+                extension, expand_predefined_folders( filename ) );
         }
 
         template < typename Factory, typename... Args >

include/geode/basic/detail/geode_output_impl.h

@@ -49,7 +49,8 @@ namespace geode
                 absl::AsciiStrToLower( extension_from_filename( filename ) );
             OPENGEODE_EXCEPTION( Factory::has_creator( extension ),
                 "Unknown extension: ", extension );
-            return Factory::create( extension, filename );
+            return Factory::create(
+                extension, expand_predefined_folders( filename ) );
         }
 
         template < typename Factory, typename Object >

include/geode/basic/filename.h

@@ -41,4 +41,7 @@ namespace geode
 
     absl::string_view opengeode_basic_api extension_from_filename(
         absl::string_view filename );
+
+    std::string opengeode_basic_api expand_predefined_folders(
+        absl::string_view path );
 } // namespace geode

include/geode/basic/io.h

@@ -27,6 +27,7 @@
 #include <absl/strings/string_view.h>
 
 #include <geode/basic/common.h>
+#include <geode/basic/filename.h>
 #include <geode/basic/logger.h>
 
 namespace geode
@@ -42,10 +43,13 @@ namespace geode
         }
 
     protected:
-        IOFile( absl::string_view filename ) : filename_( filename ) {}
+        IOFile( absl::string_view filename )
+            : filename_( expand_predefined_folders( filename ) )
+        {
+        }
 
     private:
-        absl::string_view filename_;
+        std::string filename_;
     };
 
     template < typename Factory >

src/geode/basic/filename.cpp

@@ -23,6 +23,8 @@
 
 #include <geode/basic/filename.h>
 
+#include <absl/strings/string_view.h>
+
 #include <ghc/filesystem.hpp>
 
 namespace geode
@@ -55,4 +57,17 @@ namespace geode
     {
         return filename.substr( filename.find_last_of( '.' ) + 1 );
     }
+
+    std::string expand_predefined_folders( absl::string_view path )
+    {
+        if( path.empty() )
+        {
+            return to_string( path );
+        }
+        if( path[0] == '~' )
+        {
+            return absl::StrCat( std::getenv( "HOME" ), path.substr( 1 ) );
+        }
+        return to_string( path );
+    }
 } // namespace geode