wxImage::Ok() now returns false for images with 0 width or height

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index e78ce297a0ffb5907a39631b6615f4d7ceb953e3..3a4f8deab63deaa2f7b52052742d0e6ae84e5180 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -3,10 +3,12 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

+// CVS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 

+

 #ifdef __GNUG__
 #pragma implementation
 #endif
 #ifdef __GNUG__
 #pragma implementation
 #endif


@@ -23,6 +25,7 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#include "wx/hash.h"

 #include "wx/filesys.h"
 #include "wx/zipstrm.h"
 #include "wx/fs_zip.h"
 #include "wx/filesys.h"
 #include "wx/zipstrm.h"
 #include "wx/fs_zip.h"


@@ -46,6 +49,7 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
     m_Archive = NULL;
     m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
     m_AllowDirs = m_AllowFiles = TRUE;
     m_Archive = NULL;
     m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
     m_AllowDirs = m_AllowFiles = TRUE;

+    m_DirsFound = NULL;

 }
 
 
 }
 
 


@@ -54,6 +58,8 @@ wxZipFSHandler::~wxZipFSHandler()
 {
     if (m_Archive)         
         unzClose((unzFile)m_Archive);
 {
     if (m_Archive)         
         unzClose((unzFile)m_Archive);

+    if (m_DirsFound)
+        delete m_DirsFound;

 }
 
 
 }
 
 


@@ -61,7 +67,7 @@ wxZipFSHandler::~wxZipFSHandler()
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    return (p == wxT("zip") );
+    return (p == wxT("zip"));

 }
 
 
 }
 
 


@@ -73,12 +79,15 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
     wxString left = GetLeftLocation(location);
     wxInputStream *s;
 
     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);
         return NULL;
     }
 
     s = new wxZipInputStream(left, right);

-    if (s && (s -> LastError() == wxStream_NOERROR)) {
+    if (s && (s->LastError() == wxStream_NOERROR)) 
+    {

         return new wxFSFile(s,
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
         return new wxFSFile(s,
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),


@@ -99,19 +108,26 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     
     if (right.Last() == wxT('/')) right.RemoveLast();
 
     
     if (right.Last() == wxT('/')) right.RemoveLast();
 

-    if (m_Archive) {
+    if (m_Archive) 
+    {

         unzClose((unzFile)m_Archive);
         m_Archive = NULL;
     }
 
         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;
     }
 
         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_ZipFile = left;


@@ -119,13 +135,24 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 
     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;        
         }
             unzClose((unzFile)m_Archive);
             m_Archive = NULL;        
         }

+        else 
+        {
+            if (m_AllowDirs)
+            {
+                delete m_DirsFound;
+                m_DirsFound = new wxHashTableLong();
+            }
+            return DoFind();
+        }

     }
     }

-    return DoFind();
+    return wxEmptyString;

 }
 
 
 }
 
 


@@ -142,32 +169,44 @@ wxString wxZipFSHandler::DoFind()
 {
     static char namebuf[1024]; // char, not wxChar!
     char *c;
 {
     static char namebuf[1024]; // char, not wxChar!
     char *c;

-    wxString fn, dir, name;
+    wxString namestr, dir, filename;

     wxString match = wxEmptyString;
     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('/');
 
     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;
+        namestr = namebuf;
+
+        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('/'));
-
-        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;
-        }
+        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 (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK) {
+        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK) 
+        {

             unzClose((unzFile)m_Archive);
             m_Archive = NULL;
             break;
             unzClose((unzFile)m_Archive);
             m_Archive = NULL;
             break;