isisimport case-insensitive data file check

changes/5971.fix.md

@@ -0,0 +1 @@
+Fixed case-sensitivity in isisimport on linux, now can succeed whether data file is upper or lowercase.

isis/src/base/apps/isisimport/isisimport.cpp

@@ -15,7 +15,6 @@
 #include "OriginalLabel.h"
 #include "OriginalXmlLabel.h"
 #include "PvlToJSON.h"
-#include "ProcessImport.h"
 #include "TextFile.h"
 #include "XmlToJson.h"
 
@@ -27,6 +26,14 @@ using json = nlohmann::json;
 
 namespace Isis {
 
+  bool setFileIfExists(ProcessImport& fileImporter, FileName& fileName, const QString &ext) {
+    if(fileName.existsWithExt(ext)) {
+      fileImporter.SetInputFile(fileName.removeExtension().addExtension(ext).expanded());
+      return true;
+    }
+    return false;
+  }
+
   void isisimport(UserInterface &ui, Pvl *log) {
     FileName fileTemplate = ("$ISISROOT/appdata/import/fileTemplate.tpl");
     json jsonData;
@@ -347,22 +354,26 @@ namespace Isis {
 
 
     ProcessImport importer;
-    if (inputFileName.removeExtension().addExtension("dat").fileExists()){
-      importer.SetInputFile(inputFileName.removeExtension().addExtension("dat").expanded());
-    }
-    else if (inputFileName.removeExtension().addExtension("img").fileExists()) {
-      importer.SetInputFile(inputFileName.removeExtension().addExtension("img").expanded());
-    }
-    else if (inputFileName.removeExtension().addExtension("QUB").fileExists()) {
-      importer.SetInputFile(inputFileName.removeExtension().addExtension("QUB").expanded());
-    }
-    else if (inputFileName.removeExtension().addExtension("tif").fileExists()) {
-    QString msg = "GeoTIFFs may contain ancillary data that isisimport cannot process. "
-                  "Please convert the .TIF to a cube using another tool, such as gdal_translate.";
-      throw IException(IException::User, msg, _FILEINFO_);
+    importer.SetInputFile(inputFileName.expanded());
+
+    // Check for files that match the from= file, except with these file extensions.
+    // If found, replace the data filename to import.  Check upper and lower cases for linux compatibility.
+    QString fileExtensions[] = {"dat", "img", "qub"};
+    bool foundDataFile = false;
+
+    for (const QString& ext : fileExtensions) {
+      foundDataFile = setFileIfExists(importer, inputFileName, ext);
+      if (foundDataFile) break;
+      foundDataFile = setFileIfExists(importer, inputFileName, ext.toUpper());
+      if (foundDataFile) break;
     }
-    else {
-      importer.SetInputFile(inputFileName.expanded());
+
+    if (!foundDataFile) {
+      if (inputFileName.existsWithExt("tif") || inputFileName.existsWithExt("TIF")) {
+        QString msg = "GeoTIFFs may contain ancillary data that isisimport cannot process. "
+                      "Please convert the .TIF to a cube using another tool, such as gdal_translate.";
+        throw IException(IException::User, msg, _FILEINFO_);
+      }
     }
 
     // Use inja to get number of lines, samples, and bands from the input label

isis/src/base/apps/isisimport/isisimport.h

@@ -3,8 +3,10 @@
 
 #include "Pvl.h"
 #include "UserInterface.h"
+#include "ProcessImport.h"
 
 namespace Isis {
+  bool setFileIfExists(ProcessImport& fileImporter, FileName& fileName, const QString &ext);
   extern void isisimport(UserInterface &ui, Pvl *log=nullptr);
 }
 

isis/src/core/include/FileName.h

@@ -149,6 +149,7 @@ namespace Isis {
       FileName addExtension(const QString &extension) const;
       FileName removeExtension() const;
       FileName setExtension(const QString &extension) const;
+      bool existsWithExt(const QString &extension) const;
 
       bool isVersioned() const;
       bool isNumericallyVersioned() const;

isis/src/core/src/FileName.cpp

@@ -274,6 +274,17 @@ namespace Isis {
     return result;
   }
 
+  /**
+   * Checks if the filename exists, but with the given extension instead of its own.
+   *
+   * @param ext The new file extension to check in place of any current file extension
+   *
+   * @return bool, true if file exists with given extension
+   */
+  bool FileName::existsWithExt(const QString& ext) const {
+    return removeExtension().addExtension(ext).fileExists();
+  }
+
   /**
    * Checks to see if a file name is versioned by date or numerically. Returns true if file is
    * versioned by date or numerically; returns false otherwise.