Use wxFileSystem for left hand side. Patches 1169934 and 1173497 from Stas

Sergeev and Artur Kornacki.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/fs_zip.h

@@ -47,7 +47,6 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
         wxZipFilenameHashMap *m_DirsFound;
 
         wxString DoFind();
-        void CloseArchive(class wxZipInputStream *archive);
 
     DECLARE_NO_COPY_CLASS(wxZipFSHandler)
 };

src/common/fs_zip.cpp

@@ -32,12 +32,33 @@
 #include "wx/fs_zip.h"
 
 
+//---------------------------------------------------------------------------
+// wxZipFSInputStream
+//---------------------------------------------------------------------------
+// Helper class for wxZipFSHandler
+
+class wxZipFSInputStream : public wxZipInputStream
+{
+    public:
+       wxZipFSInputStream(wxFSFile *file)
+               : wxZipInputStream(*file->GetStream())
+       {
+            m_file = file;
+#if 1 //WXWIN_COMPATIBILITY_2_6
+            m_allowSeeking = true;
+#endif
+       }
+
+       virtual ~wxZipFSInputStream() { delete m_file; }
+
+    private:
+       wxFSFile *m_file;
+};
+
 //----------------------------------------------------------------------------
 // wxZipFSHandler
 //----------------------------------------------------------------------------
 
-
-
 wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 {
     m_Archive = NULL;
@@ -51,43 +72,25 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 wxZipFSHandler::~wxZipFSHandler()
 {
     if (m_Archive)
-        CloseArchive(m_Archive);
+        delete m_Archive;
     if (m_DirsFound)
         delete m_DirsFound;
 }
 
 
 
-void wxZipFSHandler::CloseArchive(wxZipInputStream *archive)
-{
-    wxInputStream *stream = archive->GetFilterInputStream();
-    delete archive;
-    delete stream;
-}
-
-
-
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
-    return (p == wxT("zip")) &&
+    return (p == wxT("zip"));
-           (GetProtocol(GetLeftLocation(location)) == wxT("file"));
 }
 
 
-
+wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& fs, const wxString& location)
-
-wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);
     wxString left = GetLeftLocation(location);
-    wxInputStream *s;
+    wxZipInputStream *s;
-
-    if (!GetProtocol(left).IsSameAs(wxT("file")))
-    {
-        wxLogError(_("ZIP handler currently supports only local files!"));
-        return NULL;
-    }
 
     if (right.Contains(wxT("./")))
     {
@@ -99,12 +102,22 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
 
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 
-    wxFileName leftFilename = wxFileSystem::URLToFileName(left);
+    wxFSFile *leftFile = fs.OpenFile(left);
+    if (!leftFile)
+       return NULL;
 
-    s = new wxZipInputStream(leftFilename.GetFullPath(), right);
+    s = new wxZipFSInputStream(leftFile);
-    if (s && s->IsOk() )
+    if (s && s->IsOk())
     {
-        return new wxFSFile(s,
+       wxZipEntry *ent;
+       bool found = false;
+       while (!found && (ent = s->GetNextEntry())) {
+           if (ent->GetInternalName() == right)
+               found = true;
+           delete ent;
+       }
+       if (found)
+           return new wxFSFile(s,
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
                             GetAnchor(location)
@@ -129,16 +142,10 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
 
     if (m_Archive)
     {
-        CloseArchive(m_Archive);
+        delete m_Archive;
         m_Archive = NULL;
     }
 
-    if (!GetProtocol(left).IsSameAs(wxT("file")))
-    {
-        wxLogError(_("ZIP handler currently supports only local files!"));
-        return wxEmptyString;
-    }
-
     switch (flags)
     {
         case wxFILE:
@@ -150,13 +157,10 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     }
 
     m_ZipFile = left;
-    wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
 
-    wxFFileInputStream *fs = new wxFFileInputStream(nativename);
+    wxFSFile *leftFile = wxFileSystem().OpenFile(left);
-    if (fs->Ok())
+    if (leftFile)
-        m_Archive = new wxZipInputStream(*fs);
+        m_Archive = new wxZipFSInputStream(leftFile);
-    else
-        delete fs;
 
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
@@ -193,7 +197,7 @@ wxString wxZipFSHandler::DoFind()
         wxZipEntry *entry = m_Archive->GetNextEntry();
         if (!entry)
         {
-            CloseArchive(m_Archive);
+            delete m_Archive;
             m_Archive = NULL;
             break;
         }