X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..6e2fef031b643ceda4ff4bd6f1920ecb20780c6e:/src/common/fs_inet.cpp diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index cba29271dc..7e9ce0fe02 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -3,29 +3,16 @@ // Purpose: HTTP and FTP file system // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "fs_inet.h" #endif #include "wx/wxprec.h" -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -45,26 +32,37 @@ limitation) #include "wx/fs_inet.h" #include "wx/module.h" -class wxInetCacheNode : public wxObject -{ - private: - wxString m_Temp; - wxString m_Mime; - - 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;} -}; +// ---------------------------------------------------------------------------- +// Helper classes +// ---------------------------------------------------------------------------- +// This stream deletes the file when destroyed +class wxTemporaryFileInputStream : public wxFileInputStream +{ +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); + } +protected: + wxString m_filename; +}; -//-------------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // wxInternetFSHandler -//-------------------------------------------------------------------------------- - +// ---------------------------------------------------------------------------- static wxString StripProtocolAnchor(const wxString& location) { @@ -84,7 +82,6 @@ static wxString StripProtocolAnchor(const wxString& location) } - bool wxInternetFSHandler::CanOpen(const wxString& location) { wxString p = GetProtocol(location); @@ -94,77 +91,48 @@ bool wxInternetFSHandler::CanOpen(const wxString& location) return (url.GetError() == wxURL_NOERR); } - return FALSE; + return false; } -wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) +wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), + const wxString& location) { - wxString right = GetProtocol(location) + wxT(":") + StripProtocolAnchor(location); - wxInputStream *s; - wxString content; - wxInetCacheNode *info; + wxString right = + GetProtocol(location) + wxT(":") + StripProtocolAnchor(location); - info = (wxInetCacheNode*) m_Cache.Get(right); - - // Add item into cache: - if (info == NULL) + wxURL url(right); + if (url.GetError() == wxURL_NOERR) { - wxURL url(right); - if (url.GetError() == wxURL_NOERR) + wxInputStream *s = url.GetInputStream(); + wxString content = url.GetProtocol().GetContentType(); + if (content == wxEmptyString) content = GetMimeTypeFromExt(location); + if (s) { - 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; + wxString tmpfile = + wxFileName::CreateTempFileName(wxT("wxhtml")); + + { // now copy streams content to temporary file: + wxFileOutputStream sout(tmpfile); + s->Read(sout); } - else - return (wxFSFile*) NULL; // we can't open the URL + delete s; + + return new wxFSFile(new wxTemporaryFileInputStream(tmpfile), + right, + content, + GetAnchor(location) +#if wxUSE_DATETIME + , wxDateTime::Now() +#endif // wxUSE_DATETIME + ); } - else - return (wxFSFile*) NULL; // incorrect URL } - // Load item from cache: - s = new wxFileInputStream(info->GetTemp()); - if (!s) - return (wxFSFile*) NULL; - - return new wxFSFile(s, - right, - info->GetMime(), - GetAnchor(location), - wxDateTime::Now()); + return (wxFSFile*) NULL; // incorrect URL } - -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) @@ -173,7 +141,7 @@ class wxFileSystemInternetModule : public wxModule virtual bool OnInit() { wxFileSystem::AddHandler(new wxInternetFSHandler); - return TRUE; + return true; } virtual void OnExit() {} };