X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..9534d0dfdc3c6fad8ea5d5fd31bbb6f20650929b:/src/common/fs_inet.cpp?ds=sidebyside diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index 4356b665ea..835cf15a7e 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -1,32 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fs_inet.cpp +// Name: src/common/fs_inet.cpp // Purpose: HTTP and FTP file system // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// RCS-ID: $Id$ +// 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) - - -*/ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "fs_inet.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if !wxUSE_SOCKETS @@ -36,44 +20,55 @@ limitation) #if wxUSE_FILESYSTEM && wxUSE_FS_INET -#ifndef WXPRECOMP +#ifndef WX_PRECOMP + #include "wx/module.h" #endif #include "wx/wfstream.h" #include "wx/url.h" #include "wx/filesys.h" #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) {} + 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.IsEmpty()) myloc = location.AfterFirst(wxT(':')); + if (myloc.empty()) myloc = location.AfterFirst(wxT(':')); else myloc = myloc.AfterFirst(wxT(':')); // fix malformed url: - if (myloc.Left(2) != wxT("//")) + if (!myloc.Left(2).IsSameAs(wxT("//"))) { if (myloc.GetChar(0) != wxT('/')) myloc = wxT("//") + myloc; else myloc = wxT("/") + myloc; @@ -84,101 +79,86 @@ static wxString StripProtocolAnchor(const wxString& location) } - bool wxInternetFSHandler::CanOpen(const wxString& location) { +#if wxUSE_URL wxString p = GetProtocol(location); if ((p == wxT("http")) || (p == wxT("ftp"))) { wxURL url(p + wxT(":") + StripProtocolAnchor(location)); return (url.GetError() == wxURL_NOERR); } - - return FALSE; +#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) + wxT(":") + StripProtocolAnchor(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); - if (url.GetError() == wxURL_NOERR) + wxInputStream *s = url.GetInputStream(); + wxString content = url.GetProtocol().GetContentType(); + 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; - } - else - return (wxFSFile*) NULL; // we can't open the URL - } - else - return (wxFSFile*) NULL; // incorrect URL - } + wxString tmpfile = + wxFileName::CreateTempFileName(wxT("wxhtml")); - // Load item from cache: - s = new wxFileInputStream(info->GetTemp()); - if (!s) - return (wxFSFile*) NULL; + { // now copy streams content to temporary file: + wxFileOutputStream sout(tmpfile); + s->Read(sout); + } + delete s; - return new wxFSFile(s, - right, - info->GetMime(), - GetAnchor(location) + return new wxFSFile(new wxTemporaryFileInputStream(tmpfile), + right, + content, + GetAnchor(location) #if wxUSE_DATETIME - , wxDateTime::Now() + , wxDateTime::Now() #endif // wxUSE_DATETIME ); -} - - - -wxInternetFSHandler::~wxInternetFSHandler() -{ - wxHashTable::compatibility_iterator n; - wxInetCacheNode *n2; - - m_Cache.BeginFind(); - while ((n = m_Cache.Next()) != 0) - { - n2 = (wxInetCacheNode*) n->GetData(); - wxRemoveFile(n2->GetTemp()); - delete n2; + } } + + return (wxFSFile*) NULL; // incorrect URL +#endif } + class wxFileSystemInternetModule : public wxModule { DECLARE_DYNAMIC_CLASS(wxFileSystemInternetModule) public: + wxFileSystemInternetModule() : + wxModule(), + m_handler(NULL) + { + } + 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)