X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7fc59f4a1baeb7efa2268317cf49953829a3119..7dfdce6b02b6ec828d7e5519d8d67438147e9bb8:/src/common/fs_inet.cpp?ds=sidebyside

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 7c0b89d38a..8fe70604f9 100644
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -6,130 +6,146 @@
 // 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>
+#include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
-#if wxUSE_FS_INET
+#if !wxUSE_SOCKETS
+    #undef wxUSE_FS_INET
+    #define wxUSE_FS_INET 0
+#endif
+
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
 #endif
 
 #include "wx/wfstream.h"
 #include "wx/url.h"
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"
+#include "wx/module.h"
+
+// ----------------------------------------------------------------------------
+// Helper classes
+// ----------------------------------------------------------------------------
 
-class wxInetCacheNode : public wxObject
+// 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
+// ----------------------------------------------------------------------------
 
+static wxString StripProtocolAnchor(const wxString& location)
+{
+    wxString myloc(location.BeforeLast(wxT('#')));
+    if (myloc.IsEmpty()) myloc = location.AfterFirst(wxT(':'));
+    else myloc = myloc.AfterFirst(wxT(':'));
 
+    // fix malformed url:
+    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('/');
 
-//--------------------------------------------------------------------------------
-// wxInternetFSHandler
-//--------------------------------------------------------------------------------
+    return myloc;
+}
 
 
 bool wxInternetFSHandler::CanOpen(const wxString& 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);
+    }
+
+    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);
+    wxString right =
+        GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);
 
-    // Add item into cache:
-    if (info != NULL)
+    wxURL url(right);
+    if (url.GetError() == wxURL_NOERR)
     {
-        wxURL url(right);
-        s = url.GetInputStream();
-        content = url.GetProtocol().GetContentType();
+        wxInputStream *s = url.GetInputStream();
+        wxString content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
-        if (s) 
-	{
-            wxChar buf[256];
-
-            wxGetTempFileName( _T("wxhtml"), buf);
-            info = new wxInetCacheNode(buf, content);
-            m_Cache.Put(right, info);
-
-            {   // ok, now copy it:
-                wxFileOutputStream sout(buf);
-                s -> Read(sout); // copy the stream
+        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
+                        );
         }
-        else
-	{ 
-	    return (wxFSFile*) NULL; // we can't open the URL
-	}
     }
 
-    // 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 (wxFSFile*) NULL; // incorrect URL
 }
 
 
-
-wxInternetFSHandler::~wxInternetFSHandler()
+class wxFileSystemInternetModule : public wxModule
 {
-    wxNode *n;
-    wxInetCacheNode *n2;
+    DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule)
 
-    m_Cache.BeginFind();
-    while ((n = m_Cache.Next()) != NULL) 
-    {
-        n2 = (wxInetCacheNode*) n->GetData();
-        wxRemoveFile(n2->GetTemp());
-        delete n2;
-    }
-}
+    public:
+        virtual bool OnInit()
+        {
+            wxFileSystem::AddHandler(new wxInternetFSHandler);
+            return TRUE;
+        }
+        virtual void OnExit() {}
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 
-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET