Added more checking and verbose messages to image versioning.

ggarra13 · Dec 17, 2024 · 41e9ec6 · 41e9ec6
1 parent 2d58943
commit 41e9ec6
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 6 deletions.
diff --git a/src/lib/mrvCore/mrvFile.cpp b/src/lib/mrvCore/mrvFile.cpp
@@ -137,6 +137,11 @@ namespace mrv
             return fs::is_directory(dir);
         }
 
+        bool exists(const fs::path& filePath)
+        {
+            return fs::exists(filePath);
+        }
+
         bool isReadable(const fs::path& p)
         {
             const std::string& filePath = p.generic_string();

diff --git a/src/lib/mrvCore/mrvFile.h b/src/lib/mrvCore/mrvFile.h
@@ -125,6 +125,15 @@ namespace mrv
          */
         bool isDirectory(const std::string& directory);
 
+        /**
+         * Return true if the file exists and is readable
+         *
+         * @param p std::filesystem path (or std::string).
+         *
+         * @return true if it exists and is readable, false if not.
+         */
+        bool exists(const fs::path& path);
+
         /**
          * Return true if the file exists and is readable
          *

diff --git a/src/lib/mrvFl/mrvVersioning.cpp b/src/lib/mrvFl/mrvVersioning.cpp
@@ -86,7 +86,6 @@ namespace mrv
 
         std::string msg;
         std::string file = path.get();
-        replace_path(file);
 
         while ((first_or_last || found == false) &&
                tries <= max_tries)
@@ -146,12 +145,46 @@ namespace mrv
 
                 newfile += suffix;
 
-                if (file::isReadable(newfile))
+
+                if (file::isNetwork(newfile))
+                {
+                    msg = tl::string::Format(_("File {0} is a network file.  "
+                                               "Cannot do versioning."))
+                          .arg(newfile);
+                    LOG_ERROR(msg);
+                    return file;
+                }
+
+
+                if (file::exists(newfile))
+                {
+                    msg = tl::string::Format(
+                        _("Found new versioned file {0}."))
+                        .arg(newfile);
+                    LOG_INFO(msg);
+
+                    if (file::isReadable(newfile))
+                    {
+                        loadfile = newfile;
+                        found = true;
+                        if (!first_or_last)
+                            break;
+                    }
+                    else
+                    {
+                        msg = tl::string::Format(
+                            _("File {0} found but is not readable."))
+                              .arg(newfile);
+                        LOG_ERROR(msg);
+                        return file; 
+                    }
+                }
+                else
                 {
-                    loadfile = newfile;
-                    found = true;
-                    if (!first_or_last)
-                        break;
+                    msg = tl::string::Format(
+                        _("Did not find new versioned file {0}."))
+                          .arg(newfile);
+                    LOG_INFO(msg);
                 }
 
                 file = newfile;