Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 3af1151d62712478818b94ccf53136252311a2ca..6a9a4793018b7d3c5c4c1533f8b3299d43c31ed5 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -1,32 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fs_inet.cpp
+// Name:        src/common/fs_inet.cpp

 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     HTTP and FTP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-/*
+#include "wx/wxprec.h"

 
 

-REMARKS :
-
-This FS creates local cache (in /tmp directory). The cache is freed
-on program exit.
-
-Size of cache is limited to cca 1000 items (due to GetTempFileName
-limitation)
-
-
-*/
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <wx/wxprec.h>
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #if !wxUSE_SOCKETS
 #endif
 
 #if !wxUSE_SOCKETS


@@ -34,10 +17,10 @@ limitation)
     #define wxUSE_FS_INET 0
 #endif
 
     #define wxUSE_FS_INET 0
 #endif
 

-#if wxUSE_FS_INET
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET

 
 

-#ifndef WXPRECOMP
-#include <wx/wx.h>
+#ifndef WX_PRECOMP
+    #include "wx/module.h"

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


@@ -45,111 +28,138 @@ limitation)
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"
 
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"
 

-class wxInetCacheNode : public wxObject
+// ----------------------------------------------------------------------------
+// Helper classes
+// ----------------------------------------------------------------------------
+
+// This stream deletes the file when destroyed
+class wxTemporaryFileInputStream : public wxFileInputStream

 {
 {

-    private:
-        wxString m_Temp;
-        wxString m_Mime;
+public:
+    wxTemporaryFileInputStream(const wxString& filename) :
+        wxFileInputStream(filename), m_filename(filename) {}

 
 

-    public:
-        wxInetCacheNode(const wxString& l, const wxString& m) : wxObject() {m_Temp = l; m_Mime = m;}
-        const wxString& GetTemp() const {return m_Temp;}
-        const wxString& GetMime() const {return m_Mime;}
+    virtual ~wxTemporaryFileInputStream()
+    {
+        // NB: copied from wxFileInputStream dtor, we need to do it before
+        //     wxRemoveFile
+        if (m_file_destroy)
+        {
+            delete m_file;
+            m_file_destroy = false;
+        }
+        wxRemoveFile(m_filename);
+    }
+
+protected:
+    wxString m_filename;

 };
 
 
 };
 
 

+// ----------------------------------------------------------------------------
+// wxInternetFSHandler
+// ----------------------------------------------------------------------------

 
 

+static wxString StripProtocolAnchor(const wxString& location)
+{
+    wxString myloc(location.BeforeLast(wxT('#')));
+    if (myloc.empty()) myloc = location.AfterFirst(wxT(':'));
+    else myloc = myloc.AfterFirst(wxT(':'));

 
 

+    // fix malformed url:
+    if (!myloc.Left(2).IsSameAs(wxT("//")))
+    {
+        if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
+        else myloc = wxT("/") + myloc;
+    }
+    if (myloc.Mid(2).Find(wxT('/')) == wxNOT_FOUND) myloc << wxT('/');

 
 

-//--------------------------------------------------------------------------------
-// wxInternetFSHandler
-//--------------------------------------------------------------------------------
+    return myloc;
+}

 
 
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
 
 
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {

+#if wxUSE_URL

     wxString p = GetProtocol(location);
     wxString p = GetProtocol(location);

-    return (p == _T("http")) || (p == _T("ftp"));
+    if ((p == wxT("http")) || (p == wxT("ftp")))
+    {
+        wxURL url(p + wxT(":") + StripProtocolAnchor(location));
+        return (url.GetError() == wxURL_NOERR);
+    }
+#endif
+    return false;

 }
 
 
 }
 
 

-wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
+wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
+                                        const wxString& location)

 {
 {

-    wxString right = GetProtocol(location) + _T(":") + GetRightLocation(location);
-    wxInputStream *s;
-    wxString content;
-    wxInetCacheNode *info;
-
-    info = (wxInetCacheNode*) m_Cache.Get(right);
-
-    // Add item into cache:
-    if (info == NULL)
+#if !wxUSE_URL
+    return NULL;
+#else
+    wxString right =
+        GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);
+
+    wxURL url(right);
+    if (url.GetError() == wxURL_NOERR)

     {
     {

-        wxURL url(right);
-        s = url.GetInputStream();
-        content = url.GetProtocol().GetContentType();
-        if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
+        wxInputStream *s = url.GetInputStream();
+        wxString content = url.GetProtocol().GetContentType();

         if (s)
         {
         if (s)
         {

-            wxChar buf[256];
-
-            wxGetTempFileName( _T("wxhtml"), buf);
-            info = new wxInetCacheNode(buf, content);
-            m_Cache.Put(right, info);
+            wxString tmpfile =
+                wxFileName::CreateTempFileName(wxT("wxhtml"));

 
 

-            {   // ok, now copy it:
-                wxFileOutputStream sout(wxString(buf));
-                s -> Read(sout); // copy the stream
+            {   // now copy streams content to temporary file:
+                wxFileOutputStream sout(tmpfile);
+                s->Read(sout);

             }
             delete s;
             }
             delete s;

-        }
-        else
-        {
-            return (wxFSFile*) NULL; // we can't open the URL
+
+            return new wxFSFile(new wxTemporaryFileInputStream(tmpfile),
+                                right,
+                                content,
+                                GetAnchor(location)
+#if wxUSE_DATETIME
+                                , wxDateTime::Now()
+#endif // wxUSE_DATETIME
+                        );

         }
     }
 
         }
     }
 

-    // Load item from cache:
-    s = new wxFileInputStream(info->GetTemp());
-    if (s)
-    {
-        return new wxFSFile(s,
-                            right,
-                            info->GetMime(),
-                            GetAnchor(location));
-    }
-    else return (wxFSFile*) NULL;
+    return NULL; // incorrect URL
+#endif

 }
 
 
 }
 
 

-
-wxInternetFSHandler::~wxInternetFSHandler()
-{
-    wxNode *n;
-    wxInetCacheNode *n2;
-
-    m_Cache.BeginFind();
-    while ((n = m_Cache.Next()) != NULL)
-    {
-        n2 = (wxInetCacheNode*) n->GetData();
-        wxRemoveFile(n2->GetTemp());
-        delete n2;
-    }
-}
-

 class wxFileSystemInternetModule : public wxModule
 {
     DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
 
     public:
 class wxFileSystemInternetModule : public wxModule
 {
     DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
 
     public:

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

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

-            wxFileSystem::AddHandler(new wxInternetFSHandler);
-            return TRUE;
+            m_handler = new wxInternetFSHandler;
+            wxFileSystem::AddHandler(m_handler);
+            return true;
+        }
+
+        virtual void OnExit()
+        {
+            delete wxFileSystem::RemoveHandler(m_handler);

         }
         }

-        virtual void OnExit() {}
+
+    private:
+        wxFileSystemHandler* m_handler;

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 

-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET