Adapt for managed plugin private data locations.

Author: bdbcat

CMakeLists.txt

@@ -306,9 +306,9 @@ SET(SRC_S63
             src/s63chart.h
             src/mygeom63.h
             src/mygeom63.cpp
-            #src/tri.c
             src/TexFont.cpp
             src/TexFont.h
+            src/InstallDirs.cpp
      )
 
 SET(SRC_CPL

src/InstallDirs.cpp

@@ -0,0 +1,73 @@
+#include "InstallDirs.h"
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <unordered_map>
+#include <vector>
+
+#include <wx/filename.h>
+#include <wx/log.h>
+
+// FIXME: Missing includes in ocpn_plugin.h
+#include <wx/dcmemory.h>
+#include <wx/dialog.h>
+#include <wx/event.h>
+#include <wx/menuitem.h>
+#include <wx/gdicmn.h>
+#include <wx/platinfo.h>
+
+#include  "ocpn_plugin.h"
+
+
+typedef std::unordered_map<std::string, std::string> pathmap_t;
+
+
+std::vector<std::string> split(std::string s, char delimiter)
+{
+    using namespace std;
+
+    vector<string> tokens;
+    size_t start = s.find_first_not_of(delimiter);
+    size_t end = start;
+    while (start != string::npos) {
+        end = s.find(delimiter, start);
+        tokens.push_back(s.substr(start, end - start));
+        start = s.find_first_not_of(delimiter, end);
+    }
+    return tokens;
+}
+
+
+inline bool exists(const std::string& name) {
+    wxFileName fn(name.c_str());
+    if (!fn.IsOk()) {
+        return false;
+    }
+    return fn.FileExists();
+}
+
+
+std::string find_in_path(std::string binary)
+{
+    using namespace std;
+
+    wxString wxPath;
+    wxGetEnv("PATH", &wxPath);
+    string path(wxPath.c_str()); 
+
+    auto const osSystemId = wxPlatformInfo::Get().GetOperatingSystemId();
+    char delimiter = ':';
+    if (osSystemId & wxOS_WINDOWS) {
+        delimiter =  ';';
+        binary += ".exe";
+    }
+    vector<string> elements = split(path, delimiter);
+    for (auto element: elements) {
+       string filename = element + "/" + binary;
+       if (exists(filename)) {
+	   return filename;
+       }
+    }
+    return "";
+}

src/InstallDirs.h

@@ -0,0 +1,21 @@
+#include <string>
+#include <wx/string.h>
+
+#if 0
+/**
+ * Return binary directory used when installing plugin, without
+ * trailing separator.
+ *
+ *   - Parameter: name: Name of plugin.
+ *   - Return: Binary dir used when installing plugin or "" if not found.
+ */
+wxString getInstallationBindir(const char* name);
+#endif
+
+/*
+ * Look for binary with given basename (no extension) in PATH.
+ *
+ * @return path to binary if found, else 0.
+ *
+ */
+std::string find_in_path(std::string binary);

src/s63_pi.cpp

@@ -48,6 +48,7 @@
 #include "json_defs.h"
 #include "jsonwriter.h"
 #include "jsonreader.h"
+#include "InstallDirs.h"
 
 #ifdef __WXOSX__
 #include "GL/gl.h"
@@ -363,20 +364,31 @@ s63_pi::s63_pi(void *ppimgr)
       wxFileName fn_exe(GetOCPN_ExePath());
 
       //        Specify the location of the OCPNsenc helper.
-      g_sencutil_bin = fn_exe.GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + _T("OCPNsenc");
-      
+      //g_sencutil_bin = fn_exe.GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + _T("OCPNsenc");
+      //g_sencutil_bin = GetPluginDataDir("s63_pi") + _T("/OCPNsenc");
+
 
 #ifdef __WXMSW__
-      g_sencutil_bin = _T("\"") + fn_exe.GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + 
-           _T("plugins\\s63_pi\\OCPNsenc.exe\"");
+      //g_sencutil_bin = _T("\"") + fn_exe.GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) +  _T("plugins\\s63_pi\\OCPNsenc.exe\"");
+      g_sencutil_bin = GetPluginDataDir("s63_pi") + _T("\\OCPNsenc.exe");
+
 #endif 
 
 #ifdef __WXOSX__
-      fn_exe.RemoveLastDir();     
-      g_sencutil_bin = _T("\"") + fn_exe.GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) + 
-           _T("PlugIns/s63_pi/OCPNsenc\"");
+//      fn_exe.RemoveLastDir();     
+//      g_sencutil_bin = _T("\"") + fn_exe.GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR) +  _T("PlugIns/s63_pi/OCPNsenc\"");
 #endif 
 
+      if (!wxFileExists(g_sencutil_bin)) {
+        std::string path(find_in_path("OCPNsenc"));
+        if (path == "") {
+            wxLogWarning("Cannot locate OCPNsenc binary in $PATH");
+        }
+        else {
+            g_sencutil_bin = wxString(path.c_str());
+        }
+      }
+     
       g_bSENCutil_valid = false;                // not confirmed yet