#include <ctype.h>
IMPLEMENT_CLASS(wxProtoInfo, wxObject)
-IMPLEMENT_CLASS(wxURL, wxObject)
+IMPLEMENT_CLASS(wxURL, wxURI)
// Protocols list
wxProtoInfo *wxURL::ms_protocols = NULL;
#endif
// --------------------------------------------------------------
-// wxURL
+//
+// wxURL
+//
// --------------------------------------------------------------
// --------------------------------------------------------------
-// --------- wxURL CONSTRUCTOR DESTRUCTOR -----------------------
+// Construction
// --------------------------------------------------------------
-wxURL::wxURL(const wxString& url)
+wxURL::wxURL(const wxString& url) : wxURI(url)
+{
+ Init(url);
+ ParseURL();
+}
+
+wxURL::wxURL(const wxURI& url) : wxURI(url)
+{
+ Init(url.BuildURI());
+ ParseURL();
+}
+
+void wxURL::Init(const wxString& url)
{
m_protocol = NULL;
m_error = wxURL_NOERR;
m_proxy = ms_proxyDefault;
#endif // wxUSE_SOCKETS
+}
+
+// --------------------------------------------------------------
+// Assignment
+// --------------------------------------------------------------
+
+wxURL& wxURL::operator = (const wxURI& url)
+{
+ wxURI::operator = (url);
+ Init(url.BuildURI());
+ ParseURL();
+ return *this;
+}
+wxURL& wxURL::operator = (const wxString& url)
+{
+ wxURI::operator = (url);
+ Init(url);
ParseURL();
+ return *this;
}
+// --------------------------------------------------------------
+// ParseURL
+//
+// Builds the URL and takes care of the old protocol stuff
+// --------------------------------------------------------------
+
bool wxURL::ParseURL()
{
- wxString last_url = m_url;
-
// If the URL was already parsed (m_protocol != NULL), pass this section.
if (!m_protocol)
{
// Clean up
CleanData();
- // Extract protocol name
- if (!PrepProto(last_url))
+ // Make sure we have a protocol/scheme
+ if (!HasScheme())
{
m_error = wxURL_SNTXERR;
return false;
// Do we need a host name ?
if (m_protoinfo->m_needhost)
{
- // Extract it
- if (!PrepHost(last_url))
+ // Make sure we have one, then
+ if (!HasServer())
{
m_error = wxURL_SNTXERR;
return false;
}
}
-
- // Extract full path
- if (!PrepPath(last_url))
- {
- m_error = wxURL_NOPATH;
- return false;
- }
}
- // URL parse finished.
#if wxUSE_SOCKETS
if (m_useProxy)
delete m_protocol;
// Third, we rebuild the URL.
- m_url = m_protoname + wxT(":");
+ m_url = m_scheme + wxT(":");
if (m_protoinfo->m_needhost)
- m_url = m_url + wxT("//") + m_hostname;
-
- m_url += m_path;
+ m_url = m_url + wxT("//") + m_server;
// We initialize specific variables.
m_protocol = m_proxy; // FIXME: we should clone the protocol
return true;
}
+// --------------------------------------------------------------
+// Destruction/Cleanup
+// --------------------------------------------------------------
+
void wxURL::CleanData()
{
#if wxUSE_SOCKETS
}
// --------------------------------------------------------------
-// --------- wxURL urls decoders --------------------------------
+// FetchProtocol
// --------------------------------------------------------------
-bool wxURL::PrepProto(wxString& url)
-{
- int pos;
-
- // Find end
- pos = url.Find(wxT(':'));
- if (pos == wxNOT_FOUND)
- return false;
-
- m_protoname = url(0, pos);
-
- url = url(pos+1, url.Length());
-
- return true;
-}
-
-bool wxURL::PrepHost(wxString& url)
-{
- wxString temp_url;
- int pos, pos2;
-
- if ((url.GetChar(0) != wxT('/')) || (url.GetChar(1) != wxT('/')))
- return false;
-
- url = url(2, url.Length());
-
- pos = url.Find(wxT('/'));
- if (pos == wxNOT_FOUND)
- pos = url.Length();
-
- if (pos == 0)
- return false;
-
- temp_url = url(0, pos);
- url = url(url.Find(wxT('/')), url.Length());
-
- // Retrieve service number
- pos2 = temp_url.Find(wxT(':'), true);
- if (pos2 != wxNOT_FOUND && pos2 < pos)
- {
- m_servname = temp_url(pos2+1, pos);
- if (!m_servname.IsNumber())
- return false;
- temp_url = temp_url(0, pos2);
- }
-
- // Retrieve user and password.
- pos2 = temp_url.Find(wxT('@'));
- // Even if pos2 equals wxNOT_FOUND, this code is right.
- m_hostname = temp_url(pos2+1, temp_url.Length());
-
- m_user = wxT("");
- m_password = wxT("");
-
- if (pos2 == wxNOT_FOUND)
- return true;
-
- temp_url = temp_url(0, pos2);
- pos2 = temp_url.Find(wxT(':'));
-
- if (pos2 == wxNOT_FOUND)
- return false;
-
- m_user = temp_url(0, pos2);
- m_password = temp_url(pos2+1, url.Length());
-
- return true;
-}
-
-bool wxURL::PrepPath(wxString& url)
-{
- if (url.Length() != 0)
- m_path = ConvertToValidURI(url);
- else
- m_path = wxT("/");
- return true;
-}
-
bool wxURL::FetchProtocol()
{
wxProtoInfo *info = ms_protocols;
while (info)
{
- if (m_protoname == info->m_protoname)
+ if (m_scheme == info->m_protoname)
{
- if (m_servname.IsNull())
- m_servname = info->m_servname;
-
- m_protoinfo = info;
- m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
- return true;
+ if (m_port.IsNull())
+ m_port = info->m_servname;
+ m_protoinfo = info;
+ m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
+ return true;
}
info = info->next;
}
}
// --------------------------------------------------------------
-// --------- wxURL get ------------------------------------------
+// GetInputStream
// --------------------------------------------------------------
wxInputStream *wxURL::GetInputStream()
}
m_error = wxURL_NOERR;
- if (m_user != wxT(""))
+ if (HasUser())
{
- m_protocol->SetUser(m_user);
- m_protocol->SetPassword(m_password);
+ size_t dwPasswordPos = m_user.find(':');
+
+ if (dwPasswordPos == wxString::npos)
+ m_protocol->SetUser(m_user);
+ else
+ {
+ m_protocol->SetUser(m_user(0, dwPasswordPos));
+ m_protocol->SetPassword(m_user(dwPasswordPos+1, m_user.length() + 1));
+ }
}
#if wxUSE_URL_NATIVE
// m_protoinfo is NULL when we use a proxy
if (!m_useProxy && m_protoinfo->m_needhost)
{
- if (!addr.Hostname(m_hostname))
+ if (!addr.Hostname(m_server))
{
m_error = wxURL_NOHOST;
return NULL;
}
- addr.Service(m_servname);
+ addr.Service(m_port);
if (!m_protocol->Connect(addr, true)) // Watcom needs the 2nd arg for some reason
{
}
#endif // wxUSE_SOCKETS
-wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims)
-{
- wxString out_str;
- wxString hexa_code;
- size_t i;
-
- for (i = 0; i < uri.Len(); i++)
- {
- wxChar c = uri.GetChar(i);
-
- if (c == wxT(' '))
- {
- // GRG, Apr/2000: changed to "%20" instead of '+'
-
- out_str += wxT("%20");
- }
- else
- {
- // GRG, Apr/2000: modified according to the URI definition (RFC 2396)
- //
- // - Alphanumeric characters are never escaped
- // - Unreserved marks are never escaped
- // - Delimiters must be escaped if they appear within a component
- // but not if they are used to separate components. Here we have
- // no clear way to distinguish between these two cases, so they
- // are escaped unless they are passed in the 'delims' parameter
- // (allowed delimiters).
-
- static const wxChar marks[] = wxT("-_.!~*()'");
-
- if ( !wxIsalnum(c) && !wxStrchr(marks, c) && !wxStrchr(delims, c) )
- {
- hexa_code.Printf(wxT("%%%02X"), c);
- out_str += hexa_code;
- }
- else
- {
- out_str += c;
- }
- }
- }
-
- return out_str;
-}
-
-wxString wxURL::ConvertFromURI(const wxString& uri)
-{
- wxString new_uri;
-
- size_t i = 0;
- while (i < uri.Len())
- {
- int code;
- if (uri[i] == wxT('%'))
- {
- i++;
- if (uri[i] >= wxT('A') && uri[i] <= wxT('F'))
- code = (uri[i] - wxT('A') + 10) * 16;
- else if (uri[i] >= wxT('a') && uri[i] <= wxT('f'))
- code = (uri[i] - wxT('a') + 10) * 16;
- else
- code = (uri[i] - wxT('0')) * 16;
-
- i++;
- if (uri[i] >= wxT('A') && uri[i] <= wxT('F'))
- code += (uri[i] - wxT('A')) + 10;
- else if (uri[i] >= wxT('a') && uri[i] <= wxT('f'))
- code += (uri[i] - wxT('a')) + 10;
- else
- code += (uri[i] - wxT('0'));
-
- i++;
- new_uri += (wxChar)code;
- continue;
- }
- new_uri += uri[i];
- i++;
- }
- return new_uri;
-}
-
// ----------------------------------------------------------------------
+// wxURLModule
+//
// A module which deletes the default proxy if we created it
// ----------------------------------------------------------------------
projects / wxWidgets.git / blobdiff