ofGetExtensionLower to uniformize file extension handling in OF Core (#8105)

Author: dimitre

addons/ofxGui/src/ofxBaseGui.cpp

@@ -228,17 +228,17 @@ float ofxBaseGui::getTextVCenteredInRect(const ofRectangle& container){
 }
 
 
-void ofxBaseGui::saveToFile(const std::string& filename){
-	auto extension = ofToLower(ofFilePath::getFileExt(filename));
-	if(extension == "xml"){
+void ofxBaseGui::saveToFile(const of::filesystem::path & filename){
+	auto extension = ofGetExtensionLower(filename);
+	if(extension == ".xml"){
 		ofXml xml;
 		if(ofFile(filename, ofFile::Reference).exists()){
 			xml.load(filename);
 		}
 		saveTo(xml);
 		xml.save(filename);
     }else
-    if(extension == "json"){
+    if(extension == ".json"){
         ofJson json = ofLoadJson(filename);
 		saveTo(json);
         ofSavePrettyJson(filename, json);
@@ -247,14 +247,14 @@ void ofxBaseGui::saveToFile(const std::string& filename){
 	}
 }
 
-void ofxBaseGui::loadFromFile(const std::string& filename){
-	auto extension = ofToLower(ofFilePath::getFileExt(filename));
-	if(extension == "xml"){
+void ofxBaseGui::loadFromFile(const of::filesystem::path & filename){
+	auto extension = ofGetExtensionLower(filename);
+	if(extension == ".xml"){
 		ofXml xml;
 		xml.load(filename);
 		loadFrom(xml);
     }else
-    if(extension == "json"){
+    if(extension == ".json"){
 		ofFile jsonFile(filename);
 		ofJson json = ofLoadJson(jsonFile);
 		loadFrom(json);

addons/ofxGui/src/ofxBaseGui.h

@@ -12,8 +12,8 @@ class ofxBaseGui {
 		virtual ~ofxBaseGui();
 		void draw();
 
-		void saveToFile(const std::string& filename);
-		void loadFromFile(const std::string& filename);
+		void saveToFile(const of::filesystem::path & filename);
+		void loadFromFile(const of::filesystem::path & filename);
 
 		template<class T>
 		void saveTo(T & serializer){

examples/input_output/fileOpenSaveDialogExample/src/ofApp.cpp

@@ -61,7 +61,7 @@ void ofApp::keyReleased(int key){
 		}
 
 		//
-		ofFileDialogResult saveFileResult = ofSystemSaveDialog(ofGetTimestampString() + "." + ofToLower(originalFileExtension), "Save your file");
+		ofFileDialogResult saveFileResult = ofSystemSaveDialog(ofGetTimestampString() + "." + originalFileExtension, "Save your file");
 		if (saveFileResult.bSuccess){
 			processedImages[0].save(saveFileResult.filePath);
 		}
@@ -89,13 +89,13 @@ void ofApp::processOpenFileSelection(ofFileDialogResult openFileResult){
 		loadedImages.clear();
 
 		ofLogVerbose("The file exists - now checking the type via file extension");
-		string fileExtension = ofToUpper(file.getExtension());
-		
+		auto extension = ofGetExtensionLower(file.path());
+
 		//We only want images
-		if (fileExtension == "JPG" || fileExtension == "PNG") {
+		if (extension == ".jpg" || extension == ".png") {
 
 			//Save the file extension to use when we save out
-			originalFileExtension = fileExtension;
+			originalFileExtension = extension;
 
 			//Load the selected image
 			ofImage image;

libs/openFrameworks/gl/ofCubeMap.cpp

@@ -14,6 +14,7 @@
 #include "ofCubeMapShaders.h"
 #include "ofFbo.h"
 #include "ofTexture.h"
+#include "ofFileUtils.h"
 
 #ifdef TARGET_ANDROID
 #include "ofAppAndroidWindow.h"
@@ -311,7 +312,7 @@ bool ofCubeMap::load( ofCubeMapSettings aSettings ) {
 
 	clear();
 
-	std::string ext = ofToLower(aSettings.filePath.extension().string());
+	auto ext = ofGetExtensionLower(aSettings.filePath);
 	bool hdr = (ext == ".hdr" || ext == ".exr");
 
 	if( hdr && !doesSupportHdr() ) {

libs/openFrameworks/graphics/ofCairoRenderer.cpp

@@ -48,10 +48,10 @@ void ofCairoRenderer::setup(const of::filesystem::path & _filename, Type _type,
 	streamBuffer.clear();
 
 	if (type == FROM_FILE_EXTENSION) {
-		auto ext = filename.extension();
-		if (ext == of::filesystem::path { ".svg" } || ext == of::filesystem::path { ".SVG" }) {
+		auto ext = ofGetExtensionLower(filename);
+		if (ext == ".svg") {
 			type = SVG;
-		} else if (ext == of::filesystem::path { ".pdf" } || ext == of::filesystem::path { ".PDF" }) {
+		} else if (ext == ".pdf") {
 			type = PDF;
 		} else { // default to image
 			type = IMAGE;

libs/openFrameworks/graphics/ofImage.cpp

@@ -1,6 +1,7 @@
 #include "ofImage.h"
 #include "ofAppRunner.h"
 #include "ofPixels.h"
+#include "ofFileUtils.h"
 
 #include <FreeImage.h>
 
@@ -364,7 +365,8 @@ bool ofLoadImage(ofTexture & tex, const of::filesystem::path & path, const ofIma
 //----------------------------------------------------------------
 bool ofLoadImage(ofTexture & tex, const of::filesystem::path& path, bool bFlipInY, const ofImageLoadSettings &settings){
 	bool loaded = false;
-	std::string ext = ofToLower(path.extension().string());
+	auto ext = ofGetExtensionLower(path);
+
 	bool hdr = (ext == ".hdr" || ext == ".exr");
 	if( hdr ) {
 		ofFloatPixels pixels;

libs/openFrameworks/utils/ofFileUtils.cpp

@@ -2030,3 +2030,13 @@ std::string ofPathToString(const fs::path & path) {
 	}
 	return {};
 }
+
+//--------------------------------------------------
+// Function used internally in OF core. API can change later
+std::string ofGetExtensionLower(const fs::path & path) {
+	auto ext = path.extension().generic_string();
+	std::transform(ext.begin(), ext.end(), ext.begin(),
+		[](unsigned char c){ return std::tolower(c); });
+
+	return ext;
+}

libs/openFrameworks/utils/ofFileUtils.h

@@ -1246,6 +1246,7 @@ void ofSetDataPathRoot(const of::filesystem::path & root);
 
 std::string ofPathToString(const of::filesystem::path & path);
 
+std::string ofGetExtensionLower(const of::filesystem::path & path);
 
 /*! \cond PRIVATE */
 namespace of {