fix for handling from Francesco

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

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 97cfa0bb1b9da6c8dbf57fbe81e4d2944f818256..b8ef9b69f9abecca8f7595c3117465f4445843ce 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -4,52 +4,60 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-
-#ifdef __GNUG__
-#pragma implementation "fs_zip.h"
-#endif
-

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

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM && wxUSE_ZLIB

 
 #ifndef WXPRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 
 
 #ifndef WXPRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif
 

-#include "wx/hash.h"

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

+#include "wx/wfstream.h"

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

-/* Not the right solution (paths in makefiles) but... */
-#ifdef __BORLANDC__
-#include "../common/unzip.h"
-#else
-#include "unzip.h"
-#endif

 
 

+//---------------------------------------------------------------------------
+// wxZipFSInputStream
+//---------------------------------------------------------------------------
+// Helper class for wxZipFSHandler

 
 

-//--------------------------------------------------------------------------------
-// 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;
     m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
 
 wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 {
     m_Archive = NULL;
     m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;

-    m_AllowDirs = m_AllowFiles = TRUE;
+    m_AllowDirs = m_AllowFiles = true;

     m_DirsFound = NULL;
 }
 
     m_DirsFound = NULL;
 }
 


@@ -57,46 +65,79 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 
 wxZipFSHandler::~wxZipFSHandler()
 {
 
 wxZipFSHandler::~wxZipFSHandler()
 {

-    if (m_Archive)
-        unzClose((unzFile)m_Archive);
-    if (m_DirsFound)
-        delete m_DirsFound;
+    Cleanup();

 }
 
 
 }
 
 

+void wxZipFSHandler::Cleanup()
+{
+    wxDELETE(m_Archive);
+    wxDELETE(m_DirsFound);
+}
+ 
+

 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    return (p == wxT("zip")) &&
-           (GetProtocol(GetLeftLocation(location)) == wxT("file"));
+    return (p == wxT("zip"));

 }
 
 
 }
 
 

-
-

 wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);
     wxString left = GetLeftLocation(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) != wxT("file"))
+    if (right.Contains(wxT("./")))

     {
     {

-        wxLogError(_("ZIP handler currently supports only local files!"));
-        return NULL;
+        if (right.GetChar(0) != wxT('/')) right = wxT('/') + right;
+        wxFileName rightPart(right, wxPATH_UNIX);
+        rightPart.Normalize(wxPATH_NORM_DOTS, wxT("/"), wxPATH_UNIX);
+        right = rightPart.GetFullPath(wxPATH_UNIX);

     }
 
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 
     }
 
     if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
 

-    s = new wxZipInputStream(left, right);
-    if (s && (s->LastError() == wxStream_NOERROR))
+    // a new wxFileSystem object is needed here to avoid infinite recursion
+    wxFSFile *leftFile = wxFileSystem().OpenFile(left);
+    if (!leftFile)
+       return NULL;
+
+    s = new wxZipFSInputStream(leftFile);
+    if (s && s->IsOk())

     {
     {

-        return new wxFSFile(s,
+#if wxUSE_DATETIME
+       wxDateTime dtMod;
+#endif // wxUSE_DATETIME
+
+       bool found = false;
+       while (!found)
+       {
+           wxZipEntry *ent = s->GetNextEntry();
+           if (!ent)
+               break;
+
+           if (ent->GetInternalName() == right)
+           {
+               found = true;
+               dtMod = ent->GetDateTime();
+           }
+
+           delete ent;
+       }
+       if (found)
+       {
+           return new wxFSFile(s,

                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),
                             left + wxT("#zip:") + right,
                             GetMimeTypeFromExt(location),

-                            GetAnchor(location),
-                            wxDateTime(wxFileModificationTime(left)));
+                            GetAnchor(location)
+#if wxUSE_DATETIME
+                            , dtMod
+#endif // wxUSE_DATETIME
+                            );
+       }

     }
 
     delete s;
     }
 
     delete s;


@@ -110,51 +151,45 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
     wxString right = GetRightLocation(spec);
     wxString left = GetLeftLocation(spec);
 
     wxString right = GetRightLocation(spec);
     wxString left = GetLeftLocation(spec);
 

-    if (right.Last() == wxT('/')) right.RemoveLast();
+    if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast();

 
     if (m_Archive)
     {
 
     if (m_Archive)
     {

-        unzClose((unzFile)m_Archive);
+        delete m_Archive;

         m_Archive = NULL;
     }
 
         m_Archive = NULL;
     }
 

-    if (GetProtocol(left) != wxT("file"))
-    {
-        wxLogError(_("ZIP handler currently supports only local files!"));
-        return wxEmptyString;
-    }
-

     switch (flags)
     {
         case wxFILE:
     switch (flags)
     {
         case wxFILE:

-            m_AllowDirs = FALSE, m_AllowFiles = TRUE; break;
+            m_AllowDirs = false, m_AllowFiles = true; break;

         case wxDIR:
         case wxDIR:

-            m_AllowDirs = TRUE, m_AllowFiles = FALSE; break;
+            m_AllowDirs = true, m_AllowFiles = false; break;

         default:
         default:

-            m_AllowDirs = m_AllowFiles = TRUE; break;
+            m_AllowDirs = m_AllowFiles = true; break;

     }
 
     m_ZipFile = left;
     }
 
     m_ZipFile = left;

-    m_Archive = (void*) unzOpen(m_ZipFile.mb_str());
+
+    wxFSFile *leftFile = wxFileSystem().OpenFile(left);
+    if (leftFile)
+        m_Archive = new wxZipFSInputStream(leftFile);
+

     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));

+    if (m_BaseDir.StartsWith(wxT("/")))
+        m_BaseDir = m_BaseDir.Mid(1);

 
     if (m_Archive)
     {
 
     if (m_Archive)
     {

-        if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK)
-        {
-            unzClose((unzFile)m_Archive);
-            m_Archive = NULL;
-        }
-        else
+        if (m_AllowDirs)

         {
         {

-            if (m_AllowDirs)
-            {
-                delete m_DirsFound;
-                m_DirsFound = new wxHashTableLong();
-            }
-            return DoFind();
+            delete m_DirsFound;
+            m_DirsFound = new wxZipFilenameHashMap();
+            if (right.empty())  // allow "/" to match the archive root
+                return spec;

         }
         }

+        return DoFind();

     }
     return wxEmptyString;
 }
     }
     return wxEmptyString;
 }


@@ -171,31 +206,33 @@ wxString wxZipFSHandler::FindNext()
 
 wxString wxZipFSHandler::DoFind()
 {
 
 wxString wxZipFSHandler::DoFind()
 {

-    static char namebuf[1024]; // char, not wxChar!
-    char *c;

     wxString namestr, dir, filename;
     wxString match = wxEmptyString;
 
     while (match == wxEmptyString)
     {
     wxString namestr, dir, filename;
     wxString match = wxEmptyString;
 
     while (match == wxEmptyString)
     {

-        unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0);
-        for (c = namebuf; *c; c++) if (*c == wxT('\\')) *c = wxT('/');
-        namestr = namebuf;
+        wxZipEntry *entry = m_Archive->GetNextEntry();
+        if (!entry)
+        {
+            delete m_Archive;
+            m_Archive = NULL;
+            break;
+        }
+        namestr = entry->GetName(wxPATH_UNIX);
+        delete entry;

 
         if (m_AllowDirs)
         {
             dir = namestr.BeforeLast(wxT('/'));
 
         if (m_AllowDirs)
         {
             dir = namestr.BeforeLast(wxT('/'));

-            while (!dir.IsEmpty())
+            while (!dir.empty())

             {
             {

-                long key = 0;
-                for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
-                if (m_DirsFound->Get(key) == wxNOT_FOUND)
+                if( m_DirsFound->find(dir) == m_DirsFound->end() )

                 {
                 {

-                    m_DirsFound->Put(key, 1);
+                    (*m_DirsFound)[dir] = 1;

                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));

-                    if (!filename.IsEmpty() && m_BaseDir == dir &&
-                                wxMatchWild(m_Pattern, filename, FALSE))
+                    if (!filename.empty() && m_BaseDir == dir &&
+                                wxMatchWild(m_Pattern, filename, false))

                         match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename;
                 }
                 else
                         match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename;
                 }
                 else


@@ -205,16 +242,9 @@ wxString wxZipFSHandler::DoFind()
 
         filename = namestr.AfterLast(wxT('/'));
         dir = namestr.BeforeLast(wxT('/'));
 
         filename = namestr.AfterLast(wxT('/'));
         dir = namestr.BeforeLast(wxT('/'));

-        if (m_AllowFiles && !filename.IsEmpty() && m_BaseDir == dir &&
-                            wxMatchWild(m_Pattern, filename, FALSE))
+        if (m_AllowFiles && !filename.empty() && m_BaseDir == dir &&
+                            wxMatchWild(m_Pattern, filename, false))

             match = m_ZipFile + wxT("#zip:") + namestr;
             match = m_ZipFile + wxT("#zip:") + namestr;

-
-        if (unzGoToNextFile((unzFile)m_Archive) != UNZ_OK)
-        {
-            unzClose((unzFile)m_Archive);
-            m_Archive = NULL;
-            break;
-        }

     }
 
     return match;
     }
 
     return match;