delay getting the default editor and renderer (by data type) until

[wxWidgets.git] / src / common / filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 24e5687e6dd7951ceff86d16f86d5a94d4ac7073..1f9cbc486f57786c9c8c5e9f54681bda573c05a5 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -3,6 +3,7 @@
 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxFileSystem class - interface for opening files
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

+// CVS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -21,11 +22,15 @@
     #define wxUSE_FS_INET 0
 #endif
 
     #define wxUSE_FS_INET 0
 #endif
 

-#if (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS

 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/filesys.h"
 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/filesys.h"

+#include "wx/mimetype.h"
+
+
+

 
 //--------------------------------------------------------------------------------
 // wxFileSystemHandler
 
 //--------------------------------------------------------------------------------
 // wxFileSystemHandler


@@ -33,14 +38,6 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 

-wxMimeTypesManager *wxFileSystemHandler::m_MimeMng = NULL;
-
-void wxFileSystemHandler::CleanUpStatics()
-{
-    if (m_MimeMng) delete m_MimeMng;
-    m_MimeMng = NULL;
-}
-

 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {


@@ -58,9 +55,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
         if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;}
     }
 
         if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;}
     }
 

-    if (m_MimeMng == NULL) {
-        m_MimeMng = new wxMimeTypesManager;
-
+    static bool s_MinimalMimeEnsured = FALSE;
+    if (!s_MinimalMimeEnsured) {

         static const wxFileTypeInfo fallbacks[] =
         {
             wxFileTypeInfo("image/jpeg",
         static const wxFileTypeInfo fallbacks[] =
         {
             wxFileTypeInfo("image/jpeg",


@@ -93,12 +89,18 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
             wxFileTypeInfo()
         };
 
             wxFileTypeInfo()
         };
 

-        m_MimeMng -> AddFallbacks(fallbacks);
+        wxTheMimeTypesManager -> AddFallbacks(fallbacks);

     }
 
     }
 

-    ft = m_MimeMng -> GetFileTypeFromExtension(ext);
-    if (ft && (ft -> GetMimeType(&mime))) return mime;
-    else return wxEmptyString;
+    ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
+    if (ft && (ft -> GetMimeType(&mime))) {
+        delete ft; 
+        return mime;
+    }
+    else {
+        delete ft;
+        return wxEmptyString;
+    }

 }
 
 
 }
 
 


@@ -155,11 +157,16 @@ wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
 }
 
 
 }
 
 

-wxString wxFileSystemHandler::FindFirst(const wxString& spec, int flags)  { return wxEmptyString; }
-
-wxString wxFileSystemHandler::FindNext() { return wxEmptyString; }
-
+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                        int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}

 
 

+wxString wxFileSystemHandler::FindNext()
+{
+    return wxEmptyString;
+}

 
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler
 
 //--------------------------------------------------------------------------------
 // wxLocalFSHandler


@@ -187,7 +194,8 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
         return new wxFSFile(new wxFileInputStream(right),
                             right,
                             GetMimeTypeFromExt(location),
         return new wxFSFile(new wxFileInputStream(right),
                             right,
                             GetMimeTypeFromExt(location),

-                            GetAnchor(location));
+                            GetAnchor(location),
+                            wxDateTime(wxFileModificationTime(right)));

     else return (wxFSFile*) NULL;
 }
 
     else return (wxFSFile*) NULL;
 }
 


@@ -214,14 +222,51 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
 wxList wxFileSystem::m_Handlers;
 
 
 wxList wxFileSystem::m_Handlers;
 
 

+static wxString MakeCorrectPath(const wxString& path)
+{
+    wxString p(path);
+    wxString r;
+    int i, j, cnt;
+    
+    cnt = p.Length();
+    for (i = 0; i < cnt; i++)
+      if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
+        
+    if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }
+    
+    if (cnt < 3) return p;
+    
+    r << p.GetChar(0) << p.GetChar(1);
+    
+    // skip trailing ../.., if any
+    for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i);
+    
+    // remove back references: translate dir1/../dir2 to dir2
+    for (; i < cnt; i++)
+    {
+        r << p.GetChar(i);
+        if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
+        {
+            for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+            if (j >= 0 && r.GetChar(j) != wxT(':'))
+            {
+                for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+                r.Remove(j + 1);
+            }
+        }
+    }
+        
+    for (; i < cnt; i++) r << p.GetChar(i);
+        
+    return r;
+}
+

 
 void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 {
     int i, pathpos = -1;
 
 void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 {
     int i, pathpos = -1;

-    m_Path = location;

 
 

-    for (i = m_Path.Length()-1; i >= 0; i--)
-        if (m_Path[(unsigned int) i] == wxT('\\')) m_Path.GetWritableChar(i) = wxT('/');         // wanna be windows-safe
+    m_Path = MakeCorrectPath(location);

 
     if (is_dir)
     {
 
     if (is_dir)
     {


@@ -275,8 +320,8 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 
 wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 {
 
 wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 {

-    wxString loc = location;
-    int i, ln;
+    wxString loc = MakeCorrectPath(location);
+    unsigned i, ln;

     char meta;
     wxFSFile *s = NULL;
     wxNode *node;
     char meta;
     wxFSFile *s = NULL;
     wxNode *node;


@@ -285,11 +330,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     meta = 0;
     for (i = 0; i < ln; i++)
     {
     meta = 0;
     for (i = 0; i < ln; i++)
     {

-        if (loc[(unsigned int) i] == wxT('\\')) loc.GetWritableChar(i) = wxT('/');         // wanna be windows-safe

         if (!meta) 
         if (!meta) 

-            switch (loc[(unsigned int) i])
+            switch (loc[i])

                {
                {

-                case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[(unsigned int) i];
+                case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[i];

             }
     }
     m_LastName = wxEmptyString;
             }
     }
     m_LastName = wxEmptyString;


@@ -301,10 +345,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();

-            if (h->CanOpen(m_Path + location))
+            if (h->CanOpen(m_Path + loc))

                {
                {

-                s = h->OpenFile(*this, m_Path + location);
-                if (s) { m_LastName = m_Path + location; break; }
+                s = h->OpenFile(*this, m_Path + loc);
+                if (s) { m_LastName = m_Path + loc; break; }

             }
             node = node->GetNext();
         }
             }
             node = node->GetNext();
         }


@@ -317,10 +361,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
         while (node)
        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();

-            if (h->CanOpen(location))
+            if (h->CanOpen(loc))

            {
            {

-                s = h->OpenFile(*this, location);
-                if (s) { m_LastName = location; break; }
+                s = h->OpenFile(*this, loc);
+                if (s) { m_LastName = loc; break; }

             }
             node = node->GetNext();
         }
             }
             node = node->GetNext();
         }


@@ -338,7 +382,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)
     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)

-        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // wanna be windows-safe
+        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe

 
     node = m_Handlers.GetFirst();
     while (node)
 
     node = m_Handlers.GetFirst();
     while (node)


@@ -400,7 +444,6 @@ class wxFileSystemModule : public wxModule
         }
         virtual void OnExit()
        {
         }
         virtual void OnExit()
        {

-           wxFileSystemHandler::CleanUpStatics();

             wxFileSystem::CleanUpHandlers();
        }
 };
             wxFileSystem::CleanUpHandlers();
        }
 };