replaced wxFDIODispatcher::RunLoop() with Dispatch() which handles only one event...

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 65cc39f1c0e8cf9cdeb1af6d4102e82481b93be3..038e55407fb989b4b18b83a29f7c535414c3bdaf 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -20,21 +20,39 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/module.h"

 #endif
 
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/wfstream.h"

-#include "wx/module.h"

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

+#include "wx/tokenzr.h"
+#include "wx/uri.h"
+#include "wx/private/fileback.h"

 
 

+// ----------------------------------------------------------------------------
+// wxFSFile
+// ----------------------------------------------------------------------------

 
 

-//--------------------------------------------------------------------------------
+const wxString& wxFSFile::GetMimeType() const
+{
+    if ( m_MimeType.empty() && !m_Location.empty() )
+    {
+        wxConstCast(this, wxFSFile)->m_MimeType =
+            wxFileSystemHandler::GetMimeTypeFromExt(m_Location);
+    }
+
+    return m_MimeType;
+}
+
+// ----------------------------------------------------------------------------

 // wxFileSystemHandler
 // wxFileSystemHandler

-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 

+/* static */

 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
     wxString ext, mime;
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
     wxString ext, mime;


@@ -67,27 +85,27 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
                            wxEmptyString,
                            wxEmptyString,
                            _T("JPEG image (from fallback)"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("JPEG image (from fallback)"),

-                           _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
+                           _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), wxNullPtr),

             wxFileTypeInfo(_T("image/gif"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("GIF image (from fallback)"),
             wxFileTypeInfo(_T("image/gif"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("GIF image (from fallback)"),

-                           _T("gif"), _T("GIF"), NULL),
+                           _T("gif"), _T("GIF"), wxNullPtr),

             wxFileTypeInfo(_T("image/png"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("PNG image (from fallback)"),
             wxFileTypeInfo(_T("image/png"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("PNG image (from fallback)"),

-                           _T("png"), _T("PNG"), NULL),
+                           _T("png"), _T("PNG"), wxNullPtr),

             wxFileTypeInfo(_T("image/bmp"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("windows bitmap image (from fallback)"),
             wxFileTypeInfo(_T("image/bmp"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("windows bitmap image (from fallback)"),

-                           _T("bmp"), _T("BMP"), NULL),
+                           _T("bmp"), _T("BMP"), wxNullPtr),

             wxFileTypeInfo(_T("text/html"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("HTML document (from fallback)"),
             wxFileTypeInfo(_T("text/html"),
                            wxEmptyString,
                            wxEmptyString,
                            _T("HTML document (from fallback)"),

-                           _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
+                           _T("htm"), _T("html"), _T("HTM"), _T("HTML"), wxNullPtr),

             // must terminate the table with this!
             wxFileTypeInfo()
         };
             // must terminate the table with this!
             wxFileTypeInfo()
         };


@@ -121,7 +139,8 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
 
 
 
 
 

-wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetProtocol(const wxString& location)

 {
     wxString s = wxEmptyString;
     int i, l = location.length();
 {
     wxString s = wxEmptyString;
     int i, l = location.length();


@@ -136,7 +155,8 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
 }
 
 
 }
 
 

-wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetLeftLocation(const wxString& location)

 {
     int i;
     bool fnd = false;
 {
     int i;
     bool fnd = false;


@@ -148,7 +168,8 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetRightLocation(const wxString& location)

 {
     int i, l = location.length();
     int l2 = l + 1;
 {
     int i, l = location.length();
     int l2 = l + 1;


@@ -164,7 +185,8 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
     else return location.Mid(i + 1, l2 - i - 2);
 }
 
     else return location.Mid(i + 1, l2 - i - 2);
 }
 

-wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
+/* static */
+wxString wxFileSystemHandler::GetAnchor(const wxString& location)

 {
     wxChar c;
     int l = location.length();
 {
     wxChar c;
     int l = location.length();


@@ -213,7 +235,13 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
 
     // we need to check whether we can really read from this file, otherwise
     // wxFSFile is not going to work
 
     // we need to check whether we can really read from this file, otherwise
     // wxFSFile is not going to work

+#if wxUSE_FFILE

     wxFFileInputStream *is = new wxFFileInputStream(fullpath);
     wxFFileInputStream *is = new wxFFileInputStream(fullpath);

+#elif wxUSE_FILE
+    wxFileInputStream *is = new wxFileInputStream(fullpath);
+#else
+#error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work
+#endif

     if ( !is->Ok() )
     {
         delete is;
     if ( !is->Ok() )
     {
         delete is;


@@ -222,7 +250,7 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
 
     return new wxFSFile(is,
                         right,
 
     return new wxFSFile(is,
                         right,

-                        GetMimeTypeFromExt(location),
+                        wxEmptyString,

                         GetAnchor(location)
 #if wxUSE_DATETIME
                         ,wxDateTime(wxFileModificationTime(fullpath))
                         GetAnchor(location)
 #if wxUSE_DATETIME
                         ,wxDateTime(wxFileModificationTime(fullpath))


@@ -254,6 +282,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)
 wxList wxFileSystem::m_Handlers;
 
 
 wxList wxFileSystem::m_Handlers;
 
 

+wxFileSystem::~wxFileSystem()
+{
+    WX_CLEAR_HASH_MAP(wxFSHandlerHash, m_LocalHandlers)
+}
+
+

 static wxString MakeCorrectPath(const wxString& path)
 {
     wxString p(path);
 static wxString MakeCorrectPath(const wxString& path)
 {
     wxString p(path);


@@ -350,8 +384,30 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 
 
 
 
 
 

-wxFSFile* wxFileSystem::OpenFile(const wxString& location)
+wxFileSystemHandler *wxFileSystem::MakeLocal(wxFileSystemHandler *h)
+{
+    wxClassInfo *classinfo = h->GetClassInfo();
+
+    if (classinfo->IsDynamic())
+    {
+        wxFileSystemHandler*& local = m_LocalHandlers[classinfo];
+        if (!local)
+            local = (wxFileSystemHandler*)classinfo->CreateObject();
+        return local;
+    }
+    else
+    {
+        return h;
+    }
+}
+
+
+
+wxFSFile* wxFileSystem::OpenFile(const wxString& location, int flags)

 {
 {

+    if ((flags & wxFS_READ) == 0)
+        return NULL;
+

     wxString loc = MakeCorrectPath(location);
     unsigned i, ln;
     wxChar meta;
     wxString loc = MakeCorrectPath(location);
     unsigned i, ln;
     wxChar meta;


@@ -362,7 +418,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     meta = 0;
     for (i = 0; i < ln; i++)
     {
     meta = 0;
     for (i = 0; i < ln; i++)
     {

-        switch (loc[i])
+        switch ( loc[i].GetValue() )

         {
             case wxT('/') : case wxT(':') : case wxT('#') :
                 meta = loc[i];
         {
             case wxT('/') : case wxT(':') : case wxT('#') :
                 meta = loc[i];


@@ -381,7 +437,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             if (h->CanOpen(m_Path + loc))
             {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             if (h->CanOpen(m_Path + loc))
             {

-                s = h->OpenFile(*this, m_Path + loc);
+                s = MakeLocal(h)->OpenFile(*this, m_Path + loc);

                 if (s) { m_LastName = m_Path + loc; break; }
             }
             node = node->GetNext();
                 if (s) { m_LastName = m_Path + loc; break; }
             }
             node = node->GetNext();


@@ -397,12 +453,21 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
             if (h->CanOpen(loc))
             {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
             if (h->CanOpen(loc))
             {

-                s = h->OpenFile(*this, loc);
+                s = MakeLocal(h)->OpenFile(*this, loc);

                 if (s) { m_LastName = loc; break; }
             }
             node = node->GetNext();
         }
     }
                 if (s) { m_LastName = loc; break; }
             }
             node = node->GetNext();
         }
     }

+
+    if (s && (flags & wxFS_SEEKABLE) != 0 && !s->GetStream()->IsSeekable())
+    {
+        wxBackedInputStream *stream;
+        stream = new wxBackedInputStream(s->DetachStream());
+        stream->FindLength();
+        s->SetStream(stream);
+    }
+

     return (s);
 }
 
     return (s);
 }
 


@@ -421,18 +486,24 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
     node = m_Handlers.GetFirst();
     while (node)
     {
     node = m_Handlers.GetFirst();
     while (node)
     {

-        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
-        if (m_FindFileHandler -> CanOpen(m_Path + spec2))
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
+        if (h -> CanOpen(m_Path + spec2))
+        {
+            m_FindFileHandler = MakeLocal(h);

             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);

+        }

         node = node->GetNext();
     }
 
     node = m_Handlers.GetFirst();
     while (node)
     {
         node = node->GetNext();
     }
 
     node = m_Handlers.GetFirst();
     while (node)
     {

-        m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
-        if (m_FindFileHandler -> CanOpen(spec2))
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
+        if (h -> CanOpen(spec2))
+        {
+            m_FindFileHandler = MakeLocal(h);

             return m_FindFileHandler -> FindFirst(spec2, flags);
             return m_FindFileHandler -> FindFirst(spec2, flags);

+        }

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


@@ -447,14 +518,75 @@ wxString wxFileSystem::FindNext()
     else return m_FindFileHandler -> FindNext();
 }
 
     else return m_FindFileHandler -> FindNext();
 }
 

+bool wxFileSystem::FindFileInPath(wxString *pStr,
+                                  const wxString& path,
+                                  const wxString& basename)
+{
+    // we assume that it's not empty
+    wxCHECK_MSG( !basename.empty(), false,
+                _T("empty file name in wxFileSystem::FindFileInPath"));
+
+    wxString name;
+    // skip path separator in the beginning of the file name if present
+    if ( wxIsPathSeparator(basename[0u]) )
+        name = basename.substr(1);
+    else
+        name = basename;

 
 

+    wxStringTokenizer tokenizer(path, wxPATH_SEP);
+    while ( tokenizer.HasMoreTokens() )
+    {
+        wxString strFile = tokenizer.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += name;
+
+        wxFSFile *file = OpenFile(strFile);
+        if ( file )
+        {
+            delete file;
+            *pStr = strFile;
+            return true;
+        }
+    }
+
+    return false;
+}

 
 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {
 
 void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 {

-    m_Handlers.Append(handler);
+    // prepend the handler to the beginning of the list because handlers added
+    // last should have the highest priority to allow overriding them
+    m_Handlers.Insert((size_t)0, handler);
+}
+
+wxFileSystemHandler* wxFileSystem::RemoveHandler(wxFileSystemHandler *handler)
+{
+    // if handler has already been removed (or deleted)
+    // we return NULL. This is by design in case
+    // CleanUpHandlers() is called before RemoveHandler
+    // is called, as we cannot control the order
+    // which modules are unloaded
+    if (!m_Handlers.DeleteObject(handler))
+        return NULL;
+
+    return handler;

 }
 
 
 }
 
 

+bool wxFileSystem::HasHandlerForPath(const wxString &location)
+{
+    for ( wxList::compatibility_iterator node = m_Handlers.GetFirst();
+           node; node = node->GetNext() )
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
+        if (h->CanOpen(location))
+            return true;
+    }
+
+    return false;
+}
+

 void wxFileSystem::CleanUpHandlers()
 {
     WX_CLEAR_LIST(wxList, m_Handlers);
 void wxFileSystem::CleanUpHandlers()
 {
     WX_CLEAR_LIST(wxList, m_Handlers);


@@ -482,8 +614,7 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url)
         path = path.Mid(2);
 #endif
 
         path = path.Mid(2);
 #endif
 

-    path.Replace(wxT("%25"), wxT("%"));
-    path.Replace(wxT("%3A"), wxT(":"));
+    path = wxURI::Unescape(path);

 
 #ifdef __WXMSW__
     // file urls either start with a forward slash (local harddisk),
 
 #ifdef __WXMSW__
     // file urls either start with a forward slash (local harddisk),


@@ -530,7 +661,8 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
 #endif
 
     url.Replace(g_nativePathString, g_unixPathString);
 #endif
 
     url.Replace(g_nativePathString, g_unixPathString);

-    url.Replace(wxT("%"), wxT("%25"));
+    url.Replace(wxT("%"), wxT("%25")); // '%'s must be replaced first!
+    url.Replace(wxT("#"), wxT("%23"));

     url.Replace(wxT(":"), wxT("%3A"));
     url = wxT("file:") + url;
     return url;
     url.Replace(wxT(":"), wxT("%3A"));
     url = wxT("file:") + url;
     return url;


@@ -544,15 +676,28 @@ class wxFileSystemModule : public wxModule
     DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
 
     public:
     DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
 
     public:

+        wxFileSystemModule() :
+            wxModule(),
+            m_handler(NULL)
+        {
+        }
+

         virtual bool OnInit()
         {
         virtual bool OnInit()
         {

-            wxFileSystem::AddHandler(new wxLocalFSHandler);
+            m_handler = new wxLocalFSHandler;
+            wxFileSystem::AddHandler(m_handler);

             return true;
         }
         virtual void OnExit()
         {
             return true;
         }
         virtual void OnExit()
         {

+            delete wxFileSystem::RemoveHandler(m_handler);
+

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

+
+    private:
+        wxFileSystemHandler* m_handler;
+

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)