X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..a380af4dbff98b71780c32772625f1d974522e4e:/src/common/fs_zip.cpp diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index 706cd05352..8c928d263a 100644 --- 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 + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "fs_zip.h" #endif #include "wx/wxprec.h" -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif #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/hashmap.h" #include "wx/filesys.h" #include "wx/zipstrm.h" #include "wx/fs_zip.h" @@ -34,10 +38,12 @@ #include "unzip.h" #endif +WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, + wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxZipFSHandler -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- @@ -46,14 +52,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 +70,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,24 +83,39 @@ 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.Contains(wxT("./"))) + { + 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); + + 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), - wxDateTime(wxFileModificationTime(left))); - } - else - { - if (s) - delete s; - return NULL; + GetAnchor(location) +#if wxUSE_DATETIME + , wxDateTime(wxFileModificationTime(left)) +#endif // wxUSE_DATETIME + ); } + + delete s; + return NULL; } @@ -99,36 +124,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.mb_str()); + wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath(); + m_Archive = (void*) unzOpen(nativename.mb_str(wxConvFile)); 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 wxLongToLongHashMap(); + } + return DoFind(); } } - return DoFind(); + return wxEmptyString; } @@ -145,42 +189,55 @@ 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]; + wxLongToLongHashMap::iterator it = m_DirsFound->find(key); + if (it == m_DirsFound->end()) + { + (*m_DirsFound)[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 +#endif //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM