looking for file from appropriate source AM-367/user-config

Author: Aaron Roller

include/dji_sdk_obsoleted/dji_linux_environment.hpp

@@ -43,6 +43,11 @@ class DJI_Environment
   ~DJI_Environment();
 
   static std::string findFile(std::string file);
+  /**
+   * @return a string of the path to a file, if found.  Empty otherwise.
+   */
+  static std::string findFileInDir(std::string file, std::string dir);
+
   int                getApp_id() const;
   const std::string& getEnc_key() const;
   const std::string& getDevice() const;
@@ -64,16 +69,6 @@ class DJI_Environment
   std::string  device_acm;
   std::string  sample_case;
 
- /**
-  * @return a string of the path to a file in the working dir, if found.  Empty otherwise.
-  */
-  static std::string findFileInCwd(std::string file);
-
-  /**
-   * @return a string of the path to a file, if found.  Empty otherwise.
-   */
-  static std::string findFileInDir(std::string file, std::string dir);
-
   const static unsigned int default_acm_baudrate = 921600;
 };
 

src/dji_sdk_obsoleted/dji_linux_environment.cpp

@@ -45,13 +45,14 @@ DJI_Environment::~DJI_Environment()
 std::string
 DJI_Environment::findFile(std::string file)
 {
-  std::string configFile = findFileInCwd(file);
-  if(configFile.empty()){
-    //FIXME: find a better place to declare this
-    std::string installationDir = "/opt/ros/melodic/share/dji_sdk/launch";
-    configFile = findFileInDir(file,installationDir);
-  }
-  return configFile;
+  char        cwd[1024];
+  std::string configFile;
+
+  if (getcwd(cwd, sizeof(cwd)) == NULL)
+    throw std::runtime_error("Error getting current directory");
+
+  std::string strCWD(cwd);
+  return findFileInDir(file,strCWD);
 }
 
 
@@ -71,22 +72,6 @@ DJI_Environment::findFileInDir(std::string file, std::string dir)
   return configFile;
 }
 
-/**
- * @return a string of the path to a file in the working dir, if found.  Empty otherwise.
- */
-std::string
-DJI_Environment::findFileInCwd(std::string file)
-{ 
-  char        cwd[1024];
-  std::string configFile;
-
-  if (getcwd(cwd, sizeof(cwd)) == NULL)
-    throw std::runtime_error("Error getting current directory");
-
-  std::string strCWD(cwd);
-  return findFileInDir(file,strCWD);
-}
-
 int
 DJI_Environment::getApp_id() const
 {

src/dji_sdk_obsoleted/dji_linux_helpers.cpp

@@ -170,8 +170,15 @@ LinuxSetup::setupEnvironment(int argc, char** argv)
   }
   else
   {
-    config_file_path = DJI_Environment::findFile("UserConfig.txt");
-
+    std::string config_filename = "UserConfig.txt";
+    config_file_path = DJI_Environment::findFile(config_filename);
+
+    //look in installation dir if not found in expected places
+    if(config_file_path.empty()){
+      //FIXME: find a better place to declare this without ros distro (melodic)
+      std::string installationDir = "/opt/ros/melodic/share/dji_sdk/launch";
+      config_file_path = DJI_Environment::findFileInDir(config_filename,installationDir);
+    }
     if (config_file_path.empty())
       throw std::runtime_error("User configuration file not found");
   }