core: luts with incorrect file extensions are now correctly loaded

This was always the intent, but there was a bug in the
implementation, where were doing seekg on the filestream without clearing
potential error states beforehand.

src/core/FileFormatSpi3D.cpp

@@ -111,7 +111,10 @@ OCIO_NAMESPACE_ENTER
             istream.getline(lineBuffer, MAX_LINE_SIZE);
             if(!pystring::startswith(pystring::lower(lineBuffer), "spilut"))
             {
-                throw Exception("Lut does not appear to be valid spilut format.");
+                std::ostringstream os;
+                os << "Lut does not appear to be valid spilut format. ";
+                os << "Expected 'SPILUT'.  Found, '" << lineBuffer << "'.";
+                throw Exception(os.str().c_str());
             }
 
             // TODO: Assert 2nd line is 3 3

src/core/FileTransform.cpp

@@ -368,6 +368,18 @@ OCIO_NAMESPACE_ENTER
 
     }
 
+    std::string FileFormat::getName() const
+    {
+        FormatInfoVec infoVec;
+        GetFormatInfo(infoVec);
+        if(infoVec.size()>0)
+        {
+            return infoVec[0].name;
+        }
+        return "Unknown Format";
+    }
+
+
 
     void FileFormat::Write(const Baker & /*baker*/,
                            const std::string & formatName,
@@ -439,36 +451,73 @@ OCIO_NAMESPACE_ENTER
                     FileCachePair pair = std::make_pair(primaryFormat, cachedFile);
                     g_fileCache[filepath] = pair;
 
+                    if(IsDebugLoggingEnabled())
+                    {
+                        std::ostringstream os;
+                        os << "    Loaded primary format ";
+                        os << primaryFormat->getName();
+                        LogDebug(os.str());
+                    }
+
                     return pair;
                 }
                 catch(std::exception & e)
                 {
                     primaryErrorText = e.what();
+                    filestream.clear();
                     filestream.seekg( std::ifstream::beg );
+
+                    if(IsDebugLoggingEnabled())
+                    {
+                        std::ostringstream os;
+                        os << "    Failed primary format ";
+                        os << primaryFormat->getName();
+                        os << ":  " << e.what();
+                        LogDebug(os.str());
+                    }
                 }
             }
 
             // If this fails, try all other formats
             FormatRegistry & formats = FormatRegistry::GetInstance();
             for(int findex = 0; findex<formats.getNumRawFormats(); ++findex)
             {
-                FileFormat * localFormat = formats.getRawFormatByIndex(findex);
+                FileFormat * altFormat = formats.getRawFormatByIndex(findex);
 
                 // Dont bother trying the primaryFormat twice.
-                if(localFormat == primaryFormat) continue;
+                if(altFormat == primaryFormat) continue;
 
                 try
                 {
-                    CachedFileRcPtr cachedFile = localFormat->Read(filestream);
+                    CachedFileRcPtr cachedFile = altFormat->Read(filestream);
 
                     // Add the result to our cache, return it.
-                    FileCachePair pair = std::make_pair(localFormat, cachedFile);
+                    FileCachePair pair = std::make_pair(altFormat, cachedFile);
                     g_fileCache[filepath] = pair;
+
+                    if(IsDebugLoggingEnabled())
+                    {
+                        std::ostringstream os;
+                        os << "    Loaded alt format ";
+                        os << altFormat->getName();
+                        LogDebug(os.str());
+                    }
+
                     return pair;
                 }
                 catch(std::exception & e)
                 {
+                    filestream.clear();
                     filestream.seekg( std::ifstream::beg );
+
+                    if(IsDebugLoggingEnabled())
+                    {
+                        std::ostringstream os;
+                        os << "    Failed alt format ";
+                        os << altFormat->getName();
+                        os << ":  " << e.what();
+                        LogDebug(os.str());
+                    }
                 }
             }
 

src/core/FileTransform.h

@@ -87,6 +87,9 @@ OCIO_NAMESPACE_ENTER
                                   CachedFileRcPtr cachedFile,
                                   const FileTransform & fileTransform,
                                   TransformDirection dir) const = 0;
+
+        // For logging purposes
+        std::string getName() const;
     private:
         FileFormat& operator= (const FileFormat &);
     };

src/core/Logging.cpp

@@ -120,5 +120,10 @@ OCIO_NAMESPACE_ENTER
         }
     }
 
+    bool IsDebugLoggingEnabled()
+    {
+        return (GetLoggingLevel()>=LOGGING_LEVEL_DEBUG);
+    }
+
 }
 OCIO_NAMESPACE_EXIT

src/core/Logging.h

@@ -39,6 +39,8 @@ OCIO_NAMESPACE_ENTER
     void LogWarning(const std::string & text);
     void LogInfo(const std::string & text);
     void LogDebug(const std::string & text);
+
+    bool IsDebugLoggingEnabled();
 }
 OCIO_NAMESPACE_EXIT