fix(Filesystem): upgrading to standard filesystem

BotellaA · BotellaA · commit 6eeed4dd4496 · 2024-07-11T21:14:02.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,7 +6,6 @@
         "${workspaceFolder}/build/third_party/abseil/install/include",
         "${workspaceFolder}/build/third_party/asyncplusplus/install/include",
         "${workspaceFolder}/build/third_party/bitsery/install/include",
-        "${workspaceFolder}/build/third_party/ghcFilesystem/install/include",
         "${workspaceFolder}/build/third_party/minizip/install/include",
         "${workspaceFolder}/build/third_party/nanoflann/install/include",
         "${workspaceFolder}/build/third_party/pybind11/install/include",
diff --git a/cmake/ConfigureFilesystem.cmake b/cmake/ConfigureFilesystem.cmake
diff --git a/cmake/ConfigureOpenGeode.cmake b/cmake/ConfigureOpenGeode.cmake
@@ -62,7 +62,6 @@ ExternalProject_Add(opengeode
         asyncplusplus
         bitsery
         gdal
-        ghcFilesystem
         minizip
         nanoflann
         spdlog
@@ -81,7 +80,6 @@ add_custom_target(download
         abseil-download
         asyncplusplus-download
         bitsery-download
-        ghcFilesystem-download
         gdal-download
         minizip-download
         nanoflann-download
diff --git a/cmake/OpenGeode.cmake b/cmake/OpenGeode.cmake
@@ -31,7 +31,6 @@ include(cmake/PythonTargets.cmake)
 find_package(absl REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${ABSEIL_INSTALL_PREFIX})
 find_package(Async++ REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${ASYNCPLUSPLUS_INSTALL_PREFIX})
 find_package(Bitsery REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${BITSERY_INSTALL_PREFIX})
-find_package(ghc_filesystem REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${FILESYSTEM_INSTALL_PREFIX})
 find_package(minizip-ng REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${MINIZIP_INSTALL_PREFIX})
 find_package(nanoflann REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${NANOFLANN_INSTALL_PREFIX})
 find_package(spdlog REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${SPDLOG_INSTALL_PREFIX})
@@ -43,7 +42,6 @@ install(
         ${ABSEIL_INSTALL_PREFIX}/
         ${ASYNCPLUSPLUS_INSTALL_PREFIX}/
         ${BITSERY_INSTALL_PREFIX}/
-        ${FILESYSTEM_INSTALL_PREFIX}/
         ${GDAL_INSTALL_PREFIX}/
         ${PROJ_INSTALL_PREFIX}/
     DESTINATION
diff --git a/cmake/OpenGeodeConfig.cmake.in b/cmake/OpenGeodeConfig.cmake.in
@@ -38,7 +38,6 @@ endif()
 include(CMakeFindDependencyMacro)
 find_dependency(absl)
 find_dependency(Bitsery)
-find_dependency(ghc_filesystem)
 find_dependency(Threads)
 
 get_target_property(library_type OpenGeode::basic TYPE)
diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
@@ -51,7 +51,6 @@ include(ExternalProject)
 include(${PROJECT_SOURCE_DIR}/cmake/ConfigureAbseil.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/ConfigureAsync++.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/ConfigureBitsery.cmake)
-include(${PROJECT_SOURCE_DIR}/cmake/ConfigureFilesystem.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/ConfigureMinizip.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/ConfigureNanoflann.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/ConfigureSpdlog.cmake)
diff --git a/include/geode/basic/detail/geode_output_impl.h b/include/geode/basic/detail/geode_output_impl.h
@@ -23,13 +23,12 @@
 
 #pragma once
 
+#include <filesystem>
 #include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include <ghc/filesystem.hpp>
-
 #include <absl/strings/ascii.h>
 
 #include <geode/basic/filename.h>
@@ -61,7 +60,7 @@ namespace geode
         {
             const Timer timer;
             auto output = geode_object_output_writer< Factory >( filename );
-            ghc::filesystem::create_directories(
+            std::filesystem::create_directories(
                 filepath_without_filename( filename ) );
             auto result = output->write( object );
             Logger::info(
diff --git a/include/geode/model/mixin/core/detail/components_storage.h b/include/geode/model/mixin/core/detail/components_storage.h
@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include <filesystem>
 #include <fstream>
 #include <memory>
 
@@ -31,8 +32,6 @@
 
 #include <bitsery/ext/std_map.h>
 
-#include <ghc/filesystem.hpp>
-
 #include <geode/basic/bitsery_archive.h>
 
 #include <geode/geometry/bitsery_archive.h>
@@ -113,7 +112,7 @@ namespace geode
 
             void load_components( std::string_view filename )
             {
-                if( !ghc::filesystem::exists( to_string( filename ) ) )
+                if( !std::filesystem::exists( to_string( filename ) ) )
                 {
                     return;
                 }
@@ -138,7 +137,7 @@ namespace geode
                 std::string_view directory ) const
             {
                 absl::flat_hash_map< std::string, std::string > mapping;
-                for( const auto& file : ghc::filesystem::directory_iterator(
+                for( const auto& file : std::filesystem::directory_iterator(
                          to_string( directory ) ) )
                 {
                     auto path = file.path();
diff --git a/src/geode/basic/CMakeLists.txt b/src/geode/basic/CMakeLists.txt
@@ -97,7 +97,6 @@ add_geode_library(
     PUBLIC_DEPENDENCIES
         absl::flat_hash_map
         absl::strings
-        ghcFilesystem::ghc_filesystem
         Bitsery::bitsery
     PRIVATE_DEPENDENCIES
         Async++
diff --git a/src/geode/basic/file.cpp b/src/geode/basic/file.cpp
@@ -23,11 +23,10 @@
 
 #include <geode/basic/file.h>
 
+#include <filesystem>
 #include <fstream>
 #include <string_view>
 
-#include <ghc/filesystem.hpp>
-
 #include <absl/strings/match.h>
 #include <absl/strings/str_cat.h>
 
@@ -38,7 +37,7 @@ namespace geode
 {
     bool file_exists( std::string_view file_path )
     {
-        return ghc::filesystem::exists( to_string( file_path ) );
+        return std::filesystem::exists( to_string( file_path ) );
     }
 
     bool line_starts_with( std::ifstream& file, std::string_view check )
diff --git a/src/geode/basic/filename.cpp b/src/geode/basic/filename.cpp
@@ -23,33 +23,32 @@
 
 #include <geode/basic/filename.h>
 
+#include <filesystem>
 #include <string_view>
 
-#include <ghc/filesystem.hpp>
-
 namespace geode
 {
     std::string filename_with_extension( std::string_view path )
     {
-        const ghc::filesystem::path filepath{ to_string( path ) };
+        const std::filesystem::path filepath{ to_string( path ) };
         return filepath.filename().string();
     }
 
     std::string filename_without_extension( std::string_view path )
     {
-        const ghc::filesystem::path filepath{ to_string( path ) };
+        const std::filesystem::path filepath{ to_string( path ) };
         return filepath.filename().replace_extension( "" ).string();
     }
 
     std::string filepath_without_extension( std::string_view path )
     {
-        ghc::filesystem::path filepath{ to_string( path ) };
+        std::filesystem::path filepath{ to_string( path ) };
         return filepath.replace_extension( "" ).string();
     }
 
     std::string filepath_without_filename( std::string_view path )
     {
-        ghc::filesystem::path filepath{ to_string( path ) };
+        std::filesystem::path filepath{ to_string( path ) };
         return filepath.replace_filename( "" ).string();
     }
 
diff --git a/src/geode/basic/zip_file.cpp b/src/geode/basic/zip_file.cpp
@@ -23,6 +23,7 @@
 
 #include <geode/basic/zip_file.h>
 
+#include <filesystem>
 #include <fstream>
 #include <string_view>
 
@@ -31,20 +32,18 @@
 #include <mz_zip.h>
 #include <mz_zip_rw.h>
 
-#include <ghc/filesystem.hpp>
-
 #include <geode/basic/logger.h>
 #include <geode/basic/pimpl_impl.h>
 
 namespace
 {
-    ghc::filesystem::path create_directory(
+    std::filesystem::path create_directory(
         std::string_view file, std::string_view temp_filename )
     {
         const auto file_string = geode::to_string( file );
-        auto directory = ghc::filesystem::path{ file_string }.parent_path()
+        auto directory = std::filesystem::path{ file_string }.parent_path()
                          / geode::to_string( temp_filename );
-        ghc::filesystem::create_directory( directory );
+        std::filesystem::create_directory( directory );
         return directory;
     }
 } // namespace
@@ -68,7 +67,7 @@ namespace geode
 
         ~Impl()
         {
-            ghc::filesystem::remove( directory_ );
+            std::filesystem::remove( directory_ );
             const auto status = mz_zip_writer_close( writer_ );
             if( status != MZ_OK )
             {
@@ -87,12 +86,12 @@ namespace geode
 
         void archive_file( std::string_view file ) const
         {
-            const ghc::filesystem::path file_path{ to_string( file ) };
+            const std::filesystem::path file_path{ to_string( file ) };
             const auto status = mz_zip_writer_add_path(
                 writer_, file_path.string().c_str(), nullptr, 0, 1 );
             OPENGEODE_EXCEPTION( status == MZ_OK,
                 "[ZipFile::archive_file] Error adding path to zip" );
-            ghc::filesystem::remove( file_path );
+            std::filesystem::remove( file_path );
         }
 
         std::string directory() const
@@ -101,7 +100,7 @@ namespace geode
         }
 
     private:
-        ghc::filesystem::path directory_;
+        std::filesystem::path directory_;
         void* writer_{ nullptr };
     };
 
@@ -144,7 +143,7 @@ namespace geode
 
         ~Impl()
         {
-            ghc::filesystem::remove_all( directory_ );
+            std::filesystem::remove_all( directory_ );
             mz_zip_reader_close( reader_ );
             mz_zip_reader_delete( &reader_ );
         }
@@ -175,7 +174,7 @@ namespace geode
         }
 
     private:
-        ghc::filesystem::path directory_;
+        std::filesystem::path directory_;
         void* reader_{ nullptr };
     };
 
diff --git a/src/geode/model/CMakeLists.txt b/src/geode/model/CMakeLists.txt
@@ -179,7 +179,6 @@ add_geode_library(
     PUBLIC_DEPENDENCIES
         absl::flat_hash_map
         Bitsery::bitsery
-        ghcFilesystem::ghc_filesystem
         ${PROJECT_NAME}::basic
         ${PROJECT_NAME}::geometry
         ${PROJECT_NAME}::mesh
diff --git a/src/geode/model/representation/io/geode/geode_brep_output.cpp b/src/geode/model/representation/io/geode/geode_brep_output.cpp
@@ -23,13 +23,12 @@
 
 #include <geode/model/representation/io/geode/geode_brep_output.h>
 
+#include <filesystem>
 #include <string>
 #include <vector>
 
 #include <async++.h>
 
-#include <ghc/filesystem.hpp>
-
 #include <geode/basic/uuid.h>
 #include <geode/basic/zip_file.h>
 
@@ -41,7 +40,7 @@ namespace geode
         const ZipFile& zip_writer ) const
     {
         for( const auto& file :
-            ghc::filesystem::directory_iterator( zip_writer.directory() ) )
+            std::filesystem::directory_iterator( zip_writer.directory() ) )
         {
             zip_writer.archive_file( file.path().string() );
         }
diff --git a/src/geode/model/representation/io/geode/geode_section_output.cpp b/src/geode/model/representation/io/geode/geode_section_output.cpp
@@ -23,13 +23,12 @@
 
 #include <geode/model/representation/io/geode/geode_section_output.h>
 
+#include <filesystem>
 #include <string>
 #include <vector>
 
 #include <async++.h>
 
-#include <ghc/filesystem.hpp>
-
 #include <geode/basic/uuid.h>
 #include <geode/basic/zip_file.h>
 
@@ -67,7 +66,7 @@ namespace geode
         const ZipFile& zip_writer ) const
     {
         for( const auto& file :
-            ghc::filesystem::directory_iterator( zip_writer.directory() ) )
+            std::filesystem::directory_iterator( zip_writer.directory() ) )
         {
             zip_writer.archive_file( file.path().string() );
         }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`
`24`	`24`	`#pragma once`
`25`	`25`
	`26`	`+#include <filesystem>`
`26`	`27`	`#include <fstream>`
`27`	`28`	`#include <memory>`
`28`	`29`
`@@ -31,8 +32,6 @@`
`31`	`32`
`32`	`33`	`#include <bitsery/ext/std_map.h>`
`33`	`34`
`34`		`-#include <ghc/filesystem.hpp>`
`35`		`-`
`36`	`35`	`#include <geode/basic/bitsery_archive.h>`
`37`	`36`
`38`	`37`	`#include <geode/geometry/bitsery_archive.h>`
`@@ -113,7 +112,7 @@ namespace geode`
`113`	`112`
`114`	`113`	`void load_components( std::string_view filename )`
`115`	`114`	`{`
`116`		`- if( !ghc::filesystem::exists( to_string( filename ) ) )`
	`115`	`+ if( !std::filesystem::exists( to_string( filename ) ) )`
`117`	`116`	`{`
`118`	`117`	`return;`
`119`	`118`	`}`
`@@ -138,7 +137,7 @@ namespace geode`
`138`	`137`	`std::string_view directory ) const`
`139`	`138`	`{`
`140`	`139`	`absl::flat_hash_map< std::string, std::string > mapping;`
`141`		`- for( const auto& file : ghc::filesystem::directory_iterator(`
	`140`	`+ for( const auto& file : std::filesystem::directory_iterator(`
`142`	`141`	`to_string( directory ) ) )`
`143`	`142`	`{`
`144`	`143`	`auto path = file.path();`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,10 @@`
`23`	`23`
`24`	`24`	`#include <geode/basic/file.h>`
`25`	`25`
	`26`	`+#include <filesystem>`
`26`	`27`	`#include <fstream>`
`27`	`28`	`#include <string_view>`
`28`	`29`
`29`		`-#include <ghc/filesystem.hpp>`
`30`		`-`
`31`	`30`	`#include <absl/strings/match.h>`
`32`	`31`	`#include <absl/strings/str_cat.h>`
`33`	`32`
`@@ -38,7 +37,7 @@ namespace geode`
`38`	`37`	`{`
`39`	`38`	`bool file_exists( std::string_view file_path )`
`40`	`39`	`{`
`41`		`- return ghc::filesystem::exists( to_string( file_path ) );`
	`40`	`+ return std::filesystem::exists( to_string( file_path ) );`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`bool line_starts_with( std::ifstream& file, std::string_view check )`