Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added ZIP classes by M.J.Wetherell (patch 1030239)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-10 23:58:38 +00:00
parent eabd333355
commit 00375592f9
16 changed files with 6531 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/common/fs_zip.cpp
View File

@@ -27,15 +27,10 @@
#endif
#include "wx/filesys.h"
#include "wx/wfstream.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
@@ -56,13 +51,22 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
wxZipFSHandler::~wxZipFSHandler()
{
if (m_Archive)
unzClose((unzFile)m_Archive);
CloseArchive(m_Archive);
if (m_DirsFound)
delete m_DirsFound;
}
void wxZipFSHandler::CloseArchive(wxZipInputStream *archive)
{
wxInputStream *stream = archive->GetFilterInputStream();
delete archive;
delete stream;
}
bool wxZipFSHandler::CanOpen(const wxString& location)
{
wxString p = GetProtocol(location);
@@ -125,7 +129,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
if (m_Archive)
{
unzClose((unzFile)m_Archive);
CloseArchive(m_Archive);
m_Archive = NULL;
}
@@ -147,26 +151,18 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
m_ZipFile = left;
wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
m_Archive = (void*) unzOpen(nativename.mb_str(wxConvFile));
m_Archive = new wxZipInputStream(*new wxFFileInputStream(nativename));
m_Pattern = right.AfterLast(wxT('/'));
m_BaseDir = right.BeforeLast(wxT('/'));
if (m_Archive)
{
if (unzGoToFirstFile((unzFile)m_Archive) != UNZ_OK)
if (m_AllowDirs)
{
unzClose((unzFile)m_Archive);
m_Archive = NULL;
}
else
{
if (m_AllowDirs)
{
delete m_DirsFound;
m_DirsFound = new wxLongToLongHashMap();
}
return DoFind();
delete m_DirsFound;
m_DirsFound = new wxLongToLongHashMap();
}
return DoFind();
}
return wxEmptyString;
}
@@ -183,16 +179,20 @@ wxString wxZipFSHandler::FindNext()
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?
wxZipEntry *entry = m_Archive->GetNextEntry();
if (!entry)
{
CloseArchive(m_Archive);
m_Archive = NULL;
break;
}
namestr = entry->GetName(wxPATH_UNIX);
delete entry;
if (m_AllowDirs)
{
@@ -221,13 +221,6 @@ wxString wxZipFSHandler::DoFind()
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;