added and documented wxDir::HasFiles/SubDirs(), use the latter in wxDirDialog - it...

[wxWidgets.git] / src / common / fs_inet.cpp

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 4a06c7c46010ae4c9d5c7d42c11f00ae0c0b64eb..cba29271dcc07f07ba27d93cd3d37b19764afdd0 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -20,7 +20,7 @@ limitation)
 */
 
 #ifdef __GNUG__
 */
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "fs_inet.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -34,10 +34,9 @@ limitation)
     #define wxUSE_FS_INET 0
 #endif
 
     #define wxUSE_FS_INET 0
 #endif
 

-#if wxUSE_FS_INET
+#if wxUSE_FILESYSTEM && wxUSE_FS_INET

 
 #ifndef WXPRECOMP
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"

 #endif
 
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/wfstream.h"


@@ -67,22 +66,41 @@ class wxInetCacheNode : public wxObject
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

+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);
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    if ((p == wxT("http")) || (p == wxT("ftp"))) 
+    if ((p == wxT("http")) || (p == wxT("ftp")))

     {
     {

-        wxURL url(GetProtocol(location) + wxT(":") + GetRightLocation(location));
+        wxURL url(p + wxT(":") + StripProtocolAnchor(location));

         return (url.GetError() == wxURL_NOERR);
     }
         return (url.GetError() == wxURL_NOERR);
     }

-    else 
-        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(":") + GetRightLocation(location);
+    wxString right = GetProtocol(location) + wxT(":") + StripProtocolAnchor(location);

     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;
     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;


@@ -93,7 +111,7 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
     if (info == NULL)
     {
         wxURL url(right);
     if (info == NULL)
     {
         wxURL url(right);

-        if (url.GetError() == wxURL_NOERR) 
+        if (url.GetError() == wxURL_NOERR)

         {
             s = url.GetInputStream();
             content = url.GetProtocol().GetContentType();
         {
             s = url.GetInputStream();
             content = url.GetProtocol().GetContentType();


@@ -121,14 +139,14 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
 
     // Load item from cache:
     s = new wxFileInputStream(info->GetTemp());
 
     // Load item from cache:
     s = new wxFileInputStream(info->GetTemp());

-    if (s)
-    {
-        return new wxFSFile(s,
-                            right,
-                            info->GetMime(),
-                            GetAnchor(location));
-    }
-    else return (wxFSFile*) NULL;
+    if (!s)
+        return (wxFSFile*) NULL;
+
+    return new wxFSFile(s,
+                        right,
+                        info->GetMime(),
+                        GetAnchor(location),
+                        wxDateTime::Now());

 }
 
 
 }
 
 


@@ -162,4 +180,4 @@ class wxFileSystemInternetModule : public wxModule
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemInternetModule, wxModule)
 

-#endif // wxUSE_FS_INET
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_INET