Applied patch [ 686843 ] File Dialog Wildcard Bug

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index d390e17df0ea5120e0595d2311c8fe172ec5a280..fd0024f5c9699b4b9957933993ff3ab011b281ff 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -3,26 +3,30 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
+// CVS-ID:      $Id$
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
+
 #ifdef __GNUG__
-#pragma implementation
+#pragma implementation "fs_zip.h"
 #endif
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
-#if wxUSE_FS_ZIP
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
+#include "wx/hash.h"
 #include "wx/filesys.h"
 #include "wx/zipstrm.h"
 #include "wx/fs_zip.h"
@@ -46,14 +50,17 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
     m_Archive = NULL;
     m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
     m_AllowDirs = m_AllowFiles = TRUE;
+    m_DirsFound = NULL;
 }
 
 
 
 wxZipFSHandler::~wxZipFSHandler()
 {
-    if (m_Archive)         
+    if (m_Archive)
         unzClose((unzFile)m_Archive);
+    if (m_DirsFound)
+        delete m_DirsFound;
 }
 
 
@@ -61,7 +68,8 @@ wxZipFSHandler::~wxZipFSHandler()
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
-    return (p == wxT("zip") );
+    return (p == wxT("zip")) &&
+           (GetProtocol(GetLeftLocation(location)) == wxT("file"));
 }
 
 
@@ -73,18 +81,31 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
     wxString left = GetLeftLocation(location);
     wxInputStream *s;
 
-    if (GetProtocol(left) != wxT("file")) {
+    if (GetProtocol(left) != wxT("file"))
+    {
+        wxLogError(_("ZIP handler currently supports only local files!"));
         return NULL;
     }
 
-    s = new wxZipInputStream(left, right);
-    if (s && (s -> LastError() == wxStream_NOERROR)) {
+    if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
+
+    wxFileName leftFilename = wxFileSystem::URLToFileName(left);
+
+    s = new wxZipInputStream(leftFilename.GetFullPath(), right);
+    if (s && s->IsOk() )
+    {
         return new wxFSFile(s,
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
-                            GetAnchor(location));
+                            GetAnchor(location)
+#if wxUSE_DATETIME
+                            , wxDateTime(wxFileModificationTime(left))
+#endif // wxUSE_DATETIME
+                            );
     }
-    else return NULL;
+
+    delete s;
+    return NULL;
 }
 
 
@@ -93,36 +114,55 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
 {
     wxString right = GetRightLocation(spec);
     wxString left = GetLeftLocation(spec);
-    
+
     if (right.Last() == wxT('/')) right.RemoveLast();
 
-    if (m_Archive) {
+    if (m_Archive)
+    {
         unzClose((unzFile)m_Archive);
         m_Archive = NULL;
     }
 
-    if (GetProtocol(left) != wxT("file")) {
+    if (GetProtocol(left) != wxT("file"))
+    {
+        wxLogError(_("ZIP handler currently supports only local files!"));
         return wxEmptyString;
     }
 
-    switch (flags) {
-        case wxFILE  : m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;
-        case wxDIR   : m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;
-        default : m_AllowDirs = m_AllowFiles = TRUE; break;
+    switch (flags)
+    {
+        case wxFILE:
+            m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;
+        case wxDIR:
+            m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;
+        default:
+            m_AllowDirs = m_AllowFiles = TRUE; break;
     }
 
     m_ZipFile = left;
-    m_Archive = (void*) unzOpen(m_ZipFile.fn_str());
+    wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
+    m_Archive = (void*) unzOpen(nativename.mb_str());
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 
-    if (m_Archive) {
-        if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK) {
+    if (m_Archive)
+    {
+        if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK)
+        {
             unzClose((unzFile)m_Archive);
-            m_Archive = NULL;        
+            m_Archive = NULL;
+        }
+        else
+        {
+            if (m_AllowDirs)
+            {
+                delete m_DirsFound;
+                m_DirsFound = new wxHashTableLong();
+            }
+            return DoFind();
         }
     }
-    return DoFind();
+    return wxEmptyString;
 }
 
 
@@ -139,41 +179,54 @@ wxString wxZipFSHandler::DoFind()
 {
     static char namebuf[1024]; // char, not wxChar!
     char *c;
-    wxString fn, dir, name;
+    wxString namestr, dir, filename;
     wxString match = wxEmptyString;
-    bool wasdir;
 
     while (match == wxEmptyString)
     {
         unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0);
-        for (c = namebuf; *c; c++) if (*c == wxT('\\')) *c = wxT('/');
-        fn = namebuf;
-        if (fn.Last() == wxT('/')) {
-            fn.RemoveLast();
-            wasdir = TRUE;
+        for (c = namebuf; *c; c++) if (*c == '\\') *c = '/';
+        namestr = wxString::FromAscii( namebuf );    // TODO what encoding does ZIP use?
+
+        if (m_AllowDirs)
+        {
+            dir = namestr.BeforeLast(wxT('/'));
+            while (!dir.IsEmpty())
+            {
+                long key = 0;
+                for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
+                if (m_DirsFound->Get(key) == wxNOT_FOUND)
+                {
+                    m_DirsFound->Put(key, 1);
+                    filename = dir.AfterLast(wxT('/'));
+                    dir = dir.BeforeLast(wxT('/'));
+                    if (!filename.IsEmpty() && m_BaseDir == dir &&
+                                wxMatchWild(m_Pattern, filename, FALSE))
+                        match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename;
+                }
+                else
+                    break; // already tranversed
+            }
         }
-        else wasdir = FALSE;
 
-        name = fn.AfterLast(wxT('/'));
-        dir = fn.BeforeLast(wxT('/'));
+        filename = namestr.AfterLast(wxT('/'));
+        dir = namestr.BeforeLast(wxT('/'));
+        if (m_AllowFiles && !filename.IsEmpty() && m_BaseDir == dir &&
+                            wxMatchWild(m_Pattern, filename, FALSE))
+            match = m_ZipFile + wxT("#zip:") + namestr;
 
-        if (dir == m_BaseDir) {
-            if (m_AllowFiles && !wasdir && wxMatchWild(m_Pattern, name, FALSE))
-                match = m_ZipFile + wxT("#zip:") + fn;
-            if (m_AllowDirs && wasdir && wxMatchWild(m_Pattern, name, FALSE))
-                match = m_ZipFile + wxT("#zip:") + fn;
-        }
-        
-        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK) {
+        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK)
+        {
             unzClose((unzFile)m_Archive);
             m_Archive = NULL;
             break;
         }
     }
-    
+
     return match;
 }
 
 
 
-#endif // wxUSE_FS_ZIP
+#endif
+      //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM