#pragma implementation
#endif
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#ifdef __BORDLANDC__
#pragma hdrstop
#define wxUSE_FS_INET 0
#endif
-#if wxUSE_FS_INET
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET
#ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
#endif
#include "wx/wfstream.h"
//--------------------------------------------------------------------------------
+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('/');
+
+ return myloc;
+}
+
+
+
bool wxInternetFSHandler::CanOpen(const wxString& location)
{
wxString p = GetProtocol(location);
- return (p == wxT("http")) || (p == wxT("ftp"));
+ if ((p == wxT("http")) || (p == wxT("ftp")))
+ {
+ wxURL url(p + wxT(":") + StripProtocolAnchor(location));
+ return (url.GetError() == wxURL_NOERR);
+ }
+ else
+ return FALSE;
}
wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
{
- wxString right = GetProtocol(location) + wxT(":") + GetRightLocation(location);
+ wxString right = GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);
wxInputStream *s;
wxString content;
wxInetCacheNode *info;
if (info == NULL)
{
wxURL url(right);
- s = url.GetInputStream();
- content = url.GetProtocol().GetContentType();
- if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
- if (s)
+ if (url.GetError() == wxURL_NOERR)
{
- 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
+ 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;
}
- delete s;
+ else
+ return (wxFSFile*) NULL; // we can't open the URL
}
else
- {
- return (wxFSFile*) NULL; // we can't open the URL
- }
+ return (wxFSFile*) NULL; // incorrect URL
}
// Load item from cache:
return new wxFSFile(s,
right,
info->GetMime(),
- GetAnchor(location));
+ GetAnchor(location),
+ wxDateTime::Now());
}
else return (wxFSFile*) NULL;
}
IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET