X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6001e347baf63a91be525f3b9beeefde4bc16f19..414dfb5804fc568b26fec3f8a8ecc2f25addedfd:/src/common/fs_zip.cpp diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index e7765395d5..65fbf89cc2 100644 --- a/src/common/fs_zip.cpp +++ b/src/common/fs_zip.cpp @@ -3,41 +3,71 @@ // Purpose: ZIP file system // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// CVS-ID: $Id$ +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "fs_zip.h" #endif -#include +#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 + #include "wx/intl.h" + #include "wx/log.h" #endif #include "wx/filesys.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 -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxZipFSHandler -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- + + + +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) + unzClose((unzFile)m_Archive); + if (m_DirsFound) + delete m_DirsFound; +} bool wxZipFSHandler::CanOpen(const wxString& location) { wxString p = GetProtocol(location); - return (p == "zip"); + return (p == wxT("zip")) && + (GetProtocol(GetLeftLocation(location)) == wxT("file")); } @@ -49,24 +79,161 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l wxString left = GetLeftLocation(location); wxInputStream *s; - if (GetProtocol(left) != "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 + "#zip:" + right, + 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; } -wxZipFSHandler::~wxZipFSHandler() +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) + { + unzClose((unzFile)m_Archive); + m_Archive = NULL; + } + + 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; + } + + m_ZipFile = left; + 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) + { + unzClose((unzFile)m_Archive); + m_Archive = NULL; + } + else + { + if (m_AllowDirs) + { + delete m_DirsFound; + m_DirsFound = new wxLongToLongHashMap(); + } + return DoFind(); + } + } + return wxEmptyString; +} + + + +wxString wxZipFSHandler::FindNext() +{ + if (!m_Archive) return wxEmptyString; + return DoFind(); } -#endif // wxUSE_FS_ZIP + + +wxString wxZipFSHandler::DoFind() +{ + static char namebuf[1024]; // char, not wxChar! + char *c; + 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 == '\\') *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 + } + } + + 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) + { + unzClose((unzFile)m_Archive); + m_Archive = NULL; + break; + } + } + + return match; +} + + + +#endif + //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM