rewrote wxExtHelpController loading code to use wxFileName as it was broken under Mac and it also reduces the code size; also use wxTextFile to further simplify the code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/helpext.h

@@ -14,17 +14,6 @@
 
 #include "wx/helpbase.h"
 
-/// Path separator.
-#ifdef __WXMSW__
-#define WXEXTHELP_SEPARATOR _T('\\')
-#elif defined(__WXMAC__)
-#define WXEXTHELP_SEPARATOR _T(':')
-#else
-#define WXEXTHELP_SEPARATOR _T('/')
-#endif
-
-class WXDLLIMPEXP_ADV wxExtHelpMapList;
-
 #ifndef WXEXTHELP_DEFAULTBROWSER
 /// Default browser name.
 #   define WXEXTHELP_DEFAULTBROWSER _T("netscape")
@@ -53,7 +42,6 @@ class WXDLLIMPEXP_ADV wxExtHelpMapList;
 
 class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
 {
-DECLARE_CLASS(wxExtHelpController)
 public:
    wxExtHelpController(wxWindow* parentWindow = NULL);
    ~wxExtHelpController();
@@ -161,14 +149,23 @@ DECLARE_CLASS(wxExtHelpController)
    int              m_NumOfEntries;
    /// A list containing all id,url,documentation triples.
    wxList          *m_MapList;
+
+private:
+   // parse a single line of the map file (called by LoadFile())
+   //
+   // return true if the line was valid or false otherwise
+   bool ParseMapFileLine(const wxString& line);
+
    /// Deletes the list and all objects.
    void DeleteList(void);
 
- private:
+
    /// How to call the html viewer.
    wxString         m_BrowserName;
    /// Is the viewer a variant of netscape?
    bool             m_BrowserIsNetscape;
+
+    DECLARE_CLASS(wxExtHelpController)
 };
 
 #endif // wxUSE_HELP

src/generic/helpext.cpp

@@ -27,7 +27,8 @@
     #include "wx/log.h"
 #endif
 
-#include "wx/helpbase.h"
+#include "wx/filename.h"
+#include "wx/textfile.h"
 #include "wx/generic/helpext.h"
 
 #include <stdio.h>
@@ -53,8 +54,7 @@
 
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   _T("wxhelp.map")
-/// Maximum line length in map file.
+
-#define WXEXTHELP_BUFLEN 512
 /// Character introducing comments/documentation field in map file.
 #define WXEXTHELP_COMMENTCHAR   ';'
 
@@ -145,7 +145,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
    wxString command;
    command = m_BrowserName;
    command << wxT(" file://")
-           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
+           << m_MapFile << wxFILE_SEP_PATH << relativeURL;
    return wxExecute(command) != 0;
 
 #else // UNIX
@@ -157,11 +157,11 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
       wxString lockfile;
       wxGetHomeDir(&lockfile);
 #ifdef __VMS__
-      lockfile << WXEXTHELP_SEPARATOR << wxT(".netscape]lock.");
+      lockfile << wxFILE_SEP_PATH << wxT(".netscape]lock.");
       struct stat statbuf;
       if(stat(lockfile.fn_str(), &statbuf) == 0)
 #else
-      lockfile << WXEXTHELP_SEPARATOR << wxT(".netscape/lock");
+      lockfile << wxFILE_SEP_PATH << wxT(".netscape/lock");
       struct stat statbuf;
       if(lstat(lockfile.fn_str(), &statbuf) == 0)
       // cannot use wxFileExists, because it's a link pointing to a
@@ -171,7 +171,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
          long success;
          command << m_BrowserName << wxT(" -remote openURL(")
                  << wxT("file://") << m_MapFile
-                 << WXEXTHELP_SEPARATOR << relativeURL << wxT(")");
+                 << wxFILE_SEP_PATH << relativeURL << wxT(")");
          success = wxExecute(command);
          if(success != 0 ) // returns PID on success
             return true;
@@ -180,7 +180,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 #endif
    command = m_BrowserName;
    command << wxT(" file://")
-           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
+           << m_MapFile << wxFILE_SEP_PATH << relativeURL;
    return wxExecute(command) != 0;
 #endif
 }
@@ -223,99 +223,150 @@ wxExtHelpController::Initialize(const wxString& file)
 }
 
 
-// ifile is the name of the base help directory
+bool wxExtHelpController::ParseMapFileLine(const wxString& line)
-bool wxExtHelpController::LoadFile(const wxString& ifile)
 {
-   wxString mapFile, file, url, doc;
+    const wxChar *p = line.c_str();
-   int id,i,len;
-   char buffer[WXEXTHELP_BUFLEN];
 
-   wxBusyCursor b; // display a busy cursor
+    // skip whitespace
+    while ( isascii(*p) && isspace(*p) )
+        p++;
 
-   if(! ifile.empty())
+    // skip empty lines and comments
+    if ( *p == _T('\0') || *p == WXEXTHELP_COMMENTCHAR )
+        return true;
+
+    // the line is of the form "num url" so we must have an integer now
+    wxChar *end;
+    const unsigned long id = wxStrtoul(p, &end, 0);
+
+    if ( end == p )
+        return false;
+
+    p = end;
+    while ( isascii(*p) && isspace(*p) )
+        p++;
+
+    // next should be the URL
+    wxString url;
+    url.reserve(line.length());
+    while ( isascii(*p) && !isspace(*p) )
+        url += *p++;
+
+    while ( isascii(*p) && isspace(*p) )
+        p++;
+
+    // and finally the optional description of the entry after comment
+    wxString doc;
+    if ( *p == WXEXTHELP_COMMENTCHAR )
     {
-      file = ifile;
+        p++;
-      if(! wxIsAbsolutePath(file))
+        while ( isascii(*p) && isspace(*p) )
-      {
+            p++;
-         file = wxGetCwd();
+        doc = p;
-#ifdef __WXMAC__
-         file << ifile;
-#else
-         file << WXEXTHELP_SEPARATOR << ifile;
-#endif
     }
-      else
+
-         file = ifile;
+    m_MapList->Append(new wxExtHelpMapEntry(id, url, doc));
+    m_NumOfEntries++;
+
+    return true;
+}
+
+// file is a misnomer as it's the name of the base help directory
+bool wxExtHelpController::LoadFile(const wxString& file)
+{
+    wxFileName helpDir(wxFileName::DirName(file));
+    helpDir.MakeAbsolute();
+
+    bool dirExists = false;
 
 #if wxUSE_INTL
-      // If a locale is set, look in file/localename, i.e.
+    // If a locale is set, look in file/localename, i.e. If passed
-      // If passed "/usr/local/myapp/help" and the current wxLocale is
+    // "/usr/local/myapp/help" and the current wxLocale is set to be "de", then
-      // set to be "de", then look in "/usr/local/myapp/help/de/"
+    // look in "/usr/local/myapp/help/de/" first and fall back to
-      // first and fall back to "/usr/local/myapp/help" if that
+    // "/usr/local/myapp/help" if that doesn't exist.
-      // doesn't exist.
+    const wxLocale * const loc = wxGetLocale();
-      if(wxGetLocale() && !wxGetLocale()->GetName().empty())
+    if ( loc )
     {
-         wxString newfile;
+        wxString locName = loc->GetName();
-         newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
+
-         if(wxDirExists(newfile))
+        // the locale is in general of the form xx_YY.zzzz, try the full firm
-            file = newfile;
+        // first and then also more general ones
-         else
+        wxFileName helpDirLoc(helpDir);
+        helpDirLoc.AppendDir(locName);
+        dirExists = helpDirLoc.DirExists();
+
+        if ( !dirExists )
         {
-            newfile = WXEXTHELP_SEPARATOR;
+            // try without encoding
-            const wxChar *cptr = wxGetLocale()->GetName().c_str();
+            const wxString locNameWithoutEncoding = locName.BeforeLast(_T('.'));
-            while(*cptr && *cptr != wxT('_'))
+            if ( !locNameWithoutEncoding.empty() )
-               newfile << *(cptr++);
+            {
-            if(wxDirExists(newfile))
+                helpDirLoc = helpDir;
-               file = newfile;
+                helpDirLoc.AppendDir(locNameWithoutEncoding);
+                dirExists = helpDirLoc.DirExists();
             }
         }
-#endif
 
-      if(! wxDirExists(file))
+        if ( !dirExists )
+        {
+            // try without country part
+            wxString locNameWithoutCountry = locName.BeforeLast(_T('_'));
+            if ( !locNameWithoutCountry.empty() )
+            {
+                helpDirLoc = helpDir;
+                helpDirLoc.AppendDir(locNameWithoutCountry);
+                dirExists = helpDirLoc.DirExists();
+            }
+        }
+
+        if ( dirExists )
+            helpDir = helpDirLoc;
+    }
+#endif // wxUSE_INTL
+
+    if ( !dirExists && !helpDir.DirExists() )
+    {
+        wxLogError(_("Help directory \"%s\" not found."),
+                   helpDir.GetFullPath().c_str());
         return false;
-
-      mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
     }
-   else // try to reload old file
-      mapFile = m_MapFile;
 
-   if(! wxFileExists(mapFile))
+    const wxFileName mapFile(helpDir.GetFullPath(), WXEXTHELP_MAPFILE);
+    if ( !mapFile.FileExists() )
+    {
+        wxLogError(_("Help file \"%s\" not found."),
+                   mapFile.GetFullPath().c_str());
         return false;
+    }
 
     DeleteList();
     m_MapList = new wxList;
     m_NumOfEntries = 0;
 
-   FILE *input = wxFopen(mapFile,wxT("rt"));
+    wxTextFile input;
-   if(! input)
+    if ( !input.Open(mapFile.GetFullPath()) )
         return false;
-   do
-   {
-      if(fgets(buffer,WXEXTHELP_BUFLEN,input) && *buffer != WXEXTHELP_COMMENTCHAR)
-      {
-         len = strlen(buffer);
-         if(buffer[len-1] == '\n')
-            buffer[len-1] = '\0'; // cut of trailing newline
-         if(sscanf(buffer,"%d", &id) != 1)
-            break; // error
-         for(i=0; isdigit(buffer[i])||isspace(buffer[i])||buffer[i]=='-'; i++)
-            ; // find begin of URL
-         url = wxEmptyString;
-         while(buffer[i] && ! isspace(buffer[i]) && buffer[i] !=
-               WXEXTHELP_COMMENTCHAR)
-            url << (wxChar) buffer[i++];
-         while(buffer[i] && buffer[i] != WXEXTHELP_COMMENTCHAR)
-            i++;
-         doc = wxEmptyString;
-         if(buffer[i])
-            doc = wxString::FromAscii( (buffer + i + 1) ); // skip the comment character
-         m_MapList->Append(new wxExtHelpMapEntry(id,url,doc));
-         m_NumOfEntries++;
-      }
-   }while(! feof(input));
-   fclose(input);
 
-   m_MapFile = file; // now it's valid
+    for ( wxString& line = input.GetFirstLine();
+          !input.Eof();
+          line = input.GetNextLine() )
+    {
+        if ( !ParseMapFileLine(line) )
+        {
+            wxLogWarning(_("Line %lu of map file \"%s\" has invalid syntax, skipped."),
+                         (unsigned long)input.GetCurrentLine(),
+                         mapFile.GetFullPath().c_str());
+        }
+    }
+
+    if ( !m_NumOfEntries )
+    {
+        wxLogError(_("No valid mappings found in the file \"%s\"."),
+                   mapFile.GetFullPath().c_str());
+        return false;
+    }
+
+    m_MapFile = helpDir.GetFullPath(); // now it's valid
     return true;
 }
 
@@ -342,7 +393,7 @@ wxExtHelpController::DisplayContents()
 
    bool rc = false;
    wxString file;
-   file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
+   file << m_MapFile << wxFILE_SEP_PATH << contents;
    if(file.Contains(wxT('#')))
       file = file.BeforeLast(wxT('#'));
    if(contents.length() && wxFileExists(file))