really show the window after creation (calling Show(TRUE) doesn't do it any more)

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

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 8d295d4677376326b449a754f0dd0003f0f5c295..8fe70604f9c0d7bb6d92171309b83886d34fcbfd 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -6,26 +6,13 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*
-
-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
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "fs_inet.h"
 #endif
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
@@ -34,10 +21,9 @@ limitation)
     #define wxUSE_FS_INET 0
 #endif
 
-#if wxUSE_FS_INET
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
 #endif
 
 #include "wx/wfstream.h"
@@ -46,118 +32,107 @@ limitation)
 #include "wx/fs_inet.h"
 #include "wx/module.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) {}
+    
+    ~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);        
+    }
 
-    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;}
+protected:
+    wxString m_filename;
 };
 
 
-
-
-
-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxInternetFSHandler
-//--------------------------------------------------------------------------------
-
+// ----------------------------------------------------------------------------
 
-bool wxInternetFSHandler::CanOpen(const wxString& location)
+static wxString StripProtocolAnchor(const wxString& location)
 {
-    wxString p = GetProtocol(location);
-    if ((p == wxT("http")) || (p == wxT("ftp"))) 
-    {
-        wxURL url(GetProtocol(location) + wxT(":") + GetRightLocation(location));
-        return (url.GetError() == wxURL_NOERR);
-    }
-    else 
-        return FALSE;
-}
-
+    wxString myloc(location.BeforeLast(wxT('#')));
+    if (myloc.IsEmpty()) myloc = location.AfterFirst(wxT(':'));
+    else myloc = myloc.AfterFirst(wxT(':'));
 
-wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
-{
-    wxString myloc(GetRightLocation(location));
-    
     // fix malformed url:
-    if (myloc.Left(2) != wxT("//")) 
+    if (myloc.Left(2) != wxT("//"))
     {
         if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc;
         else myloc = wxT("/") + myloc;
     }
     if (myloc.Mid(2).Find(wxT('/')) == wxNOT_FOUND) myloc << wxT('/');
 
-    wxString right = GetProtocol(location) + wxT(":") + myloc;
-    wxInputStream *s;
-    wxString content;
-    wxInetCacheNode *info;
+    return myloc;
+}
 
-    info = (wxInetCacheNode*) m_Cache.Get(right);
 
-    // Add item into cache:
-    if (info == NULL)
+bool wxInternetFSHandler::CanOpen(const wxString& location)
+{
+    wxString p = GetProtocol(location);
+    if ((p == wxT("http")) || (p == wxT("ftp")))
     {
-        wxURL url(right);
-        if (url.GetError() == wxURL_NOERR) 
-        {
-            s = url.GetInputStream();
-            content = url.GetProtocol().GetContentType();
-            if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
-            if (s)
-            {
-                wxChar buf[256];
-
-                wxGetTempFileName( wxT("wxhtml"), buf);
-                info = new wxInetCacheNode(buf, content);
-                m_Cache.Put(right, info);
-
-                {   // ok, now copy it:
-                    wxFileOutputStream sout((wxString)buf);
-                    s -> Read(sout); // copy the stream
-                }
-                delete s;
-            }
-            else
-                return (wxFSFile*) NULL; // we can't open the URL
-        }
-        else
-            return (wxFSFile*) NULL; // incorrect URL
+        wxURL url(p + wxT(":") + StripProtocolAnchor(location));
+        return (url.GetError() == wxURL_NOERR);
     }
 
-    // Load item from cache:
-    s = new wxFileInputStream(info->GetTemp());
-    if (s)
-    {
-        return new wxFSFile(s,
-                            right,
-                            info->GetMime(),
-                            GetAnchor(location),
-                            wxDateTime::Today());
-    }
-    else return (wxFSFile*) NULL;
+    return FALSE;
 }
 
 
-
-wxInternetFSHandler::~wxInternetFSHandler()
+wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
+                                        const wxString& location)
 {
-    wxNode *n;
-    wxInetCacheNode *n2;
+    wxString right =
+        GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);
 
-    m_Cache.BeginFind();
-    while ((n = m_Cache.Next()) != NULL)
+    wxURL url(right);
+    if (url.GetError() == wxURL_NOERR)
     {
-        n2 = (wxInetCacheNode*) n->GetData();
-        wxRemoveFile(n2->GetTemp());
-        delete n2;
+        wxInputStream *s = url.GetInputStream();
+        wxString content = url.GetProtocol().GetContentType();
+        if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
+        if (s)
+        {
+            wxString tmpfile =
+                wxFileName::CreateTempFileName(wxT("wxhtml"));
+
+            {   // now copy streams content to temporary file:
+                wxFileOutputStream sout(tmpfile);
+                s->Read(sout);
+            }
+            delete s;
+    
+            return new wxFSFile(new wxTemporaryFileInputStream(tmpfile),
+                                right,
+                                content,
+                                GetAnchor(location)
+#if wxUSE_DATETIME
+                                , wxDateTime::Now()
+#endif // wxUSE_DATETIME
+                        );
+        }
     }
+
+    return (wxFSFile*) NULL; // incorrect URL
 }
 
+
 class wxFileSystemInternetModule : public wxModule
 {
     DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
@@ -173,4 +148,4 @@ class wxFileSystemInternetModule : public wxModule
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 
-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET