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

fixed FindFirst/FindNext in fs_zip, it should find all directories now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2001-02-22 23:43:45 +00:00
parent 0e4a6d55e9
commit de0702d065
2 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/fs_zip.h
View File

@ -3,6 +3,7 @@
// Purpose: ZIP file system
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// CVS-ID: $Id$
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -26,6 +27,8 @@
#include "wx/filesys.h"
class WXDLLEXPORT wxHashTableLong;
//--------------------------------------------------------------------------------
// wxZipFSHandler
//--------------------------------------------------------------------------------
@ -45,6 +48,7 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
void *m_Archive;
wxString m_Pattern, m_BaseDir, m_ZipFile;
bool m_AllowDirs, m_AllowFiles;
wxHashTableLong *m_DirsFound;
wxString DoFind();
};

64
src/common/fs_zip.cpp
View File

@ -3,10 +3,12 @@
// Purpose: ZIP file system
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// CVS-ID: $Id$
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation
#endif
@ -23,6 +25,7 @@
#include "wx/wx.h"
#endif
#include "wx/hash.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_DirsFound = NULL;
}
@ -54,6 +58,8 @@ wxZipFSHandler::~wxZipFSHandler()
{
if (m_Archive)
unzClose((unzFile)m_Archive);
if (m_DirsFound)
delete m_DirsFound;
}
@ -108,8 +114,11 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
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)
{
@ -133,7 +142,15 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
unzClose((unzFile)m_Archive);
m_Archive = NULL;
}
else return DoFind();
else
{
if (m_AllowDirs)
{
delete m_DirsFound;
m_DirsFound = new wxHashTableLong();
}
return DoFind();
}
}
return wxEmptyString;
}
@ -152,32 +169,41 @@ 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.Length() > 0 && fn.Last() == wxT('/'))
{
fn.RemoveLast();
wasdir = TRUE;
}
else wasdir = FALSE;
namestr = namebuf;
name = fn.AfterLast(wxT('/'));
dir = fn.BeforeLast(wxT('/'));
if (dir == m_BaseDir)
if (m_AllowDirs)
{
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;
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
}
}
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)
{