use VSIReadDir() from gdal instead of quazip for listing .zip files and remove quazip entirely, including HAVE_ZLIB variable ; set default scanZip to 2 (Basic Scan)

This commit is contained in:
Etienne Tourigny 2012-05-07 19:03:31 -03:00
parent e23e21f907
commit f60d40aa10
35 changed files with 78 additions and 7402 deletions

View File

@ -258,20 +258,6 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
NO_DEFAULT_PATH
)
#############################################################
# search for zlib optional, used by quazip
# this uses script provided by cmake
# if WIN32 should use zlib from QT
FIND_PACKAGE(ZLIB)
IF (ZLIB_FOUND)
MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARY}")
SET(HAVE_ZLIB TRUE)
ELSE (ZLIB_FOUND)
MESSAGE(STATUS "Could not find zlib (optional)")
ENDIF(ZLIB_FOUND)
#############################################################
# enable warnings

View File

@ -68,35 +68,4 @@ licensed under the GPL or LGPL, version 2.
== External Source Files ==
The following files are included in the QGIS source tree from external
sources. The source, license, and copyright are noted for each.
=== src/core/quazip ===
QuaZIP is the C++ wrapper for the Gilles Vollant's ZIP/UNZIP package
using Trolltech's Qt library.
Copyright (C) 2005-2011 Sergey A. Tachenov
Added to the QGIS source tree 17 April 2012 as part of a patch from
Etienne Tourigny <etourigny.dev@gmail.com>
* COPYING
* ioapi.h
* JlCompress.h
* quaadler32.cpp
* quachecksum32.h
* quacrc32.h
* quazipfile.cpp
* quazipfileinfo.h
* quazip.h
* quazipnewinfo.h
* unzip.c
* zip.c
* crypt.h
* JlCompress.cpp
* qioapi.cpp
* quaadler32.h
* quacrc32.cpp
* quazip.cpp
* quazipfile.h
* quazip_global.h
* quazipnewinfo.cpp
* README.txt
* unzip.h
* zip.h

View File

@ -31,8 +31,6 @@
#cmakedefine HAVE_SPATIALITE
#cmakedefine HAVE_ZLIB
#cmakedefine HAVE_MSSQL
#cmakedefine HAVE_PYTHON

View File

@ -210,17 +210,9 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
cmbScanZipInBrowser->clear();
cmbScanZipInBrowser->addItem( tr( "No" ) ); // 0
cmbScanZipInBrowser->addItem( tr( "Passthru" ) ); // 1
// only add these options if zlib is available
#ifdef HAVE_ZLIB
cmbScanZipInBrowser->addItem( tr( "Basic scan" ) ); // 2
cmbScanZipInBrowser->addItem( tr( "Full scan" ) ); // 3
cmbScanZipInBrowser->setCurrentIndex( settings.value( "/qgis/scanZipInBrowser", 1 ).toInt() );
#else
if ( settings.value( "/qgis/scanZipInBrowser", 1 ) == 0 )
cmbScanZipInBrowser->setCurrentIndex( 0 );
else
cmbScanZipInBrowser->setCurrentIndex( 1 );
#endif
cmbScanZipInBrowser->setCurrentIndex( settings.value( "/qgis/scanZipInBrowser", 2 ).toInt() );
// set the display update threshold
spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );

View File

@ -177,23 +177,6 @@ SET(QGIS_CORE_SRCS
qgsspatialindex.cpp
)
IF(HAVE_ZLIB)
ADD_DEFINITIONS(-DQUAZIP_BUILD)
SET(QGIS_CORE_SRCS
${QGIS_CORE_SRCS}
quazip/unzip.c
quazip/zip.c
quazip/JlCompress.cpp
quazip/qioapi.cpp
quazip/quaadler32.cpp
quazip/quacrc32.cpp
quazip/quazip.cpp
quazip/quazipfile.cpp
quazip/quazipnewinfo.cpp
)
ENDIF(HAVE_ZLIB)
IF(WIN32)
SET(QGIS_CORE_SRCS
${QGIS_CORE_SRCS}
@ -298,13 +281,6 @@ SET(QGIS_CORE_MOC_HDRS
gps/qextserialport/qextserialenumerator.h
)
IF (HAVE_ZLIB)
SET(QGIS_CORE_MOC_HDRS
${QGIS_CORE_MOC_HDRS}
quazip/quazipfile.h
)
ENDIF(HAVE_ZLIB)
IF (QT_MOBILITY_LOCATION_FOUND)
SET(QGIS_CORE_MOC_HDRS
@ -541,11 +517,6 @@ ELSE (WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
ENDIF (WITH_INTERNAL_SPATIALITE)
IF (HAVE_ZLIB)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(qgis_core ${ZLIB_LIBRARY})
ENDIF (HAVE_ZLIB)
IF (APPLE)
SET_TARGET_PROPERTIES(qgis_core PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
ENDIF (APPLE)

View File

@ -36,11 +36,9 @@
#include "qgsproviderregistry.h"
#include "qgsconfig.h"
// use internal quazip for /vsizip support
#ifdef HAVE_ZLIB
#define QUAZIP_STATIC
#include <quazip/quazip.h>
#endif
// use GDAL VSI mechanism
#include "cpl_vsi.h"
#include "cpl_string.h"
// shared icons
const QIcon &QgsLayerItem::iconPoint()
@ -449,7 +447,7 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
QVector<QgsDataItem*> children;
QDir dir( mPath );
QSettings settings;
bool scanZip = ( settings.value( "/qgis/scanZipInBrowser", 1 ).toInt() != 0 );
bool scanZip = ( settings.value( "/qgis/scanZipInBrowser", 2 ).toInt() != 0 );
QStringList entries = dir.entryList( QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name | QDir::IgnoreCase );
foreach( QString subdir, entries )
@ -775,6 +773,62 @@ QgsZipItem::~QgsZipItem()
{
}
// internal function to scan a vsidir (zip or tar file) recursively
// hopefully this will make it to GDAL
char **VSIReadDirRecursive1( const char *pszPath )
{
char **papszFiles = NULL;
char **papszFiles1 = NULL;
char **papszFiles2 = NULL;
VSIStatBufL psStatBuf;
char szTemp1[1096];
char szTemp2[1096];
// get listing
papszFiles1 = VSIReadDir( pszPath );
if ( ! papszFiles1 )
return NULL;
// get files and directories inside listing
for ( int i = 0; i < CSLCount( papszFiles1 ); i++ )
{
// build complete file name for stat
strcpy( szTemp1, pszPath );
strcat( szTemp1, ( char* )"/" ); // this might not be ok on windows
strcat( szTemp1, papszFiles1[i] );
// if is file, add it
if ( VSIStatL( szTemp1, &psStatBuf ) == 0 &&
VSI_ISREG( psStatBuf.st_mode ) )
{
papszFiles = CSLAddString( papszFiles, papszFiles1[i] );
}
else if ( VSIStatL( szTemp1, &psStatBuf ) == 0 &&
VSI_ISDIR( psStatBuf.st_mode ) )
{
// add directory entry
strcpy( szTemp2, papszFiles1[i] );
strcat( szTemp2, ( char* )"/" ); // this might not be ok on windows
papszFiles = CSLAddString( papszFiles, szTemp2 );
// recursively add files inside directory
papszFiles2 = VSIReadDirRecursive1( szTemp1 );
if ( papszFiles2 )
{
for ( int j = 0; j < CSLCount( papszFiles2 ); j++ )
{
strcpy( szTemp2, papszFiles1[i] );
strcat( szTemp2, ( char* )"/" ); // this might not be ok on windows
strcat( szTemp2, papszFiles2[j] );
papszFiles = CSLAddString( papszFiles, szTemp2 );
}
CSLDestroy( papszFiles2 );
}
}
}
CSLDestroy( papszFiles1 );
return papszFiles;
}
QVector<QgsDataItem*> QgsZipItem::createChildren( )
{
QVector<QgsDataItem*> children;
@ -782,7 +836,7 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
QString childPath;
QSettings settings;
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 2 ).toInt();
mZipFileList.clear();
@ -794,15 +848,6 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
return children;
}
#ifndef HAVE_ZLIB
// if zlib not available, only support Passthru
if ( scanZipSetting == 2 || scanZipSetting == 3 )
{
scanZipSetting = 1;
settings.setValue( "/qgis/scanZipInBrowser", 1 );
}
#endif
// if scanZipBrowser == 1 (Passthru): do not scan zip and allow to open directly with /vsizip/
if ( scanZipSetting == 1 )
{
@ -811,32 +856,25 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
return children;
}
#ifdef HAVE_ZLIB
QgsDebugMsg( QString( "Open file %1 with quazip" ).arg( path() ) );
// get list of files inside zip file
QuaZip zip( path() );
if ( ! zip.open( QuaZip::mdUnzip ) || ! zip.isOpen() )
QgsDebugMsg( QString( "Open file %1 with gdal vsi" ).arg( path() ) );
char **papszSiblingFiles = VSIReadDirRecursive1( QString( "/vsizip/" + path() ).toLocal8Bit().constData() );
if ( papszSiblingFiles )
{
QgsDebugMsg( QString( "Zip error: %1" ).arg( zip.getZipError() ) );
}
else
{
for ( bool more = zip.goToFirstFile(); more; more = zip.goToNextFile() )
for ( int i = 0; i < CSLCount( papszSiblingFiles ); i++ )
{
tmpPath = zip.getCurrentFileName();
tmpPath = papszSiblingFiles[i];
QgsDebugMsg( QString( "Read file %1" ).arg( tmpPath ) );
// skip directories (files ending with /)
if ( tmpPath.right( 1 ) != "/" )
mZipFileList << tmpPath;
}
zip.close();
CSLDestroy( papszSiblingFiles );
}
if ( zip.getZipError() != UNZ_OK )
else
{
QgsDebugMsg( QString( "Zip error: %1" ).arg( zip.getZipError() ) );
QgsDebugMsg( QString( "Error reading %1" ).arg( path() ) );
}
#else
QgsDebugMsg( QString( "Cannot open file %1 with quazip - zlib not configured" ).arg( path() ) );
#endif
// loop over files inside zip
foreach( QString fileName, mZipFileList )
@ -898,7 +936,7 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QString name )
{
QSettings settings;
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 2 ).toInt();
QString vsizipPath = path;
int zipFileCount = 0;
QFileInfo fileInfo( path );

View File

@ -1,458 +0,0 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS

View File

@ -1,535 +0,0 @@
#include "JlCompress.h"
#include <QDebug>
static bool copyData( QIODevice &inFile, QIODevice &outFile )
{
while ( !inFile.atEnd() )
{
char buf[4096];
qint64 readLen = inFile.read( buf, 4096 );
if ( readLen <= 0 )
return false;
if ( outFile.write( buf, readLen ) != readLen )
return false;
}
return true;
}
/**OK
* Comprime il file fileName, nell'oggetto zip, con il nome fileDest.
*
* La funzione fallisce se:
* * zip==NULL;
* * l'oggetto zip e stato aperto in una modalita non compatibile con l'aggiunta di file;
* * non e possibile aprire il file d'origine;
* * non e possibile creare il file all'interno dell'oggetto zip;
* * si e rilevato un errore nella copia dei dati;
* * non e stato possibile chiudere il file all'interno dell'oggetto zip;
*/
bool JlCompress::compressFile( QuaZip* zip, QString fileName, QString fileDest )
{
// zip: oggetto dove aggiungere il file
// fileName: nome del file reale
// fileDest: nome del file all'interno del file compresso
// Controllo l'apertura dello zip
if ( !zip ) return false;
if ( zip->getMode() != QuaZip::mdCreate &&
zip->getMode() != QuaZip::mdAppend &&
zip->getMode() != QuaZip::mdAdd ) return false;
// Apro il file originale
QFile inFile;
inFile.setFileName( fileName );
if ( !inFile.open( QIODevice::ReadOnly ) ) return false;
// Apro il file risulato
QuaZipFile outFile( zip );
if ( !outFile.open( QIODevice::WriteOnly, QuaZipNewInfo( fileDest, inFile.fileName() ) ) ) return false;
// Copio i dati
if ( !copyData( inFile, outFile ) || outFile.getZipError() != UNZ_OK )
{
return false;
}
// Chiudo i file
outFile.close();
if ( outFile.getZipError() != UNZ_OK ) return false;
inFile.close();
return true;
}
/**OK
* Comprime la cartella dir nel file fileCompressed, se recursive e true allora
* comprime anche le sotto cartelle. I nomi dei file preceduti dal path creato
* togliendo il pat della cartella origDir al path della cartella dir.
* Se la funzione fallisce restituisce false e cancella il file che si e tentato
* di creare.
*
* La funzione fallisce se:
* * zip==NULL;
* * l'oggetto zip e stato aperto in una modalita non compatibile con l'aggiunta di file;
* * la cartella dir non esiste;
* * la compressione di una sotto cartella fallisce (1);
* * la compressione di un file fallisce;
* (1) La funzione si richiama in maniera ricorsiva per comprimere le sotto cartelle
* dunque gli errori di compressione di una sotto cartella sono gli stessi di questa
* funzione.
*/
bool JlCompress::compressSubDir( QuaZip* zip, QString dir, QString origDir, bool recursive )
{
// zip: oggetto dove aggiungere il file
// dir: cartella reale corrente
// origDir: cartella reale originale
// (path(dir)-path(origDir)) = path interno all'oggetto zip
// Controllo l'apertura dello zip
if ( !zip ) return false;
if ( zip->getMode() != QuaZip::mdCreate &&
zip->getMode() != QuaZip::mdAppend &&
zip->getMode() != QuaZip::mdAdd ) return false;
// Controllo la cartella
QDir directory( dir );
if ( !directory.exists() ) return false;
// Se comprimo anche le sotto cartelle
if ( recursive )
{
// Per ogni sotto cartella
QFileInfoList files = directory.entryInfoList( QDir::AllDirs | QDir::NoDotAndDotDot );
Q_FOREACH( QFileInfo file, files )
{
// Comprimo la sotto cartella
if ( !compressSubDir( zip, file.absoluteFilePath(), origDir, recursive ) ) return false;
}
}
// Per ogni file nella cartella
QFileInfoList files = directory.entryInfoList( QDir::Files );
QDir origDirectory( origDir );
Q_FOREACH( QFileInfo file, files )
{
// Se non e un file o e il file compresso che sto creando
if ( !file.isFile() || file.absoluteFilePath() == zip->getZipName() ) continue;
// Creo il nome relativo da usare all'interno del file compresso
QString filename = origDirectory.relativeFilePath( file.absoluteFilePath() );
// Comprimo il file
if ( !compressFile( zip, file.absoluteFilePath(), filename ) ) return false;
}
return true;
}
/**OK
* Estrae il file fileName, contenuto nell'oggetto zip, con il nome fileDest.
* Se la funzione fallisce restituisce false e cancella il file che si e tentato di estrarre.
*
* La funzione fallisce se:
* * zip==NULL;
* * l'oggetto zip e stato aperto in una modalita non compatibile con l'estrazione di file;
* * non e possibile aprire il file all'interno dell'oggetto zip;
* * non e possibile creare il file estratto;
* * si e rilevato un errore nella copia dei dati (1);
* * non e stato possibile chiudere il file all'interno dell'oggetto zip (1);
*
* (1): prima di uscire dalla funzione cancella il file estratto.
*/
bool JlCompress::extractFile( QuaZip* zip, QString fileName, QString fileDest )
{
// zip: oggetto dove aggiungere il file
// filename: nome del file reale
// fileincompress: nome del file all'interno del file compresso
// Controllo l'apertura dello zip
if ( !zip ) return false;
if ( zip->getMode() != QuaZip::mdUnzip ) return false;
// Apro il file compresso
zip->setCurrentFile( fileName );
QuaZipFile inFile( zip );
if ( !inFile.open( QIODevice::ReadOnly ) || inFile.getZipError() != UNZ_OK ) return false;
// Controllo esistenza cartella file risultato
QDir curDir;
if ( !curDir.mkpath( QFileInfo( fileDest ).absolutePath() ) )
{
return false;
}
if ( QFileInfo( fileDest ).isDir() )
return true;
// Apro il file risultato
QFile outFile;
outFile.setFileName( fileDest );
if ( !outFile.open( QIODevice::WriteOnly ) ) return false;
// Copio i dati
if ( !copyData( inFile, outFile ) || inFile.getZipError() != UNZ_OK )
{
outFile.close();
removeFile( QStringList( fileDest ) );
return false;
}
outFile.close();
// Chiudo i file
inFile.close();
if ( inFile.getZipError() != UNZ_OK )
{
removeFile( QStringList( fileDest ) );
return false;
}
return true;
}
/**
* Rimuove i file il cui nome e specificato all'interno di listFile.
* Restituisce true se tutti i file sono stati cancellati correttamente, attenzione
* perche puo restituire false anche se alcuni file non esistevano e si e tentato
* di cancellarli.
*/
bool JlCompress::removeFile( QStringList listFile )
{
bool ret = true;
// Per ogni file
for ( int i = 0; i < listFile.count(); i++ )
{
// Lo elimino
ret = ret && QFile::remove( listFile.at( i ) );
}
return ret;
}
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/**OK
* Comprime il file fileName nel file fileCompressed.
* Se la funzione fallisce restituisce false e cancella il file che si e tentato
* di creare.
*
* La funzione fallisce se:
* * non si riesce ad aprire l'oggetto zip;
* * la compressione del file fallisce;
* * non si riesce a chiudere l'oggetto zip;
*/
bool JlCompress::compressFile( QString fileCompressed, QString file )
{
// Creo lo zip
QuaZip* zip = new QuaZip( QFileInfo( fileCompressed ).absoluteFilePath() );
QDir().mkpath( QFileInfo( fileCompressed ).absolutePath() );
if ( !zip->open( QuaZip::mdCreate ) )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
// Aggiungo il file
if ( !compressFile( zip, file, QFileInfo( file ).fileName() ) )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
// Chiudo il file zip
zip->close();
if ( zip->getZipError() != 0 )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
delete zip;
return true;
}
/**OK
* Comprime i file specificati in files nel file fileCompressed.
* Se la funzione fallisce restituisce false e cancella il file che si e tentato
* di creare.
*
* La funzione fallisce se:
* * non si riesce ad aprire l'oggetto zip;
* * la compressione di un file fallisce;
* * non si riesce a chiudere l'oggetto zip;
*/
bool JlCompress::compressFiles( QString fileCompressed, QStringList files )
{
// Creo lo zip
QuaZip* zip = new QuaZip( QFileInfo( fileCompressed ).absoluteFilePath() );
QDir().mkpath( QFileInfo( fileCompressed ).absolutePath() );
if ( !zip->open( QuaZip::mdCreate ) )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
// Comprimo i file
QFileInfo info;
Q_FOREACH( QString file, files )
{
info.setFile( file );
if ( !info.exists() || !compressFile( zip, file, info.fileName() ) )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
}
// Chiudo il file zip
zip->close();
if ( zip->getZipError() != 0 )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
delete zip;
return true;
}
/**OK
* Comprime la cartella dir nel file fileCompressed, se recursive e true allora
* comprime anche le sotto cartelle.
* Se la funzione fallisce restituisce false e cancella il file che si e tentato
* di creare.
*
* La funzione fallisce se:
* * non si riesce ad aprire l'oggetto zip;
* * la compressione di un file fallisce;
* * non si riesce a chiudere l'oggetto zip;
*/
bool JlCompress::compressDir( QString fileCompressed, QString dir, bool recursive )
{
// Creo lo zip
QuaZip* zip = new QuaZip( QFileInfo( fileCompressed ).absoluteFilePath() );
QDir().mkpath( QFileInfo( fileCompressed ).absolutePath() );
if ( !zip->open( QuaZip::mdCreate ) )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
// Aggiungo i file e le sotto cartelle
if ( !compressSubDir( zip, dir, dir, recursive ) )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
// Chiudo il file zip
zip->close();
if ( zip->getZipError() != 0 )
{
delete zip;
QFile::remove( fileCompressed );
return false;
}
delete zip;
return true;
}
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/**OK
* Estrae il file fileName, contenuto nel file fileCompressed, con il nome fileDest.
* Se fileDest = "" allora il file viene estratto con lo stesso nome con cui e
* stato compresso.
* Se la funzione fallisce cancella il file che si e tentato di estrarre.
* Restituisce il nome assoluto del file estratto.
*
* La funzione fallisce se:
* * non si riesce ad aprire l'oggetto zip;
* * l'estrazione del file fallisce;
* * non si riesce a chiudere l'oggetto zip;
*/
QString JlCompress::extractFile( QString fileCompressed, QString fileName, QString fileDest )
{
// Apro lo zip
QuaZip* zip = new QuaZip( QFileInfo( fileCompressed ).absoluteFilePath() );
if ( !zip->open( QuaZip::mdUnzip ) )
{
delete zip;
return QString();
}
// Estraggo il file
if ( fileDest.isEmpty() ) fileDest = fileName;
if ( !extractFile( zip, fileName, fileDest ) )
{
delete zip;
return QString();
}
// Chiudo il file zip
zip->close();
if ( zip->getZipError() != 0 )
{
removeFile( QStringList( fileDest ) );
return QString();
}
delete zip;
return QFileInfo( fileDest ).absoluteFilePath();
}
/**OK
* Estrae i file specificati in files, contenuti nel file fileCompressed, nella
* cartella dir. La struttura a cartelle del file compresso viene rispettata.
* Se dir = "" allora il file viene estratto nella cartella corrente.
* Se la funzione fallisce cancella i file che si e tentato di estrarre.
* Restituisce i nomi assoluti dei file estratti.
*
* La funzione fallisce se:
* * non si riesce ad aprire l'oggetto zip;
* * l'estrazione di un file fallisce;
* * non si riesce a chiudere l'oggetto zip;
*/
QStringList JlCompress::extractFiles( QString fileCompressed, QStringList files, QString dir )
{
// Creo lo zip
QuaZip* zip = new QuaZip( QFileInfo( fileCompressed ).absoluteFilePath() );
if ( !zip->open( QuaZip::mdUnzip ) )
{
delete zip;
return QStringList();
}
// Estraggo i file
QStringList extracted;
for ( int i = 0; i < files.count(); i++ )
{
QString absPath = QDir( dir ).absoluteFilePath( files.at( i ) );
if ( !extractFile( zip, files.at( i ), absPath ) )
{
delete zip;
removeFile( extracted );
return QStringList();
}
extracted.append( absPath );
}
// Chiudo il file zip
zip->close();
if ( zip->getZipError() != 0 )
{
delete zip;
removeFile( extracted );
return QStringList();
}
delete zip;
return extracted;
}
/**OK
* Estrae il file fileCompressed nella cartella dir.
* Se dir = "" allora il file viene estratto nella cartella corrente.
* Se la funzione fallisce cancella i file che si e tentato di estrarre.
* Restituisce i nomi assoluti dei file estratti.
*
* La funzione fallisce se:
* * non si riesce ad aprire l'oggetto zip;
* * la compressione di un file fallisce;
* * non si riesce a chiudere l'oggetto zip;
*/
QStringList JlCompress::extractDir( QString fileCompressed, QString dir )
{
// Apro lo zip
QuaZip* zip = new QuaZip( QFileInfo( fileCompressed ).absoluteFilePath() );
if ( !zip->open( QuaZip::mdUnzip ) )
{
delete zip;
return QStringList();
}
// Estraggo i file
QStringList lst = getFileList( fileCompressed );
QDir directory( dir );
QStringList extracted;
for ( int i = 0; i < lst.count(); i++ )
{
QString absFilePath = directory.absoluteFilePath( lst.at( i ) );
if ( !extractFile( zip, lst.at( i ), absFilePath ) )
{
delete zip;
removeFile( extracted );
return QStringList();
}
extracted.append( absFilePath );
}
// Chiudo il file zip
zip->close();
if ( zip->getZipError() != 0 )
{
delete zip;
removeFile( extracted );
return QStringList();
}
delete zip;
return extracted;
}
/**OK
* Restituisce la lista dei file resenti nel file compresso fileCompressed.
* Se la funzione fallisce, restituisce un elenco vuoto.
*
* La funzione fallisce se:
* * non si riesce ad aprire l'oggetto zip;
* * la richiesta di informazioni di un file fallisce;
* * non si riesce a chiudere l'oggetto zip;
*/
QStringList JlCompress::getFileList( QString fileCompressed )
{
// Apro lo zip
QuaZip* zip = new QuaZip( QFileInfo( fileCompressed ).absoluteFilePath() );
if ( !zip->open( QuaZip::mdUnzip ) )
{
delete zip;
return QStringList();
}
// Estraggo i nomi dei file
QStringList lst;
QuaZipFileInfo info;
for ( bool more = zip->goToFirstFile(); more; more = zip->goToNextFile() )
{
if ( !zip->getCurrentFileInfo( &info ) )
{
delete zip;
return QStringList();
}
lst << info.name;
//info.name.toLocal8Bit().constData()
}
// Chiudo il file zip
zip->close();
if ( zip->getZipError() != 0 )
{
delete zip;
return QStringList();
}
delete zip;
return lst;
}

View File

@ -1,115 +0,0 @@
#ifndef JLCOMPRESSFOLDER_H_
#define JLCOMPRESSFOLDER_H_
#include "quazip.h"
#include "quazipfile.h"
#include "quazipfileinfo.h"
#include <QString>
#include <QDir>
#include <QFileInfo>
#include <QFile>
/// Utility class for typical operations.
/**
This class contains a number of useful static functions to perform
simple operations, such as mass ZIP packing or extraction.
*/
class QUAZIP_EXPORT JlCompress
{
private:
/// Compress a single file.
/**
\param zip Opened zip to compress the file to.
\param fileName The full path to the source file.
\param fileDest The full name of the file inside the archive.
\return true if success, false otherwise.
*/
static bool compressFile( QuaZip* zip, QString fileName, QString fileDest );
/// Compress a subdirectory.
/**
\param parentZip Opened zip containing the parent directory.
\param dir The full path to the directory to pack.
\param parentDir The full path to the directory corresponding to
the root of the ZIP.
\param recursive Whether to pack sub-directories as well or only
files.
\return true if success, false otherwise.
*/
static bool compressSubDir( QuaZip* parentZip, QString dir, QString parentDir, bool recursive = true );
/// Extract a single file.
/**
\param zip The opened zip archive to extract from.
\param fileName The full name of the file to extract.
\param fileDest The full path to the destination file.
\return true if success, false otherwise.
*/
static bool extractFile( QuaZip* zip, QString fileName, QString fileDest );
/// Remove some files.
/**
\param listFile The list of files to remove.
\return true if success, false otherwise.
*/
static bool removeFile( QStringList listFile );
public:
/// Compress a single file.
/**
\param fileCompressed The name of the archive.
\param file The file to compress.
\return true if success, false otherwise.
*/
static bool compressFile( QString fileCompressed, QString file );
/// Compress a list of files.
/**
\param fileCompressed The name of the archive.
\param files The file list to compress.
\return true if success, false otherwise.
*/
static bool compressFiles( QString fileCompressed, QStringList files );
/// Compress a whole directory.
/**
\param fileCompressed The name of the archive.
\param dir The directory to compress.
\param recursive Whether to pack the subdirectories as well, or
just regular files.
\return true if success, false otherwise.
*/
static bool compressDir( QString fileCompressed, QString dir = QString(), bool recursive = true );
public:
/// Extract a single file.
/**
\param fileCompressed The name of the archive.
\param fileName The file to extract.
\param fileDest The destination file, assumed to be identical to
\a file if left empty.
\return The list of the full paths of the files extracted, empty on failure.
*/
static QString extractFile( QString fileCompressed, QString fileName, QString fileDest = QString() );
/// Extract a list of files.
/**
\param fileCompressed The name of the archive.
\param files The file list to extract.
\param dir The directory to put the files to, the current
directory if left empty.
\return The list of the full paths of the files extracted, empty on failure.
*/
static QStringList extractFiles( QString fileCompressed, QStringList files, QString dir = QString() );
/// Extract a whole archive.
/**
\param fileCompressed The name of the archive.
\param dir The directory to extract to, the current directory if
left empty.
\return The list of the full paths of the files extracted, empty on failure.
*/
static QStringList extractDir( QString fileCompressed, QString dir = QString() );
/// Get the file list.
/**
\return The list of the files in the archive, or, more precisely, the
list of the entries, including both files and directories if they
are present separately.
*/
static QStringList getFileList( QString fileCompressed );
};
#endif /* JLCOMPRESSFOLDER_H_ */

View File

@ -1,66 +0,0 @@
QuaZIP is the C++ wrapper for the Gilles Vollant's ZIP/UNZIP package
using Trolltech's Qt library.
It contains original ZIP/UNZIP package C code and therefore depends on
zlib library.
Also, it depends on Qt 4.
To comile it on UNIX dialect:
$ cd quazip
$ qmake
$ make
You must make sure that:
* You have Qt 4 properly and fully installed (including tools and
headers, not just library)
* "qmake" command runs Qt 4's qmake, not some other version (you'll have
to type full path to qmake otherwise).
To install compiled shared library, just type:
$ make install
By default, it installs in /usr/local, but you may change it using
$ qmake PREFIX=/wherever/you/whant/to/install
You do not have to compile and install QuaZIP to use it. You can just
(and sometimes it may be the best way) add QuaZIP's source files to your
project and use them.
See doc/html or, if you do not have a browser, quazip/*.h and
quazip/doc/* files for the more detailed documentation.
For Windows, it's essentially the same, but you may have to adjust
settings for different environments.
If you want to include QuaZIP sources directly into your project or if
you want to use QuaZIP compiled as a static library using
"qmake CONFIG+=statliclib", you have to define the QUAZIP_STATIC macro,
otherwise you're likely to run into problems as QuaZIP symbols will be
marked as dllimported.
Copyright notice:
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.

View File

@ -1,136 +0,0 @@
/* crypt.h -- base code for crypt/uncrypt ZIPfile
Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant
This code is a modified version of crypting code in Infozip distribution
The encryption/decryption parts of this source code (as opposed to the
non-echoing password parts) were originally written in Europe. The
whole source package can be freely distributed, including from the USA.
(Prior to January 2000, re-export from the US was a violation of US law.)
This encryption code is a direct transcription of the algorithm from
Roger Schlafly, described by Phil Katz in the file appnote.txt. This
file (appnote.txt) is distributed with the PKZIP program (even in the
version without encryption capabilities).
If you don't need crypting in your application, just define symbols
NOCRYPT and NOUNCRYPT.
This code support the "Traditional PKWARE Encryption".
The new AES encryption added on Zip format by Winzip (see the page
http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
Encryption is not supported.
*/
#include "quazip_global.h"
#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
/***********************************************************************
* Return the next byte in the pseudo-random sequence
*/
static int decrypt_byte( unsigned long* pkeys, const unsigned long* pcrc_32_tab UNUSED )
{
//(void) pcrc_32_tab; /* avoid "unused parameter" warning */
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
* unpredictable manner on 16-bit systems; not a problem
* with any known compiler so far, though */
temp = (( unsigned )( *( pkeys + 2 ) ) & 0xffff ) | 2;
return ( int )((( temp * ( temp ^ 1 ) ) >> 8 ) & 0xff );
}
/***********************************************************************
* Update the encryption keys with the next byte of plain text
*/
static int update_keys( unsigned long* pkeys, const unsigned long* pcrc_32_tab, int c )
{
( *( pkeys + 0 ) ) = CRC32(( *( pkeys + 0 ) ), c );
( *( pkeys + 1 ) ) += ( *( pkeys + 0 ) ) & 0xff;
( *( pkeys + 1 ) ) = ( *( pkeys + 1 ) ) * 134775813L + 1;
{
register int keyshift = ( int )(( *( pkeys + 1 ) ) >> 24 );
( *( pkeys + 2 ) ) = CRC32(( *( pkeys + 2 ) ), keyshift );
}
return c;
}
/***********************************************************************
* Initialize the encryption keys and the random header according to
* the given password.
*/
static void init_keys( const char* passwd, unsigned long* pkeys, const unsigned long* pcrc_32_tab )
{
*( pkeys + 0 ) = 305419896L;
*( pkeys + 1 ) = 591751049L;
*( pkeys + 2 ) = 878082192L;
while ( *passwd != '\0' )
{
update_keys( pkeys, pcrc_32_tab, ( int )*passwd );
passwd++;
}
}
#define zdecode(pkeys,pcrc_32_tab,c) \
(update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
#define zencode(pkeys,pcrc_32_tab,c,t) \
(t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
#define RAND_HEAD_LEN 12
/* "last resort" source for second part of crypt seed pattern */
# ifndef ZCR_SEED2
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */
# endif
static int crypthead( passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting )
const char *passwd; /* password string */
unsigned char *buf; /* where to write header */
int bufSize;
unsigned long* pkeys;
const unsigned long* pcrc_32_tab;
unsigned long crcForCrypting;
{
int n; /* index in random header */
int t; /* temporary */
int c; /* random byte */
unsigned char header[RAND_HEAD_LEN-2]; /* random header */
static unsigned calls = 0; /* ensure different random header each time */
if ( bufSize < RAND_HEAD_LEN )
return 0;
/* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
* output of rand() to get less predictability, since rand() is
* often poorly implemented.
*/
if ( ++calls == 1 )
{
srand(( unsigned )( time( NULL ) ^ ZCR_SEED2 ) );
}
init_keys( passwd, pkeys, pcrc_32_tab );
for ( n = 0; n < RAND_HEAD_LEN - 2; n++ )
{
c = ( rand() >> 7 ) & 0xff;
header[n] = ( unsigned char )zencode( pkeys, pcrc_32_tab, c, t );
}
/* Encrypt random header (last two bytes is high word of crc) */
init_keys( passwd, pkeys, pcrc_32_tab );
for ( n = 0; n < RAND_HEAD_LEN - 2; n++ )
{
buf[n] = ( unsigned char )zencode( pkeys, pcrc_32_tab, header[n], t );
}
buf[n++] = zencode( pkeys, pcrc_32_tab, ( int )( crcForCrypting >> 16 ) & 0xff, t );
buf[n++] = zencode( pkeys, pcrc_32_tab, ( int )( crcForCrypting >> 24 ) & 0xff, t );
return n;
}
#endif

View File

@ -1,77 +0,0 @@
/* ioapi.h -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant
Modified by Sergey A. Tachenov to integrate with Qt.
*/
#ifndef _ZLIBIOAPI_H
#define _ZLIBIOAPI_H
#define ZLIB_FILEFUNC_SEEK_CUR (1)
#define ZLIB_FILEFUNC_SEEK_END (2)
#define ZLIB_FILEFUNC_SEEK_SET (0)
#define ZLIB_FILEFUNC_MODE_READ (1)
#define ZLIB_FILEFUNC_MODE_WRITE (2)
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
#define ZLIB_FILEFUNC_MODE_EXISTING (4)
#define ZLIB_FILEFUNC_MODE_CREATE (8)
#ifndef ZCALLBACK
#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
#define ZCALLBACK CALLBACK
#else
#define ZCALLBACK
#endif
#endif
#ifdef __cplusplus
extern "C"
{
#endif
typedef voidpf( ZCALLBACK *open_file_func )( voidpf opaque, voidpf file, int mode );
typedef uLong( ZCALLBACK *read_file_func )( voidpf opaque, voidpf stream, void* buf, uLong size );
typedef uLong( ZCALLBACK *write_file_func )( voidpf opaque, voidpf stream, const void* buf, uLong size );
typedef uLong( ZCALLBACK *tell_file_func )( voidpf opaque, voidpf stream );
typedef int ( ZCALLBACK *seek_file_func )( voidpf opaque, voidpf stream, uLong offset, int origin );
typedef int ( ZCALLBACK *close_file_func )( voidpf opaque, voidpf stream );
typedef int ( ZCALLBACK *testerror_file_func )( voidpf opaque, voidpf stream );
typedef struct zlib_filefunc_def_s
{
open_file_func zopen_file;
read_file_func zread_file;
write_file_func zwrite_file;
tell_file_func ztell_file;
seek_file_func zseek_file;
close_file_func zclose_file;
testerror_file_func zerror_file;
voidpf opaque;
} zlib_filefunc_def;
void fill_qiodevice_filefunc( zlib_filefunc_def* pzlib_filefunc_def );
#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
#ifdef __cplusplus
}
#endif
#endif

View File

@ -1,150 +0,0 @@
/* ioapi.c -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant
Modified by Sergey A. Tachenov to integrate with Qt.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "zlib.h"
#include "ioapi.h"
#include "quazip_global.h"
#include <QIODevice>
/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
#ifndef SEEK_CUR
#define SEEK_CUR 1
#endif
#ifndef SEEK_END
#define SEEK_END 2
#endif
#ifndef SEEK_SET
#define SEEK_SET 0
#endif
voidpf ZCALLBACK qiodevice_open_file_func(
voidpf opaque UNUSED,
voidpf file,
int mode )
{
QIODevice *iodevice = reinterpret_cast<QIODevice*>( file );
if (( mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER ) == ZLIB_FILEFUNC_MODE_READ )
iodevice->open( QIODevice::ReadOnly );
else
if ( mode & ZLIB_FILEFUNC_MODE_EXISTING )
iodevice->open( QIODevice::ReadWrite );
else
if ( mode & ZLIB_FILEFUNC_MODE_CREATE )
iodevice->open( QIODevice::WriteOnly );
if ( iodevice->isOpen() )
{
if ( iodevice->isSequential() )
{
iodevice->close();
return NULL;
}
else
{
return iodevice;
}
}
else
return NULL;
}
uLong ZCALLBACK qiodevice_read_file_func(
voidpf opaque UNUSED,
voidpf stream,
void* buf,
uLong size )
{
uLong ret;
ret = ( uLong )(( QIODevice* )stream )->read(( char* )buf, size );
return ret;
}
uLong ZCALLBACK qiodevice_write_file_func(
voidpf opaque UNUSED,
voidpf stream,
const void* buf,
uLong size )
{
uLong ret;
ret = ( uLong )(( QIODevice* )stream )->write(( char* )buf, size );
return ret;
}
uLong ZCALLBACK qiodevice_tell_file_func(
voidpf opaque UNUSED,
voidpf stream )
{
uLong ret;
ret = (( QIODevice* )stream )->pos();
return ret;
}
int ZCALLBACK qiodevice_seek_file_func(
voidpf opaque UNUSED,
voidpf stream,
uLong offset,
int origin )
{
uLong qiodevice_seek_result = 0;
int ret;
switch ( origin )
{
case ZLIB_FILEFUNC_SEEK_CUR :
qiodevice_seek_result = (( QIODevice* )stream )->pos() + offset;
break;
case ZLIB_FILEFUNC_SEEK_END :
qiodevice_seek_result = (( QIODevice* )stream )->size() - offset;
break;
case ZLIB_FILEFUNC_SEEK_SET :
qiodevice_seek_result = offset;
break;
default: return -1;
}
ret = !(( QIODevice* )stream )->seek( qiodevice_seek_result );
return ret;
}
int ZCALLBACK qiodevice_close_file_func(
voidpf opaque UNUSED,
voidpf stream )
{
(( QIODevice* )stream )->close();
return 0;
}
int ZCALLBACK qiodevice_error_file_func(
voidpf opaque UNUSED,
voidpf stream )
{
return !(( QIODevice* )stream )->errorString().isEmpty();
}
void fill_qiodevice_filefunc(
zlib_filefunc_def* pzlib_filefunc_def )
{
pzlib_filefunc_def->zopen_file = qiodevice_open_file_func;
pzlib_filefunc_def->zread_file = qiodevice_read_file_func;
pzlib_filefunc_def->zwrite_file = qiodevice_write_file_func;
pzlib_filefunc_def->ztell_file = qiodevice_tell_file_func;
pzlib_filefunc_def->zseek_file = qiodevice_seek_file_func;
pzlib_filefunc_def->zclose_file = qiodevice_close_file_func;
pzlib_filefunc_def->zerror_file = qiodevice_error_file_func;
pzlib_filefunc_def->opaque = NULL;
}

View File

@ -1,28 +0,0 @@
#include "quaadler32.h"
#include "zlib.h"
QuaAdler32::QuaAdler32()
{
reset();
}
quint32 QuaAdler32::calculate( const QByteArray &data )
{
return adler32( adler32( 0L, Z_NULL, 0 ), ( const Bytef* )data.data(), data.size() );
}
void QuaAdler32::reset()
{
checksum = adler32( 0L, Z_NULL, 0 );
}
void QuaAdler32::update( const QByteArray &buf )
{
checksum = adler32( checksum, ( const Bytef* )buf.data(), buf.size() );
}
quint32 QuaAdler32::value()
{
return checksum;
}

View File

@ -1,29 +0,0 @@
#ifndef QUAADLER32_H
#define QUAADLER32_H
#include <QByteArray>
#include "quachecksum32.h"
/// Adler32 checksum
/** \class QuaAdler32 quaadler32.h <quazip/quaadler32.h>
* This class wrappers the adler32 function with the QuaChecksum32 interface.
* See QuaChecksum32 for more info.
*/
class QUAZIP_EXPORT QuaAdler32 : public QuaChecksum32
{
public:
QuaAdler32();
quint32 calculate( const QByteArray &data );
void reset();
void update( const QByteArray &buf );
quint32 value();
private:
quint32 checksum;
};
#endif //QUAADLER32_H

View File

@ -1,54 +0,0 @@
#ifndef QUACHECKSUM32_H
#define QUACHECKSUM32_H
#include <QByteArray>
#include "quazip_global.h"
/// Checksum interface.
/** \class QuaChecksum32 quachecksum32.h <quazip/quachecksum32.h>
* This is an interface for 32 bit checksums.
* Classes implementing this interface can calcunate a certin
* checksum in a single step:
* \code
* QChecksum32 *crc32 = new QuaCrc32();
* rasoult = crc32->calculate(data);
* \endcode
* or by streaming the data:
* \code
* QChecksum32 *crc32 = new QuaCrc32();
* while(!fileA.atEnd())
* crc32->update(fileA.read(bufSize));
* resoultA = crc32->value();
* crc32->reset();
* while(!fileB.atEnd())
* crc32->update(fileB.read(bufSize));
* resoultB = crc32->value();
* \endcode
*/
class QUAZIP_EXPORT QuaChecksum32
{
public:
///Calculates the checksum for data.
/** \a data source data
* \return data checksum
*
* This function has no efect on the value returned by value().
*/
virtual quint32 calculate( const QByteArray &data ) = 0;
///Resets the calculation on a checksun for a stream.
virtual void reset() = 0;
///Updates the calculated checksum for the stream
/** \a buf next portion of data from the stream
*/
virtual void update( const QByteArray &buf ) = 0;
///Value of the checksum calculated for the stream passed throw update().
/** \return checksum
*/
virtual quint32 value() = 0;
};
#endif //QUACHECKSUM32_H

View File

@ -1,28 +0,0 @@
#include "quacrc32.h"
#include "zlib.h"
QuaCrc32::QuaCrc32()
{
reset();
}
quint32 QuaCrc32::calculate( const QByteArray &data )
{
return crc32( crc32( 0L, Z_NULL, 0 ), ( const Bytef* )data.data(), data.size() );
}
void QuaCrc32::reset()
{
checksum = crc32( 0L, Z_NULL, 0 );
}
void QuaCrc32::update( const QByteArray &buf )
{
checksum = crc32( checksum, ( const Bytef* )buf.data(), buf.size() );
}
quint32 QuaCrc32::value()
{
return checksum;
}

View File

@ -1,27 +0,0 @@
#ifndef QUACRC32_H
#define QUACRC32_H
#include "quachecksum32.h"
///CRC32 checksum
/** \class QuaCrc32 quacrc32.h <quazip/quacrc32.h>
* This class wrappers the crc32 function with the QuaChecksum32 interface.
* See QuaChecksum32 for more info.
*/
class QUAZIP_EXPORT QuaCrc32 : public QuaChecksum32
{
public:
QuaCrc32();
quint32 calculate( const QByteArray &data );
void reset();
void update( const QByteArray &buf );
quint32 value();
private:
quint32 checksum;
};
#endif //QUACRC32_H

View File

@ -1,588 +0,0 @@
/*
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
**/
#include <QFile>
#include <QFlags>
#include "quazip.h"
/// All the internal stuff for the QuaZip class.
/**
\internal
This class keeps all the private stuff for the QuaZip class so it can
be changed without breaking binary compatibility, according to the
Pimpl idiom.
*/
class QuaZipPrivate
{
friend class QuaZip;
private:
/// The pointer to the corresponding QuaZip instance.
QuaZip *q;
/// The codec for file names.
QTextCodec *fileNameCodec;
/// The codec for comments.
QTextCodec *commentCodec;
/// The archive file name.
QString zipName;
/// The device to access the archive.
QIODevice *ioDevice;
/// The global comment.
QString comment;
/// The open mode.
QuaZip::Mode mode;
union
{
/// The internal handle for UNZIP modes.
unzFile unzFile_f;
/// The internal handle for ZIP modes.
zipFile zipFile_f;
};
/// Whether a current file is set.
bool hasCurrentFile_f;
/// The last error.
int zipError;
/// Whether \ref QuaZip::setDataDescriptorWritingEnabled() "the data descriptor writing mode" is enabled.
bool dataDescriptorWritingEnabled;
/// The constructor for the corresponding QuaZip constructor.
inline QuaZipPrivate( QuaZip *q ):
q( q ),
fileNameCodec( QTextCodec::codecForLocale() ),
commentCodec( QTextCodec::codecForLocale() ),
ioDevice( NULL ),
mode( QuaZip::mdNotOpen ),
hasCurrentFile_f( false ),
zipError( UNZ_OK ),
dataDescriptorWritingEnabled( true ) {}
/// The constructor for the corresponding QuaZip constructor.
inline QuaZipPrivate( QuaZip *q, const QString &zipName ):
q( q ),
fileNameCodec( QTextCodec::codecForLocale() ),
commentCodec( QTextCodec::codecForLocale() ),
zipName( zipName ),
ioDevice( NULL ),
mode( QuaZip::mdNotOpen ),
hasCurrentFile_f( false ),
zipError( UNZ_OK ),
dataDescriptorWritingEnabled( true ) {}
/// The constructor for the corresponding QuaZip constructor.
inline QuaZipPrivate( QuaZip *q, QIODevice *ioDevice ):
q( q ),
fileNameCodec( QTextCodec::codecForLocale() ),
commentCodec( QTextCodec::codecForLocale() ),
ioDevice( ioDevice ),
mode( QuaZip::mdNotOpen ),
hasCurrentFile_f( false ),
zipError( UNZ_OK ),
dataDescriptorWritingEnabled( true ) {}
/// Returns either a list of file names or a list of QuaZipFileInfo.
template<typename TFileInfo>
bool getFileInfoList( QList<TFileInfo> *result ) const;
};
QuaZip::QuaZip():
p( new QuaZipPrivate( this ) )
{
}
QuaZip::QuaZip( const QString& zipName ):
p( new QuaZipPrivate( this, zipName ) )
{
}
QuaZip::QuaZip( QIODevice *ioDevice ):
p( new QuaZipPrivate( this, ioDevice ) )
{
}
QuaZip::~QuaZip()
{
if ( isOpen() )
close();
delete p;
}
bool QuaZip::open( Mode mode, zlib_filefunc_def* ioApi )
{
p->zipError = UNZ_OK;
if ( isOpen() )
{
qWarning( "QuaZip::open(): ZIP already opened" );
return false;
}
QIODevice *ioDevice = p->ioDevice;
if ( ioDevice == NULL )
{
if ( p->zipName.isEmpty() )
{
qWarning( "QuaZip::open(): set either ZIP file name or IO device first" );
return false;
}
else
{
ioDevice = new QFile( p->zipName );
}
}
switch ( mode )
{
case mdUnzip:
p->unzFile_f = unzOpen2( ioDevice, ioApi );
if ( p->unzFile_f != NULL )
{
p->mode = mode;
p->ioDevice = ioDevice;
return true;
}
else
{
p->zipError = UNZ_OPENERROR;
if ( !p->zipName.isEmpty() )
delete ioDevice;
return false;
}
case mdCreate:
case mdAppend:
case mdAdd:
p->zipFile_f = zipOpen2( ioDevice,
mode == mdCreate ? APPEND_STATUS_CREATE :
mode == mdAppend ? APPEND_STATUS_CREATEAFTER :
APPEND_STATUS_ADDINZIP,
NULL,
ioApi );
if ( p->zipFile_f != NULL )
{
p->mode = mode;
p->ioDevice = ioDevice;
return true;
}
else
{
p->zipError = UNZ_OPENERROR;
if ( !p->zipName.isEmpty() )
delete ioDevice;
return false;
}
default:
qWarning( "QuaZip::open(): unknown mode: %d", ( int )mode );
if ( !p->zipName.isEmpty() )
delete ioDevice;
return false;
break;
}
}
void QuaZip::close()
{
p->zipError = UNZ_OK;
switch ( p->mode )
{
case mdNotOpen:
qWarning( "QuaZip::close(): ZIP is not open" );
return;
case mdUnzip:
p->zipError = unzClose( p->unzFile_f );
break;
case mdCreate:
case mdAppend:
case mdAdd:
p->zipError = zipClose( p->zipFile_f, p->commentCodec->fromUnicode( p->comment ).constData() );
break;
default:
qWarning( "QuaZip::close(): unknown mode: %d", ( int )p->mode );
return;
}
// opened by name, need to delete the internal IO device
if ( !p->zipName.isEmpty() )
{
delete p->ioDevice;
p->ioDevice = NULL;
}
if ( p->zipError == UNZ_OK )
p->mode = mdNotOpen;
}
void QuaZip::setZipName( const QString& zipName )
{
if ( isOpen() )
{
qWarning( "QuaZip::setZipName(): ZIP is already open!" );
return;
}
p->zipName = zipName;
p->ioDevice = NULL;
}
void QuaZip::setIoDevice( QIODevice *ioDevice )
{
if ( isOpen() )
{
qWarning( "QuaZip::setIoDevice(): ZIP is already open!" );
return;
}
p->ioDevice = ioDevice;
p->zipName = QString();
}
int QuaZip::getEntriesCount()const
{
QuaZip *fakeThis = ( QuaZip* )this; // non-const
fakeThis->p->zipError = UNZ_OK;
if ( p->mode != mdUnzip )
{
qWarning( "QuaZip::getEntriesCount(): ZIP is not open in mdUnzip mode" );
return -1;
}
unz_global_info globalInfo;
if (( fakeThis->p->zipError = unzGetGlobalInfo( p->unzFile_f, &globalInfo ) ) != UNZ_OK )
return p->zipError;
return ( int )globalInfo.number_entry;
}
QString QuaZip::getComment()const
{
QuaZip *fakeThis = ( QuaZip* )this; // non-const
fakeThis->p->zipError = UNZ_OK;
if ( p->mode != mdUnzip )
{
qWarning( "QuaZip::getComment(): ZIP is not open in mdUnzip mode" );
return QString();
}
unz_global_info globalInfo;
QByteArray comment;
if (( fakeThis->p->zipError = unzGetGlobalInfo( p->unzFile_f, &globalInfo ) ) != UNZ_OK )
return QString();
comment.resize( globalInfo.size_comment );
if (( fakeThis->p->zipError = unzGetGlobalComment( p->unzFile_f, comment.data(), comment.size() ) ) < 0 )
return QString();
fakeThis->p->zipError = UNZ_OK;
return p->commentCodec->toUnicode( comment );
}
bool QuaZip::setCurrentFile( const QString& fileName, CaseSensitivity cs )
{
p->zipError = UNZ_OK;
if ( p->mode != mdUnzip )
{
qWarning( "QuaZip::setCurrentFile(): ZIP is not open in mdUnzip mode" );
return false;
}
if ( fileName.isEmpty() )
{
p->hasCurrentFile_f = false;
return true;
}
// Unicode-aware reimplementation of the unzLocateFile function
if ( p->unzFile_f == NULL )
{
p->zipError = UNZ_PARAMERROR;
return false;
}
if ( fileName.length() > MAX_FILE_NAME_LENGTH )
{
p->zipError = UNZ_PARAMERROR;
return false;
}
bool sens;
if ( cs == csDefault )
{
#ifdef Q_WS_WIN
sens = false;
#else
sens = true;
#endif
}
else sens = cs == csSensitive;
QString lower, current;
if ( !sens ) lower = fileName.toLower();
p->hasCurrentFile_f = false;
for ( bool more = goToFirstFile(); more; more = goToNextFile() )
{
current = getCurrentFileName();
if ( current.isEmpty() ) return false;
if ( sens )
{
if ( current == fileName ) break;
}
else
{
if ( current.toLower() == lower ) break;
}
}
return p->hasCurrentFile_f;
}
bool QuaZip::goToFirstFile()
{
p->zipError = UNZ_OK;
if ( p->mode != mdUnzip )
{
qWarning( "QuaZip::goToFirstFile(): ZIP is not open in mdUnzip mode" );
return false;
}
p->zipError = unzGoToFirstFile( p->unzFile_f );
p->hasCurrentFile_f = p->zipError == UNZ_OK;
return p->hasCurrentFile_f;
}
bool QuaZip::goToNextFile()
{
p->zipError = UNZ_OK;
if ( p->mode != mdUnzip )
{
qWarning( "QuaZip::goToFirstFile(): ZIP is not open in mdUnzip mode" );
return false;
}
p->zipError = unzGoToNextFile( p->unzFile_f );
p->hasCurrentFile_f = p->zipError == UNZ_OK;
if ( p->zipError == UNZ_END_OF_LIST_OF_FILE )
p->zipError = UNZ_OK;
return p->hasCurrentFile_f;
}
bool QuaZip::getCurrentFileInfo( QuaZipFileInfo *info )const
{
QuaZip *fakeThis = ( QuaZip* )this; // non-const
fakeThis->p->zipError = UNZ_OK;
if ( p->mode != mdUnzip )
{
qWarning( "QuaZip::getCurrentFileInfo(): ZIP is not open in mdUnzip mode" );
return false;
}
unz_file_info info_z;
QByteArray fileName;
QByteArray extra;
QByteArray comment;
if ( info == NULL ) return false;
if ( !isOpen() || !hasCurrentFile() ) return false;
if (( fakeThis->p->zipError = unzGetCurrentFileInfo( p->unzFile_f, &info_z, NULL, 0, NULL, 0, NULL, 0 ) ) != UNZ_OK )
return false;
fileName.resize( info_z.size_filename );
extra.resize( info_z.size_file_extra );
comment.resize( info_z.size_file_comment );
if (( fakeThis->p->zipError = unzGetCurrentFileInfo( p->unzFile_f, NULL,
fileName.data(), fileName.size(),
extra.data(), extra.size(),
comment.data(), comment.size() ) ) != UNZ_OK )
return false;
info->versionCreated = info_z.version;
info->versionNeeded = info_z.version_needed;
info->flags = info_z.flag;
info->method = info_z.compression_method;
info->crc = info_z.crc;
info->compressedSize = info_z.compressed_size;
info->uncompressedSize = info_z.uncompressed_size;
info->diskNumberStart = info_z.disk_num_start;
info->internalAttr = info_z.internal_fa;
info->externalAttr = info_z.external_fa;
info->name = p->fileNameCodec->toUnicode( fileName );
info->comment = p->commentCodec->toUnicode( comment );
info->extra = extra;
info->dateTime = QDateTime(
QDate( info_z.tmu_date.tm_year, info_z.tmu_date.tm_mon + 1, info_z.tmu_date.tm_mday ),
QTime( info_z.tmu_date.tm_hour, info_z.tmu_date.tm_min, info_z.tmu_date.tm_sec ) );
return true;
}
QString QuaZip::getCurrentFileName()const
{
QuaZip *fakeThis = ( QuaZip* )this; // non-const
fakeThis->p->zipError = UNZ_OK;
if ( p->mode != mdUnzip )
{
qWarning( "QuaZip::getCurrentFileName(): ZIP is not open in mdUnzip mode" );
return QString();
}
if ( !isOpen() || !hasCurrentFile() ) return QString();
QByteArray fileName( MAX_FILE_NAME_LENGTH, 0 );
if (( fakeThis->p->zipError = unzGetCurrentFileInfo( p->unzFile_f, NULL, fileName.data(), fileName.size(),
NULL, 0, NULL, 0 ) ) != UNZ_OK )
return QString();
return p->fileNameCodec->toUnicode( fileName.constData() );
}
void QuaZip::setFileNameCodec( QTextCodec *fileNameCodec )
{
p->fileNameCodec = fileNameCodec;
}
void QuaZip::setFileNameCodec( const char *fileNameCodecName )
{
p->fileNameCodec = QTextCodec::codecForName( fileNameCodecName );
}
QTextCodec *QuaZip::getFileNameCodec()const
{
return p->fileNameCodec;
}
void QuaZip::setCommentCodec( QTextCodec *commentCodec )
{
p->commentCodec = commentCodec;
}
void QuaZip::setCommentCodec( const char *commentCodecName )
{
p->commentCodec = QTextCodec::codecForName( commentCodecName );
}
QTextCodec *QuaZip::getCommentCodec()const
{
return p->commentCodec;
}
QString QuaZip::getZipName() const
{
return p->zipName;
}
QIODevice *QuaZip::getIoDevice() const
{
if ( !p->zipName.isEmpty() ) // opened by name, using an internal QIODevice
return NULL;
return p->ioDevice;
}
QuaZip::Mode QuaZip::getMode()const
{
return p->mode;
}
bool QuaZip::isOpen()const
{
return p->mode != mdNotOpen;
}
int QuaZip::getZipError() const
{
return p->zipError;
}
void QuaZip::setComment( const QString& comment )
{
p->comment = comment;
}
bool QuaZip::hasCurrentFile()const
{
return p->hasCurrentFile_f;
}
unzFile QuaZip::getUnzFile()
{
return p->unzFile_f;
}
zipFile QuaZip::getZipFile()
{
return p->zipFile_f;
}
void QuaZip::setDataDescriptorWritingEnabled( bool enabled )
{
p->dataDescriptorWritingEnabled = enabled;
}
bool QuaZip::isDataDescriptorWritingEnabled() const
{
return p->dataDescriptorWritingEnabled;
}
template<typename TFileInfo>
static TFileInfo getFileInfo( QuaZip *zip, bool *ok );
template<>
QuaZipFileInfo getFileInfo( QuaZip *zip, bool *ok )
{
QuaZipFileInfo info;
*ok = zip->getCurrentFileInfo( &info );
return info;
}
template<>
QString getFileInfo( QuaZip *zip, bool *ok )
{
QString name = zip->getCurrentFileName();
*ok = !name.isEmpty();
return name;
}
template<typename TFileInfo>
bool QuaZipPrivate::getFileInfoList( QList<TFileInfo> *result ) const
{
QuaZipPrivate *fakeThis = const_cast<QuaZipPrivate*>( this );
fakeThis->zipError = UNZ_OK;
if ( mode != QuaZip::mdUnzip )
{
qWarning( "QuaZip::getFileNameList/getFileInfoList(): "
"ZIP is not open in mdUnzip mode" );
return false;
}
QString currentFile;
if ( q->hasCurrentFile() )
{
currentFile = q->getCurrentFileName();
}
if ( q->goToFirstFile() )
{
do
{
bool ok;
result->append( getFileInfo<TFileInfo>( q, &ok ) );
if ( !ok )
return false;
}
while ( q->goToNextFile() );
}
if ( zipError != UNZ_OK )
return false;
if ( currentFile.isEmpty() )
{
if ( !q->setCurrentFile( currentFile ) )
return false;
}
else
{
if ( !q->goToFirstFile() )
return false;
}
return true;
}
QStringList QuaZip::getFileNameList() const
{
QStringList list;
if ( p->getFileInfoList( &list ) )
return list;
else
return QStringList();
}
QList<QuaZipFileInfo> QuaZip::getFileInfoList() const
{
QList<QuaZipFileInfo> list;
if ( p->getFileInfoList( &list ) )
return list;
else
return QList<QuaZipFileInfo>();
}

View File

@ -1,410 +0,0 @@
#ifndef QUA_ZIP_H
#define QUA_ZIP_H
/*
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
**/
#include <QString>
#include <QStringList>
#include <QTextCodec>
#include "zip.h"
#include "unzip.h"
#include "quazip_global.h"
#include "quazipfileinfo.h"
// just in case it will be defined in the later versions of the ZIP/UNZIP
#ifndef UNZ_OPENERROR
// define additional error code
#define UNZ_OPENERROR -1000
#endif
class QuaZipPrivate;
/// ZIP archive.
/** \class QuaZip quazip.h <quazip/quazip.h>
* This class implements basic interface to the ZIP archive. It can be
* used to read table contents of the ZIP archive and retreiving
* information about the files inside it.
*
* You can also use this class to open files inside archive by passing
* pointer to the instance of this class to the constructor of the
* QuaZipFile class. But see QuaZipFile::QuaZipFile(QuaZip*, QObject*)
* for the possible pitfalls.
*
* This class is indended to provide interface to the ZIP subpackage of
* the ZIP/UNZIP package as well as to the UNZIP subpackage. But
* currently it supports only UNZIP.
*
* The use of this class is simple - just create instance using
* constructor, then set ZIP archive file name using setFile() function
* (if you did not passed the name to the constructor), then open() and
* then use different functions to work with it! Well, if you are
* paranoid, you may also wish to call close before destructing the
* instance, to check for errors on close.
*
* You may also use getUnzFile() and getZipFile() functions to get the
* ZIP archive handle and use it with ZIP/UNZIP package API directly.
*
* This class supports localized file names inside ZIP archive, but you
* have to set up proper codec with setCodec() function. By default,
* locale codec will be used, which is probably ok for UNIX systems, but
* will almost certainly fail with ZIP archives created in Windows. This
* is because Windows ZIP programs have strange habit of using DOS
* encoding for file names in ZIP archives. For example, ZIP archive
* with cyrillic names created in Windows will have file names in \c
* IBM866 encoding instead of \c WINDOWS-1251. I think that calling one
* function is not much trouble, but for true platform independency it
* would be nice to have some mechanism for file name encoding auto
* detection using locale information. Does anyone know a good way to do
* it?
**/
class QUAZIP_EXPORT QuaZip
{
friend class QuaZipPrivate;
public:
/// Useful constants.
enum Constants
{
MAX_FILE_NAME_LENGTH = 256 /**< Maximum file name length. Taken from
\c UNZ_MAXFILENAMEINZIP constant in
unzip.c. */
};
/// Open mode of the ZIP file.
enum Mode
{
mdNotOpen, ///< ZIP file is not open. This is the initial mode.
mdUnzip, ///< ZIP file is open for reading files inside it.
mdCreate, ///< ZIP file was created with open() call.
mdAppend, /**< ZIP file was opened in append mode. This refers to
* \c APPEND_STATUS_CREATEAFTER mode in ZIP/UNZIP package
* and means that zip is appended to some existing file
* what is useful when that file contains
* self-extractor code. This is obviously \em not what
* you whant to use to add files to the existing ZIP
* archive.
**/
mdAdd ///< ZIP file was opened for adding files in the archive.
};
/// Case sensitivity for the file names.
/** This is what you specify when accessing files in the archive.
* Works perfectly fine with any characters thanks to Qt's great
* unicode support. This is different from ZIP/UNZIP API, where
* only US-ASCII characters was supported.
**/
enum CaseSensitivity
{
csDefault = 0, ///< Default for platform. Case sensitive for UNIX, not for Windows.
csSensitive = 1, ///< Case sensitive.
csInsensitive = 2 ///< Case insensitive.
};
private:
QuaZipPrivate *p;
// not (and will not be) implemented
QuaZip( const QuaZip& that );
// not (and will not be) implemented
QuaZip& operator=( const QuaZip& that );
public:
/// Constructs QuaZip object.
/** Call setName() before opening constructed object. */
QuaZip();
/// Constructs QuaZip object associated with ZIP file \a zipName.
QuaZip( const QString& zipName );
/// Constructs QuaZip object associated with ZIP file represented by \a ioDevice.
/** The IO device must be seekable, otherwise an error will occur when opening. */
QuaZip( QIODevice *ioDevice );
/// Destroys QuaZip object.
/** Calls close() if necessary. */
~QuaZip();
/// Opens ZIP file.
/**
* Argument \a mode specifies open mode of the ZIP archive. See Mode
* for details. Note that there is zipOpen2() function in the
* ZIP/UNZIP API which accepts \a globalcomment argument, but it
* does not use it anywhere, so this open() function does not have this
* argument. See setComment() if you need to set global comment.
*
* If the ZIP file is accessed via explicitly set QIODevice, then
* this device is opened in the necessary mode. If the device was
* already opened by some other means, then the behaviour is defined by
* the device implementation, but generally it is not a very good
* idea. For example, QFile will at least issue a warning.
*
* \return \c true if successful, \c false otherwise.
*
* \note ZIP/UNZIP API open calls do not return error code - they
* just return \c NULL indicating an error. But to make things
* easier, quazip.h header defines additional error code \c
* UNZ_ERROROPEN and getZipError() will return it if the open call
* of the ZIP/UNZIP API returns \c NULL.
*
* Argument \a ioApi specifies IO function set for ZIP/UNZIP
* package to use. See unzip.h, zip.h and ioapi.h for details. Note
* that IO API for QuaZip is different from the original package.
* The file path argument was changed to be of type \c voidpf, and
* QuaZip passes a QIODevice pointer there. This QIODevice is either
* set explicitly via setIoDevice() or the QuaZip(QIODevice*)
* constructor, or it is created internally when opening the archive
* by its file name. The default API (qioapi.cpp) just delegates
* everything to the QIODevice API. Not only this allows to use a
* QIODevice instead of file name, but also has a nice side effect
* of raising the file size limit from 2G to 4G.
*
* In short: just forget about the \a ioApi argument and you'll be
* fine.
**/
bool open( Mode mode, zlib_filefunc_def *ioApi = NULL );
/// Closes ZIP file.
/** Call getZipError() to determine if the close was successful. The
* underlying QIODevice is also closed, regardless of whether it was
* set explicitly or not. */
void close();
/// Sets the codec used to encode/decode file names inside archive.
/** This is necessary to access files in the ZIP archive created
* under Windows with non-latin characters in file names. For
* example, file names with cyrillic letters will be in \c IBM866
* encoding.
**/
void setFileNameCodec( QTextCodec *fileNameCodec );
/// Sets the codec used to encode/decode file names inside archive.
/** \overload
* Equivalent to calling setFileNameCodec(QTextCodec::codecForName(codecName));
**/
void setFileNameCodec( const char *fileNameCodecName );
/// Returns the codec used to encode/decode comments inside archive.
QTextCodec* getFileNameCodec() const;
/// Sets the codec used to encode/decode comments inside archive.
/** This codec defaults to locale codec, which is probably ok.
**/
void setCommentCodec( QTextCodec *commentCodec );
/// Sets the codec used to encode/decode comments inside archive.
/** \overload
* Equivalent to calling setCommentCodec(QTextCodec::codecForName(codecName));
**/
void setCommentCodec( const char *commentCodecName );
/// Returns the codec used to encode/decode comments inside archive.
QTextCodec* getCommentCodec() const;
/// Returns the name of the ZIP file.
/** Returns null string if no ZIP file name has been set, for
* example when the QuaZip instance is set up to use a QIODevice
* instead.
* \sa setZipName(), setIoDevice(), getIoDevice()
**/
QString getZipName() const;
/// Sets the name of the ZIP file.
/** Does nothing if the ZIP file is open.
*
* Does not reset error code returned by getZipError().
* \sa setIoDevice(), getIoDevice(), getZipName()
**/
void setZipName( const QString& zipName );
/// Returns the device representing this ZIP file.
/** Returns null string if no device has been set explicitly, for
* example when opening a ZIP file by name.
* \sa setIoDevice(), getZipName(), setZipName()
**/
QIODevice *getIoDevice() const;
/// Sets the device representing the ZIP file.
/** Does nothing if the ZIP file is open.
*
* Does not reset error code returned by getZipError().
* \sa getIoDevice(), getZipName(), setZipName()
**/
void setIoDevice( QIODevice *ioDevice );
/// Returns the mode in which ZIP file was opened.
Mode getMode() const;
/// Returns \c true if ZIP file is open, \c false otherwise.
bool isOpen() const;
/// Returns the error code of the last operation.
/** Returns \c UNZ_OK if the last operation was successful.
*
* Error code resets to \c UNZ_OK every time you call any function
* that accesses something inside ZIP archive, even if it is \c
* const (like getEntriesCount()). open() and close() calls reset
* error code too. See documentation for the specific functions for
* details on error detection.
**/
int getZipError() const;
/// Returns number of the entries in the ZIP central directory.
/** Returns negative error code in the case of error. The same error
* code will be returned by subsequent getZipError() call.
**/
int getEntriesCount() const;
/// Returns global comment in the ZIP file.
QString getComment() const;
/// Sets global comment in the ZIP file.
/** Comment will be written to the archive on close operation.
*
* \sa open()
**/
void setComment( const QString& comment );
/// Sets the current file to the first file in the archive.
/** Returns \c true on success, \c false otherwise. Call
* getZipError() to get the error code.
**/
bool goToFirstFile();
/// Sets the current file to the next file in the archive.
/** Returns \c true on success, \c false otherwise. Call
* getZipError() to determine if there was an error.
*
* Should be used only in QuaZip::mdUnzip mode.
*
* \note If the end of file was reached, getZipError() will return
* \c UNZ_OK instead of \c UNZ_END_OF_LIST_OF_FILE. This is to make
* things like this easier:
* \code
* for(bool more=zip.goToFirstFile(); more; more=zip.goToNextFile()) {
* // do something
* }
* if(zip.getZipError()==UNZ_OK) {
* // ok, there was no error
* }
* \endcode
**/
bool goToNextFile();
/// Sets current file by its name.
/** Returns \c true if successful, \c false otherwise. Argument \a
* cs specifies case sensitivity of the file name. Call
* getZipError() in the case of a failure to get error code.
*
* This is not a wrapper to unzLocateFile() function. That is
* because I had to implement locale-specific case-insensitive
* comparison.
*
* Here are the differences from the original implementation:
*
* - If the file was not found, error code is \c UNZ_OK, not \c
* UNZ_END_OF_LIST_OF_FILE (see also goToNextFile()).
* - If this function fails, it unsets the current file rather than
* resetting it back to what it was before the call.
*
* If \a fileName is null string then this function unsets the
* current file and return \c true. Note that you should close the
* file first if it is open! See
* QuaZipFile::QuaZipFile(QuaZip*,QObject*) for the details.
*
* Should be used only in QuaZip::mdUnzip mode.
*
* \sa setFileNameCodec(), CaseSensitivity
**/
bool setCurrentFile( const QString& fileName, CaseSensitivity cs = csDefault );
/// Returns \c true if the current file has been set.
bool hasCurrentFile() const;
/// Retrieves information about the current file.
/** Fills the structure pointed by \a info. Returns \c true on
* success, \c false otherwise. In the latter case structure pointed
* by \a info remains untouched. If there was an error,
* getZipError() returns error code.
*
* Should be used only in QuaZip::mdUnzip mode.
*
* Does nothing and returns \c false in any of the following cases.
* - ZIP is not open;
* - ZIP does not have current file;
* - \a info is \c NULL;
*
* In all these cases getZipError() returns \c UNZ_OK since there
* is no ZIP/UNZIP API call.
**/
bool getCurrentFileInfo( QuaZipFileInfo* info )const;
/// Returns the current file name.
/** Equivalent to calling getCurrentFileInfo() and then getting \c
* name field of the QuaZipFileInfo structure, but faster and more
* convenient.
*
* Should be used only in QuaZip::mdUnzip mode.
**/
QString getCurrentFileName()const;
/// Returns \c unzFile handle.
/** You can use this handle to directly call UNZIP part of the
* ZIP/UNZIP package functions (see unzip.h).
*
* \warning When using the handle returned by this function, please
* keep in mind that QuaZip class is unable to detect any changes
* you make in the ZIP file state (e. g. changing current file, or
* closing the handle). So please do not do anything with this
* handle that is possible to do with the functions of this class.
* Or at least return the handle in the original state before
* calling some another function of this class (including implicit
* destructor calls and calls from the QuaZipFile objects that refer
* to this QuaZip instance!). So if you have changed the current
* file in the ZIP archive - then change it back or you may
* experience some strange behavior or even crashes.
**/
unzFile getUnzFile();
/// Returns \c zipFile handle.
/** You can use this handle to directly call ZIP part of the
* ZIP/UNZIP package functions (see zip.h). Warnings about the
* getUnzFile() function also apply to this function.
**/
zipFile getZipFile();
/// Changes the data descriptor writing mode.
/**
According to the ZIP format specification, a file inside archive
may have a data descriptor immediately following the file
data. This is reflected by a special flag in the local file header
and in the central directory. By default, QuaZIP sets this flag
and writes the data descriptor unless both method and level were
set to 0, in which case it operates in 1.0-compatible mode and
never writes data descriptors.
By setting this flag to false, it is possible to disable data
descriptor writing, thus increasing compatibility with archive
readers that don't understand this feature of the ZIP file format.
Setting this flag affects all the QuaZipFile instances that are
opened after this flag is set.
The data descriptor writing mode is enabled by default.
\param enabled If \c true, enable local descriptor writing,
disable it otherwise.
\sa QuaZipFile::setDataDescriptorWritingEnabled()
*/
void setDataDescriptorWritingEnabled( bool enabled );
/// Returns the data descriptor default writing mode.
/**
\sa setDataDescriptorWritingEnabled()
*/
bool isDataDescriptorWritingEnabled() const;
/// Returns a list of files inside the archive.
/**
\return A list of file names or an empty list if there
was an error or if the archive is empty (call getZipError() to
figure out which).
\sa getFileInfoList()
*/
QStringList getFileNameList() const;
/// Returns information list about all files inside the archive.
/**
\return A list of QuaZipFileInfo objects or an empty list if there
was an error or if the archive is empty (call getZipError() to
figure out which).
\sa getFileNameList()
*/
QList<QuaZipFileInfo> getFileInfoList() const;
};
#endif

View File

@ -1,55 +0,0 @@
/**
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
*/
#ifndef QUAZIP_GLOBAL_H
#define QUAZIP_GLOBAL_H
#include <QtCore/qglobal.h>
/**
This is automatically defined when building a static library, but when
including QuaZip sources directly into a project, QUAZIP_STATIC should
be defined explicitly to avoid possible troubles with unnecessary
importing/exporting.
*/
#ifdef QUAZIP_STATIC
#define QUAZIP_EXPORT
#else
/**
* When building a DLL with MSVC, QUAZIP_BUILD must be defined.
* qglobal.h takes care of defining Q_DECL_* correctly for msvc/gcc.
*/
#if defined(QUAZIP_BUILD)
#define QUAZIP_EXPORT Q_DECL_EXPORT
#else
#define QUAZIP_EXPORT Q_DECL_IMPORT
#endif
#endif // QUAZIP_STATIC
#ifdef __GNUC__
#define UNUSED __attribute__((__unused__))
#else
#define UNUSED
#endif
#endif // QUAZIP_GLOBAL_H

View File

@ -1,517 +0,0 @@
/*
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
**/
#include "quazipfile.h"
using namespace std;
/// The implementation class for QuaZip.
/**
\internal
This class contains all the private stuff for the QuaZipFile class, thus
allowing to preserve binary compatibility between releases, the
technique known as the Pimpl (private implementation) idiom.
*/
class QuaZipFilePrivate
{
friend class QuaZipFile;
private:
/// The pointer to the associated QuaZipFile instance.
QuaZipFile *q;
/// The QuaZip object to work with.
QuaZip *zip;
/// The file name.
QString fileName;
/// Case sensitivity mode.
QuaZip::CaseSensitivity caseSensitivity;
/// Whether this file is opened in the raw mode.
bool raw;
/// Write position to keep track of.
/**
QIODevice::pos() is broken for non-seekable devices, so we need
our own position.
*/
qint64 writePos;
/// Uncompressed size to write along with a raw file.
ulong uncompressedSize;
/// CRC to write along with a raw file.
quint32 crc;
/// Whether \ref zip points to an internal QuaZip instance.
/**
This is true if the archive was opened by name, rather than by
supplying an existing QuaZip instance.
*/
bool internal;
/// The last error.
int zipError;
/// Resets \ref zipError.
inline void resetZipError() const {setZipError( UNZ_OK );}
/// Sets the zip error.
/**
This function is marked as const although it changes one field.
This allows to call it from const functions that don't change
anything by themselves.
*/
void setZipError( int zipError ) const;
/// The constructor for the corresponding QuaZipFile constructor.
inline QuaZipFilePrivate( QuaZipFile *q ):
q( q ), zip( NULL ), internal( true ), zipError( UNZ_OK ) {}
/// The constructor for the corresponding QuaZipFile constructor.
inline QuaZipFilePrivate( QuaZipFile *q, const QString &zipName ):
q( q ), internal( true ), zipError( UNZ_OK )
{
zip = new QuaZip( zipName );
}
/// The constructor for the corresponding QuaZipFile constructor.
inline QuaZipFilePrivate( QuaZipFile *q, const QString &zipName, const QString &fileName,
QuaZip::CaseSensitivity cs ):
q( q ), internal( true ), zipError( UNZ_OK )
{
zip = new QuaZip( zipName );
this->fileName = fileName;
this->caseSensitivity = cs;
}
/// The constructor for the QuaZipFile constructor accepting a file name.
inline QuaZipFilePrivate( QuaZipFile *q, QuaZip *zip ):
q( q ), zip( zip ), internal( false ), zipError( UNZ_OK ) {}
/// The destructor.
inline ~QuaZipFilePrivate()
{
if ( internal )
delete zip;
}
};
QuaZipFile::QuaZipFile():
p( new QuaZipFilePrivate( this ) )
{
}
QuaZipFile::QuaZipFile( QObject *parent ):
QIODevice( parent ),
p( new QuaZipFilePrivate( this ) )
{
}
QuaZipFile::QuaZipFile( const QString& zipName, QObject *parent ):
QIODevice( parent ),
p( new QuaZipFilePrivate( this, zipName ) )
{
}
QuaZipFile::QuaZipFile( const QString& zipName, const QString& fileName,
QuaZip::CaseSensitivity cs, QObject *parent ):
QIODevice( parent ),
p( new QuaZipFilePrivate( this, zipName, fileName, cs ) )
{
}
QuaZipFile::QuaZipFile( QuaZip *zip, QObject *parent ):
QIODevice( parent ),
p( new QuaZipFilePrivate( this, zip ) )
{
}
QuaZipFile::~QuaZipFile()
{
if ( isOpen() )
close();
delete p;
}
QString QuaZipFile::getZipName() const
{
return p->zip == NULL ? QString() : p->zip->getZipName();
}
QuaZip *QuaZipFile::getZip() const
{
return p->internal ? NULL : p->zip;
}
QString QuaZipFile::getActualFileName()const
{
p->setZipError( UNZ_OK );
if ( p->zip == NULL || ( openMode() & WriteOnly ) )
return QString();
QString name = p->zip->getCurrentFileName();
if ( name.isNull() )
p->setZipError( p->zip->getZipError() );
return name;
}
void QuaZipFile::setZipName( const QString& zipName )
{
if ( isOpen() )
{
qWarning( "QuaZipFile::setZipName(): file is already open - can not set ZIP name" );
return;
}
if ( p->zip != NULL && p->internal )
delete p->zip;
p->zip = new QuaZip( zipName );
p->internal = true;
}
void QuaZipFile::setZip( QuaZip *zip )
{
if ( isOpen() )
{
qWarning( "QuaZipFile::setZip(): file is already open - can not set ZIP" );
return;
}
if ( p->zip != NULL && p->internal )
delete p->zip;
p->zip = zip;
p->fileName = QString();
p->internal = false;
}
void QuaZipFile::setFileName( const QString& fileName, QuaZip::CaseSensitivity cs )
{
if ( p->zip == NULL )
{
qWarning( "QuaZipFile::setFileName(): call setZipName() first" );
return;
}
if ( !p->internal )
{
qWarning( "QuaZipFile::setFileName(): should not be used when not using internal QuaZip" );
return;
}
if ( isOpen() )
{
qWarning( "QuaZipFile::setFileName(): can not set file name for already opened file" );
return;
}
p->fileName = fileName;
p->caseSensitivity = cs;
}
void QuaZipFilePrivate::setZipError( int zipError ) const
{
QuaZipFilePrivate *fakeThis = const_cast<QuaZipFilePrivate*>( this ); // non-const
fakeThis->zipError = zipError;
if ( zipError == UNZ_OK )
q->setErrorString( QString() );
else
q->setErrorString( q->tr( "ZIP/UNZIP API error %1" ).arg( zipError ) );
}
bool QuaZipFile::open( OpenMode mode )
{
return open( mode, NULL );
}
bool QuaZipFile::open( OpenMode mode, int *method, int *level, bool raw, const char *password )
{
p->resetZipError();
if ( isOpen() )
{
qWarning( "QuaZipFile::open(): already opened" );
return false;
}
if ( mode&Unbuffered )
{
qWarning( "QuaZipFile::open(): Unbuffered mode is not supported" );
return false;
}
if (( mode&ReadOnly ) && !( mode&WriteOnly ) )
{
if ( p->internal )
{
if ( !p->zip->open( QuaZip::mdUnzip ) )
{
p->setZipError( p->zip->getZipError() );
return false;
}
if ( !p->zip->setCurrentFile( p->fileName, p->caseSensitivity ) )
{
p->setZipError( p->zip->getZipError() );
p->zip->close();
return false;
}
}
else
{
if ( p->zip == NULL )
{
qWarning( "QuaZipFile::open(): zip is NULL" );
return false;
}
if ( p->zip->getMode() != QuaZip::mdUnzip )
{
qWarning( "QuaZipFile::open(): file open mode %d incompatible with ZIP open mode %d",
( int )mode, ( int )p->zip->getMode() );
return false;
}
if ( !p->zip->hasCurrentFile() )
{
qWarning( "QuaZipFile::open(): zip does not have current file" );
return false;
}
}
p->setZipError( unzOpenCurrentFile3( p->zip->getUnzFile(), method, level, ( int )raw, password ) );
if ( p->zipError == UNZ_OK )
{
setOpenMode( mode );
p->raw = raw;
return true;
}
else
return false;
}
qWarning( "QuaZipFile::open(): open mode %d not supported by this function", ( int )mode );
return false;
}
bool QuaZipFile::open( OpenMode mode, const QuaZipNewInfo& info,
const char *password, quint32 crc,
int method, int level, bool raw,
int windowBits, int memLevel, int strategy )
{
zip_fileinfo info_z;
p->resetZipError();
if ( isOpen() )
{
qWarning( "QuaZipFile::open(): already opened" );
return false;
}
if (( mode&WriteOnly ) && !( mode&ReadOnly ) )
{
if ( p->internal )
{
qWarning( "QuaZipFile::open(): write mode is incompatible with internal QuaZip approach" );
return false;
}
if ( p->zip == NULL )
{
qWarning( "QuaZipFile::open(): zip is NULL" );
return false;
}
if ( p->zip->getMode() != QuaZip::mdCreate && p->zip->getMode() != QuaZip::mdAppend && p->zip->getMode() != QuaZip::mdAdd )
{
qWarning( "QuaZipFile::open(): file open mode %d incompatible with ZIP open mode %d",
( int )mode, ( int )p->zip->getMode() );
return false;
}
info_z.tmz_date.tm_year = info.dateTime.date().year();
info_z.tmz_date.tm_mon = info.dateTime.date().month() - 1;
info_z.tmz_date.tm_mday = info.dateTime.date().day();
info_z.tmz_date.tm_hour = info.dateTime.time().hour();
info_z.tmz_date.tm_min = info.dateTime.time().minute();
info_z.tmz_date.tm_sec = info.dateTime.time().second();
info_z.dosDate = 0;
info_z.internal_fa = ( uLong )info.internalAttr;
info_z.external_fa = ( uLong )info.externalAttr;
if ( !p->zip->isDataDescriptorWritingEnabled() )
zipClearFlags( p->zip->getZipFile(), ZIP_WRITE_DATA_DESCRIPTOR );
p->setZipError( zipOpenNewFileInZip3( p->zip->getZipFile(),
p->zip->getFileNameCodec()->fromUnicode( info.name ).constData(), &info_z,
info.extraLocal.constData(), info.extraLocal.length(),
info.extraGlobal.constData(), info.extraGlobal.length(),
p->zip->getCommentCodec()->fromUnicode( info.comment ).constData(),
method, level, ( int )raw,
windowBits, memLevel, strategy,
password, ( uLong )crc ) );
if ( p->zipError == UNZ_OK )
{
p->writePos = 0;
setOpenMode( mode );
p->raw = raw;
if ( raw )
{
p->crc = crc;
p->uncompressedSize = info.uncompressedSize;
}
return true;
}
else
return false;
}
qWarning( "QuaZipFile::open(): open mode %d not supported by this function", ( int )mode );
return false;
}
bool QuaZipFile::isSequential()const
{
return true;
}
qint64 QuaZipFile::pos()const
{
if ( p->zip == NULL )
{
qWarning( "QuaZipFile::pos(): call setZipName() or setZip() first" );
return -1;
}
if ( !isOpen() )
{
qWarning( "QuaZipFile::pos(): file is not open" );
return -1;
}
if ( openMode()&ReadOnly )
// QIODevice::pos() is broken for sequential devices,
// but thankfully bytesAvailable() returns the number of
// bytes buffered, so we know how far ahead we are.
return unztell( p->zip->getUnzFile() ) - QIODevice::bytesAvailable();
else
return p->writePos;
}
bool QuaZipFile::atEnd()const
{
if ( p->zip == NULL )
{
qWarning( "QuaZipFile::atEnd(): call setZipName() or setZip() first" );
return false;
}
if ( !isOpen() )
{
qWarning( "QuaZipFile::atEnd(): file is not open" );
return false;
}
if ( openMode()&ReadOnly )
// the same problem as with pos()
return QIODevice::bytesAvailable() == 0
&& unzeof( p->zip->getUnzFile() ) == 1;
else
return true;
}
qint64 QuaZipFile::size()const
{
if ( !isOpen() )
{
qWarning( "QuaZipFile::atEnd(): file is not open" );
return -1;
}
if ( openMode()&ReadOnly )
return p->raw ? csize() : usize();
else
return p->writePos;
}
qint64 QuaZipFile::csize()const
{
unz_file_info info_z;
p->setZipError( UNZ_OK );
if ( p->zip == NULL || p->zip->getMode() != QuaZip::mdUnzip ) return -1;
p->setZipError( unzGetCurrentFileInfo( p->zip->getUnzFile(), &info_z, NULL, 0, NULL, 0, NULL, 0 ) );
if ( p->zipError != UNZ_OK )
return -1;
return info_z.compressed_size;
}
qint64 QuaZipFile::usize()const
{
unz_file_info info_z;
p->setZipError( UNZ_OK );
if ( p->zip == NULL || p->zip->getMode() != QuaZip::mdUnzip ) return -1;
p->setZipError( unzGetCurrentFileInfo( p->zip->getUnzFile(), &info_z, NULL, 0, NULL, 0, NULL, 0 ) );
if ( p->zipError != UNZ_OK )
return -1;
return info_z.uncompressed_size;
}
bool QuaZipFile::getFileInfo( QuaZipFileInfo *info )
{
if ( p->zip == NULL || p->zip->getMode() != QuaZip::mdUnzip ) return false;
p->zip->getCurrentFileInfo( info );
p->setZipError( p->zip->getZipError() );
return p->zipError == UNZ_OK;
}
void QuaZipFile::close()
{
p->resetZipError();
if ( p->zip == NULL || !p->zip->isOpen() ) return;
if ( !isOpen() )
{
qWarning( "QuaZipFile::close(): file isn't open" );
return;
}
if ( openMode()&ReadOnly )
p->setZipError( unzCloseCurrentFile( p->zip->getUnzFile() ) );
else if ( openMode()&WriteOnly )
if ( isRaw() ) p->setZipError( zipCloseFileInZipRaw( p->zip->getZipFile(), p->uncompressedSize, p->crc ) );
else p->setZipError( zipCloseFileInZip( p->zip->getZipFile() ) );
else
{
qWarning( "Wrong open mode: %d", ( int )openMode() );
return;
}
if ( p->zipError == UNZ_OK ) setOpenMode( QIODevice::NotOpen );
else return;
if ( p->internal )
{
p->zip->close();
p->setZipError( p->zip->getZipError() );
}
}
qint64 QuaZipFile::readData( char *data, qint64 maxSize )
{
p->setZipError( UNZ_OK );
qint64 bytesRead = unzReadCurrentFile( p->zip->getUnzFile(), data, ( unsigned )maxSize );
if ( bytesRead < 0 ) p->setZipError(( int )bytesRead );
return bytesRead;
}
qint64 QuaZipFile::writeData( const char* data, qint64 maxSize )
{
p->setZipError( ZIP_OK );
p->setZipError( zipWriteInFileInZip( p->zip->getZipFile(), data, ( uint )maxSize ) );
if ( p->zipError != ZIP_OK ) return -1;
else
{
p->writePos += maxSize;
return maxSize;
}
}
QString QuaZipFile::getFileName() const
{
return p->fileName;
}
QuaZip::CaseSensitivity QuaZipFile::getCaseSensitivity() const
{
return p->caseSensitivity;
}
bool QuaZipFile::isRaw() const
{
return p->raw;
}
int QuaZipFile::getZipError() const
{
return p->zipError;
}
qint64 QuaZipFile::bytesAvailable() const
{
return size() - pos();
}

View File

@ -1,443 +0,0 @@
#ifndef QUA_ZIPFILE_H
#define QUA_ZIPFILE_H
/*
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
**/
#include <QIODevice>
#include "quazip_global.h"
#include "quazip.h"
#include "quazipnewinfo.h"
class QuaZipFilePrivate;
/// A file inside ZIP archive.
/** \class QuaZipFile quazipfile.h <quazip/quazipfile.h>
* This is the most interesting class. Not only it provides C++
* interface to the ZIP/UNZIP package, but also integrates it with Qt by
* subclassing QIODevice. This makes possible to access files inside ZIP
* archive using QTextStream or QDataStream, for example. Actually, this
* is the main purpose of the whole QuaZIP library.
*
* You can either use existing QuaZip instance to create instance of
* this class or pass ZIP archive file name to this class, in which case
* it will create internal QuaZip object. See constructors' descriptions
* for details. Writing is only possible with the existing instance.
*
* Note that due to the underlying library's limitation it is not
* possible to use multiple QuaZipFile instances to open several files
* in the same archive at the same time. If you need to write to
* multiple files in parallel, then you should write to temporary files
* first, then pack them all at once when you have finished writing. If
* you need to read multiple files inside the same archive in parallel,
* you should extract them all into a temporary directory first.
*
* \section quazipfile-sequential Sequential or random-access?
*
* At the first thought, QuaZipFile has fixed size, the start and the
* end and should be therefore considered random-access device. But
* there is one major obstacle to making it random-access: ZIP/UNZIP API
* does not support seek() operation and the only way to implement it is
* through reopening the file and re-reading to the required position,
* but this is prohibitively slow.
*
* Therefore, QuaZipFile is considered to be a sequential device. This
* has advantage of availability of the ungetChar() operation (QIODevice
* does not implement it properly for non-sequential devices unless they
* support seek()). Disadvantage is a somewhat strange behaviour of the
* size() and pos() functions. This should be kept in mind while using
* this class.
*
**/
class QUAZIP_EXPORT QuaZipFile: public QIODevice
{
friend class QuaZipFilePrivate;
Q_OBJECT
private:
QuaZipFilePrivate *p;
// these are not supported nor implemented
QuaZipFile( const QuaZipFile& that );
QuaZipFile& operator=( const QuaZipFile& that );
protected:
/// Implementation of the QIODevice::readData().
qint64 readData( char *data, qint64 maxSize );
/// Implementation of the QIODevice::writeData().
qint64 writeData( const char *data, qint64 maxSize );
public:
/// Constructs a QuaZipFile instance.
/** You should use setZipName() and setFileName() or setZip() before
* trying to call open() on the constructed object.
**/
QuaZipFile();
/// Constructs a QuaZipFile instance.
/** \a parent argument specifies this object's parent object.
*
* You should use setZipName() and setFileName() or setZip() before
* trying to call open() on the constructed object.
**/
QuaZipFile( QObject *parent );
/// Constructs a QuaZipFile instance.
/** \a parent argument specifies this object's parent object and \a
* zipName specifies ZIP archive file name.
*
* You should use setFileName() before trying to call open() on the
* constructed object.
*
* QuaZipFile constructed by this constructor can be used for read
* only access. Use QuaZipFile(QuaZip*,QObject*) for writing.
**/
QuaZipFile( const QString& zipName, QObject *parent = NULL );
/// Constructs a QuaZipFile instance.
/** \a parent argument specifies this object's parent object, \a
* zipName specifies ZIP archive file name and \a fileName and \a cs
* specify a name of the file to open inside archive.
*
* QuaZipFile constructed by this constructor can be used for read
* only access. Use QuaZipFile(QuaZip*,QObject*) for writing.
*
* \sa QuaZip::setCurrentFile()
**/
QuaZipFile( const QString& zipName, const QString& fileName,
QuaZip::CaseSensitivity cs = QuaZip::csDefault, QObject *parent = NULL );
/// Constructs a QuaZipFile instance.
/** \a parent argument specifies this object's parent object.
*
* \a zip is the pointer to the existing QuaZip object. This
* QuaZipFile object then can be used to read current file in the
* \a zip or to write to the file inside it.
*
* \warning Using this constructor for reading current file can be
* tricky. Let's take the following example:
* \code
* QuaZip zip("archive.zip");
* zip.open(QuaZip::mdUnzip);
* zip.setCurrentFile("file-in-archive");
* QuaZipFile file(&zip);
* file.open(QIODevice::ReadOnly);
* // ok, now we can read from the file
* file.read(somewhere, some);
* zip.setCurrentFile("another-file-in-archive"); // oops...
* QuaZipFile anotherFile(&zip);
* anotherFile.open(QIODevice::ReadOnly);
* anotherFile.read(somewhere, some); // this is still ok...
* file.read(somewhere, some); // and this is NOT
* \endcode
* So, what exactly happens here? When we change current file in the
* \c zip archive, \c file that references it becomes invalid
* (actually, as far as I understand ZIP/UNZIP sources, it becomes
* closed, but QuaZipFile has no means to detect it).
*
* Summary: do not close \c zip object or change its current file as
* long as QuaZipFile is open. Even better - use another constructors
* which create internal QuaZip instances, one per object, and
* therefore do not cause unnecessary trouble. This constructor may
* be useful, though, if you already have a QuaZip instance and do
* not want to access several files at once. Good example:
* \code
* QuaZip zip("archive.zip");
* zip.open(QuaZip::mdUnzip);
* // first, we need some information about archive itself
* QByteArray comment=zip.getComment();
* // and now we are going to access files inside it
* QuaZipFile file(&zip);
* for(bool more=zip.goToFirstFile(); more; more=zip.goToNextFile()) {
* file.open(QIODevice::ReadOnly);
* // do something cool with file here
* file.close(); // do not forget to close!
* }
* zip.close();
* \endcode
**/
QuaZipFile( QuaZip *zip, QObject *parent = NULL );
/// Destroys a QuaZipFile instance.
/** Closes file if open, destructs internal QuaZip object (if it
* exists and \em is internal, of course).
**/
virtual ~QuaZipFile();
/// Returns the ZIP archive file name.
/** If this object was created by passing QuaZip pointer to the
* constructor, this function will return that QuaZip's file name
* (or null string if that object does not have file name yet).
*
* Otherwise, returns associated ZIP archive file name or null
* string if there are no name set yet.
*
* \sa setZipName() getFileName()
**/
QString getZipName()const;
/// Returns a pointer to the associated QuaZip object.
/** Returns \c NULL if there is no associated QuaZip or it is
* internal (so you will not mess with it).
**/
QuaZip* getZip()const;
/// Returns file name.
/** This function returns file name you passed to this object either
* by using
* QuaZipFile(const QString&,const QString&,QuaZip::CaseSensitivity,QObject*)
* or by calling setFileName(). Real name of the file may differ in
* case if you used case-insensitivity.
*
* Returns null string if there is no file name set yet. This is the
* case when this QuaZipFile operates on the existing QuaZip object
* (constructor QuaZipFile(QuaZip*,QObject*) or setZip() was used).
*
* \sa getActualFileName
**/
QString getFileName() const;
/// Returns case sensitivity of the file name.
/** This function returns case sensitivity argument you passed to
* this object either by using
* QuaZipFile(const QString&,const QString&,QuaZip::CaseSensitivity,QObject*)
* or by calling setFileName().
*
* Returns unpredictable value if getFileName() returns null string
* (this is the case when you did not used setFileName() or
* constructor above).
*
* \sa getFileName
**/
QuaZip::CaseSensitivity getCaseSensitivity() const;
/// Returns the actual file name in the archive.
/** This is \em not a ZIP archive file name, but a name of file inside
* archive. It is not necessary the same name that you have passed
* to the
* QuaZipFile(const QString&,const QString&,QuaZip::CaseSensitivity,QObject*),
* setFileName() or QuaZip::setCurrentFile() - this is the real file
* name inside archive, so it may differ in case if the file name
* search was case-insensitive.
*
* Equivalent to calling getCurrentFileName() on the associated
* QuaZip object. Returns null string if there is no associated
* QuaZip object or if it does not have a current file yet. And this
* is the case if you called setFileName() but did not open the
* file yet. So this is perfectly fine:
* \code
* QuaZipFile file("somezip.zip");
* file.setFileName("somefile");
* QString name=file.getName(); // name=="somefile"
* QString actual=file.getActualFileName(); // actual is null string
* file.open(QIODevice::ReadOnly);
* QString actual=file.getActualFileName(); // actual can be "SoMeFiLe" on Windows
* \endcode
*
* \sa getZipName(), getFileName(), QuaZip::CaseSensitivity
**/
QString getActualFileName()const;
/// Sets the ZIP archive file name.
/** Automatically creates internal QuaZip object and destroys
* previously created internal QuaZip object, if any.
*
* Will do nothing if this file is already open. You must close() it
* first.
**/
void setZipName( const QString& zipName );
/// Returns \c true if the file was opened in raw mode.
/** If the file is not open, the returned value is undefined.
*
* \sa open(OpenMode,int*,int*,bool,const char*)
**/
bool isRaw() const;
/// Binds to the existing QuaZip instance.
/** This function destroys internal QuaZip object, if any, and makes
* this QuaZipFile to use current file in the \a zip object for any
* further operations. See QuaZipFile(QuaZip*,QObject*) for the
* possible pitfalls.
*
* Will do nothing if the file is currently open. You must close()
* it first.
**/
void setZip( QuaZip *zip );
/// Sets the file name.
/** Will do nothing if at least one of the following conditions is
* met:
* - ZIP name has not been set yet (getZipName() returns null
* string).
* - This QuaZipFile is associated with external QuaZip. In this
* case you should call that QuaZip's setCurrentFile() function
* instead!
* - File is already open so setting the name is meaningless.
*
* \sa QuaZip::setCurrentFile
**/
void setFileName( const QString& fileName, QuaZip::CaseSensitivity cs = QuaZip::csDefault );
/// Opens a file for reading.
/** Returns \c true on success, \c false otherwise.
* Call getZipError() to get error code.
*
* \note Since ZIP/UNZIP API provides buffered reading only,
* QuaZipFile does not support unbuffered reading. So do not pass
* QIODevice::Unbuffered flag in \a mode, or open will fail.
**/
virtual bool open( OpenMode mode );
/// Opens a file for reading.
/** \overload
* Argument \a password specifies a password to decrypt the file. If
* it is NULL then this function behaves just like open(OpenMode).
**/
inline bool open( OpenMode mode, const char *password )
{return open( mode, NULL, NULL, false, password );}
/// Opens a file for reading.
/** \overload
* Argument \a password specifies a password to decrypt the file.
*
* An integers pointed by \a method and \a level will receive codes
* of the compression method and level used. See unzip.h.
*
* If raw is \c true then no decompression is performed.
*
* \a method should not be \c NULL. \a level can be \c NULL if you
* don't want to know the compression level.
**/
bool open( OpenMode mode, int *method, int *level, bool raw, const char *password = NULL );
/// Opens a file for writing.
/** \a info argument specifies information about file. It should at
* least specify a correct file name. Also, it is a good idea to
* specify correct timestamp (by default, current time will be
* used). See QuaZipNewInfo.
*
* The \a password argument specifies the password for crypting. Pass NULL
* if you don't need any crypting. The \a crc argument was supposed
* to be used for crypting too, but then it turned out that it's
* false information, so you need to set it to 0 unless you want to
* use the raw mode (see below).
*
* Arguments \a method and \a level specify compression method and
* level. The only method supported is Z_DEFLATED, but you may also
* specify 0 for no compression. If all of the files in the archive
* use both method 0 and either level 0 is explicitly specified or
* data descriptor writing is disabled with
* QuaZip::setDataDescriptorWritingEnabled(), then the
* resulting archive is supposed to be compatible with the 1.0 ZIP
* format version, should you need that. Except for this, \a level
* has no other effects with method 0.
*
* If \a raw is \c true, no compression is performed. In this case,
* \a crc and uncompressedSize field of the \a info are required.
*
* Arguments \a windowBits, \a memLevel, \a strategy provide zlib
* algorithms tuning. See deflateInit2() in zlib.
**/
bool open( OpenMode mode, const QuaZipNewInfo& info,
const char *password = NULL, quint32 crc = 0,
int method = Z_DEFLATED, int level = Z_DEFAULT_COMPRESSION, bool raw = false,
int windowBits = -MAX_WBITS, int memLevel = DEF_MEM_LEVEL, int strategy = Z_DEFAULT_STRATEGY );
/// Returns \c true, but \ref quazipfile-sequential "beware"!
virtual bool isSequential()const;
/// Returns current position in the file.
/** Implementation of the QIODevice::pos(). When reading, this
* function is a wrapper to the ZIP/UNZIP unztell(), therefore it is
* unable to keep track of the ungetChar() calls (which is
* non-virtual and therefore is dangerous to reimplement). So if you
* are using ungetChar() feature of the QIODevice, this function
* reports incorrect value until you get back characters which you
* ungot.
*
* When writing, pos() returns number of bytes already written
* (uncompressed unless you use raw mode).
*
* \note Although
* \ref quazipfile-sequential "QuaZipFile is a sequential device"
* and therefore pos() should always return zero, it does not,
* because it would be misguiding. Keep this in mind.
*
* This function returns -1 if the file or archive is not open.
*
* Error code returned by getZipError() is not affected by this
* function call.
**/
virtual qint64 pos()const;
/// Returns \c true if the end of file was reached.
/** This function returns \c false in the case of error. This means
* that you called this function on either not open file, or a file
* in the not open archive or even on a QuaZipFile instance that
* does not even have QuaZip instance associated. Do not do that
* because there is no means to determine whether \c false is
* returned because of error or because end of file was reached.
* Well, on the other side you may interpret \c false return value
* as "there is no file open to check for end of file and there is
* no end of file therefore".
*
* When writing, this function always returns \c true (because you
* are always writing to the end of file).
*
* Error code returned by getZipError() is not affected by this
* function call.
**/
virtual bool atEnd()const;
/// Returns file size.
/** This function returns csize() if the file is open for reading in
* raw mode, usize() if it is open for reading in normal mode and
* pos() if it is open for writing.
*
* Returns -1 on error, call getZipError() to get error code.
*
* \note This function returns file size despite that
* \ref quazipfile-sequential "QuaZipFile is considered to be sequential device",
* for which size() should return bytesAvailable() instead. But its
* name would be very misguiding otherwise, so just keep in mind
* this inconsistence.
**/
virtual qint64 size()const;
/// Returns compressed file size.
/** Equivalent to calling getFileInfo() and then getting
* compressedSize field, but more convenient and faster.
*
* File must be open for reading before calling this function.
*
* Returns -1 on error, call getZipError() to get error code.
**/
qint64 csize()const;
/// Returns uncompressed file size.
/** Equivalent to calling getFileInfo() and then getting
* uncompressedSize field, but more convenient and faster. See
* getFileInfo() for a warning.
*
* File must be open for reading before calling this function.
*
* Returns -1 on error, call getZipError() to get error code.
**/
qint64 usize()const;
/// Gets information about current file.
/** This function does the same thing as calling
* QuaZip::getCurrentFileInfo() on the associated QuaZip object,
* but you can not call getCurrentFileInfo() if the associated
* QuaZip is internal (because you do not have access to it), while
* you still can call this function in that case.
*
* File must be open for reading before calling this function.
*
* Returns \c false in the case of an error.
**/
bool getFileInfo( QuaZipFileInfo *info );
/// Closes the file.
/** Call getZipError() to determine if the close was successful.
**/
virtual void close();
/// Returns the error code returned by the last ZIP/UNZIP API call.
int getZipError() const;
/// Returns the number of bytes available for reading.
virtual qint64 bytesAvailable() const;
};
#endif

View File

@ -1,67 +0,0 @@
#ifndef QUA_ZIPFILEINFO_H
#define QUA_ZIPFILEINFO_H
/*
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
**/
#include <QByteArray>
#include <QDateTime>
#include "quazip_global.h"
/// Information about a file inside archive.
/** Call QuaZip::getCurrentFileInfo() or QuaZipFile::getFileInfo() to
* fill this structure. */
struct QUAZIP_EXPORT QuaZipFileInfo
{
/// File name.
QString name;
/// Version created by.
quint16 versionCreated;
/// Version needed to extract.
quint16 versionNeeded;
/// General purpose flags.
quint16 flags;
/// Compression method.
quint16 method;
/// Last modification date and time.
QDateTime dateTime;
/// CRC.
quint32 crc;
/// Compressed file size.
quint32 compressedSize;
/// Uncompressed file size.
quint32 uncompressedSize;
/// Disk number start.
quint16 diskNumberStart;
/// Internal file attributes.
quint16 internalAttr;
/// External file attributes.
quint32 externalAttr;
/// Comment.
QString comment;
/// Extra field.
QByteArray extra;
};
#endif

View File

@ -1,51 +0,0 @@
/*
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
*/
#include <QFileInfo>
#include "quazipnewinfo.h"
QuaZipNewInfo::QuaZipNewInfo( const QString& name ):
name( name ), dateTime( QDateTime::currentDateTime() ), internalAttr( 0 ), externalAttr( 0 )
{
}
QuaZipNewInfo::QuaZipNewInfo( const QString& name, const QString& file ):
name( name ), internalAttr( 0 ), externalAttr( 0 )
{
QFileInfo info( file );
QDateTime lm = info.lastModified();
if ( !info.exists() )
dateTime = QDateTime::currentDateTime();
else
dateTime = lm;
}
void QuaZipNewInfo::setFileDateTime( const QString& file )
{
QFileInfo info( file );
QDateTime lm = info.lastModified();
if ( info.exists() )
dateTime = lm;
}

View File

@ -1,103 +0,0 @@
#ifndef QUA_ZIPNEWINFO_H
#define QUA_ZIPNEWINFO_H
/*
Copyright (C) 2005-2011 Sergey A. Tachenov
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
See COPYING file for the full LGPL text.
Original ZIP package is copyrighted by Gilles Vollant, see
quazip/(un)zip.h files for details, basically it's zlib license.
**/
#include <QDateTime>
#include <QString>
#include "quazip_global.h"
/// Information about a file to be created.
/** This structure holds information about a file to be created inside
* ZIP archive. At least name should be set to something correct before
* passing this structure to
* QuaZipFile::open(OpenMode,const QuaZipNewInfo&,int,int,bool).
**/
struct QUAZIP_EXPORT QuaZipNewInfo
{
/// File name.
/** This field holds file name inside archive, including path relative
* to archive root.
**/
QString name;
/// File timestamp.
/** This is the last file modification date and time. Will be stored
* in the archive central directory. It is a good practice to set it
* to the source file timestamp instead of archive creating time. Use
* setFileDateTime() or QuaZipNewInfo(const QString&, const QString&).
**/
QDateTime dateTime;
/// File internal attributes.
quint16 internalAttr;
/// File external attributes.
quint32 externalAttr;
/// File comment.
/** Will be encoded using QuaZip::getCommentCodec().
**/
QString comment;
/// File local extra field.
QByteArray extraLocal;
/// File global extra field.
QByteArray extraGlobal;
/// Uncompressed file size.
/** This is only needed if you are using raw file zipping mode, i. e.
* adding precompressed file in the zip archive.
**/
ulong uncompressedSize;
/// Constructs QuaZipNewInfo instance.
/** Initializes name with \a name, dateTime with current date and
* time. Attributes are initialized with zeros, comment and extra
* field with null values.
**/
QuaZipNewInfo( const QString& name );
/// Constructs QuaZipNewInfo instance.
/** Initializes name with \a name and dateTime with timestamp of the
* file named \a file. If the \a file does not exists or its timestamp
* is inaccessible (e. g. you do not have read permission for the
* directory file in), uses current date and time. Attributes are
* initialized with zeros, comment and extra field with null values.
*
* \sa setFileDateTime()
**/
QuaZipNewInfo( const QString& name, const QString& file );
/// Sets the file timestamp from the existing file.
/** Use this function to set the file timestamp from the existing
* file. Use it like this:
* \code
* QuaZipFile zipFile(&zip);
* QFile file("file-to-add");
* file.open(QIODevice::ReadOnly);
* QuaZipNewInfo info("file-name-in-archive");
* info.setFileDateTime("file-to-add"); // take the timestamp from file
* zipFile.open(QIODevice::WriteOnly, info);
* \endcode
*
* This function does not change dateTime if some error occured (e. g.
* file is inaccessible).
**/
void setFileDateTime( const QString& file );
};
#endif

File diff suppressed because it is too large Load Diff

View File

@ -1,357 +0,0 @@
/* unzip.h -- IO for uncompress .zip files using zlib
Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
WinZip, InfoZip tools and compatible.
Multi volume ZipFile (span) are not supported.
Encryption compatible with pkzip 2.04g only supported
Old compressions used by old PKZip 1.x are not supported
I WAIT FEEDBACK at mail info@winimage.com
Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
Condition of use and distribution are the same than zlib :
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Modified by Sergey A. Tachenov to integrate with Qt.
*/
/* for more info about .ZIP format, see
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
http://www.info-zip.org/pub/infozip/doc/
PkWare has also a specification at :
ftp://ftp.pkware.com/probdesc.zip
*/
#ifndef _unz_H
#define _unz_H
#ifdef __cplusplus
extern "C"
{
#endif
#ifndef _ZLIB_H
#include "zlib.h"
#endif
#ifndef _ZLIBIOAPI_H
#include "ioapi.h"
#endif
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */
typedef struct TagunzFile__ { int unused; } unzFile__;
typedef unzFile__ *unzFile;
#else
typedef voidp unzFile;
#endif
#define UNZ_OK (0)
#define UNZ_END_OF_LIST_OF_FILE (-100)
#define UNZ_ERRNO (Z_ERRNO)
#define UNZ_EOF (0)
#define UNZ_PARAMERROR (-102)
#define UNZ_BADZIPFILE (-103)
#define UNZ_INTERNALERROR (-104)
#define UNZ_CRCERROR (-105)
/* tm_unz contain date/time info */
typedef struct tm_unz_s
{
uInt tm_sec; /* seconds after the minute - [0,59] */
uInt tm_min; /* minutes after the hour - [0,59] */
uInt tm_hour; /* hours since midnight - [0,23] */
uInt tm_mday; /* day of the month - [1,31] */
uInt tm_mon; /* months since January - [0,11] */
uInt tm_year; /* years - [1980..2044] */
} tm_unz;
/* unz_global_info structure contain global data about the ZIPfile
These data comes from the end of central dir */
typedef struct unz_global_info_s
{
uLong number_entry; /* total number of entries in
the central dir on this disk */
uLong size_comment; /* size of the global comment of the zipfile */
} unz_global_info;
/* unz_file_info contain information about a file in the zipfile */
typedef struct unz_file_info_s
{
uLong version; /* version made by 2 bytes */
uLong version_needed; /* version needed to extract 2 bytes */
uLong flag; /* general purpose bit flag 2 bytes */
uLong compression_method; /* compression method 2 bytes */
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
uLong crc; /* crc-32 4 bytes */
uLong compressed_size; /* compressed size 4 bytes */
uLong uncompressed_size; /* uncompressed size 4 bytes */
uLong size_filename; /* filename length 2 bytes */
uLong size_file_extra; /* extra field length 2 bytes */
uLong size_file_comment; /* file comment length 2 bytes */
uLong disk_num_start; /* disk number start 2 bytes */
uLong internal_fa; /* internal file attributes 2 bytes */
uLong external_fa; /* external file attributes 4 bytes */
tm_unz tmu_date;
} unz_file_info;
extern int ZEXPORT unzStringFileNameCompare( const char* fileName1,
const char* fileName2,
int iCaseSensitivity );
/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
(like 1 on Unix, 2 on Windows)
*/
extern unzFile ZEXPORT unzOpen( voidpf file );
/*
Open a Zip file. path contain whatever zopen_file from the IO API
accepts. For Qt implementation it is a pointer to QIODevice, for
fopen() implementation it's a file name.
If the zipfile cannot be opened (file don't exist or in not valid), the
return value is NULL.
Else, the return value is a unzFile Handle, usable with other function
of this unzip package.
*/
extern unzFile ZEXPORT unzOpen2( voidpf file,
zlib_filefunc_def* pzlib_filefunc_def );
/*
Open a Zip file, like unzOpen, but provide a set of file low level API
for read/write the zip file (see ioapi.h)
*/
extern int ZEXPORT unzClose( unzFile file );
/*
Close a ZipFile opened with unzipOpen.
If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
return UNZ_OK if there is no problem. */
extern int ZEXPORT unzGetGlobalInfo( unzFile file,
unz_global_info *pglobal_info );
/*
Write info about the ZipFile in the *pglobal_info structure.
No preparation of the structure is needed
return UNZ_OK if there is no problem. */
extern int ZEXPORT unzGetGlobalComment( unzFile file,
char *szComment,
uLong uSizeBuf );
/*
Get the global comment string of the ZipFile, in the szComment buffer.
uSizeBuf is the size of the szComment buffer.
return the number of byte copied or an error code <0
*/
/***************************************************************************/
/* Unzip package allow you browse the directory of the zipfile */
extern int ZEXPORT unzGoToFirstFile( unzFile file );
/*
Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem
*/
extern int ZEXPORT unzGoToNextFile( unzFile file );
/*
Set the current file of the zipfile to the next file.
return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/
extern int ZEXPORT unzLocateFile( unzFile file,
const char *szFileName,
int iCaseSensitivity );
/*
Try locate the file szFileName in the zipfile.
For the iCaseSensitivity signification, see unzStringFileNameCompare
return value :
UNZ_OK if the file is found. It becomes the current file.
UNZ_END_OF_LIST_OF_FILE if the file is not found
*/
/* ****************************************** */
/* Ryan supplied functions */
/* unz_file_info contain information about a file in the zipfile */
typedef struct unz_file_pos_s
{
uLong pos_in_zip_directory; /* offset in zip file directory */
uLong num_of_file; /* # of file */
} unz_file_pos;
extern int ZEXPORT unzGetFilePos(
unzFile file,
unz_file_pos* file_pos );
extern int ZEXPORT unzGoToFilePos(
unzFile file,
unz_file_pos* file_pos );
/* ****************************************** */
extern int ZEXPORT unzGetCurrentFileInfo( unzFile file,
unz_file_info *pfile_info,
char *szFileName,
uLong fileNameBufferSize,
void *extraField,
uLong extraFieldBufferSize,
char *szComment,
uLong commentBufferSize );
/*
Get Info about the current file
if pfile_info!=NULL, the *pfile_info structure will contain somes info about
the current file
if szFileName!=NULL, the filemane string will be copied in szFileName
(fileNameBufferSize is the size of the buffer)
if extraField!=NULL, the extra field information will be copied in extraField
(extraFieldBufferSize is the size of the buffer).
This is the Central-header version of the extra field
if szComment!=NULL, the comment string of the file will be copied in szComment
(commentBufferSize is the size of the buffer)
*/
/***************************************************************************/
/* for reading the content of the current zipfile, you can open it, read data
from it, and close it (you can close it before reading all the file)
*/
extern int ZEXPORT unzOpenCurrentFile( unzFile file );
/*
Open for reading data the current file in the zipfile.
If there is no error, the return value is UNZ_OK.
*/
extern int ZEXPORT unzOpenCurrentFilePassword( unzFile file,
const char* password );
/*
Open for reading data the current file in the zipfile.
password is a crypting password
If there is no error, the return value is UNZ_OK.
*/
extern int ZEXPORT unzOpenCurrentFile2( unzFile file,
int* method,
int* level,
int raw );
/*
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
if raw==1
*method will receive method of compression, *level will receive level of
compression
note : you can set level parameter as NULL (if you did not want known level,
but you CANNOT set method parameter as NULL
*/
extern int ZEXPORT unzOpenCurrentFile3( unzFile file,
int* method,
int* level,
int raw,
const char* password );
/*
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
if raw==1
*method will receive method of compression, *level will receive level of
compression
note : you can set level parameter as NULL (if you did not want known level,
but you CANNOT set method parameter as NULL
*/
extern int ZEXPORT unzCloseCurrentFile( unzFile file );
/*
Close the file in zip opened with unzOpenCurrentFile
Return UNZ_CRCERROR if all the file was read but the CRC is not good
*/
extern int ZEXPORT unzReadCurrentFile( unzFile file,
voidp buf,
unsigned len );
/*
Read bytes from the current file (opened by unzOpenCurrentFile)
buf contain buffer where data must be copied
len the size of buf.
return the number of byte copied if somes bytes are copied
return 0 if the end of file was reached
return <0 with error code if there is an error
(UNZ_ERRNO for IO error, or zLib error for uncompress error)
*/
extern z_off_t ZEXPORT unztell( unzFile file );
/*
Give the current position in uncompressed data
*/
extern int ZEXPORT unzeof( unzFile file );
/*
return 1 if the end of file was reached, 0 elsewhere
*/
extern int ZEXPORT unzGetLocalExtrafield( unzFile file,
voidp buf,
unsigned len );
/*
Read extra field from the current file (opened by unzOpenCurrentFile)
This is the local-header version of the extra field (sometimes, there is
more info in the local-header version than in the central-header)
if buf==NULL, it return the size of the local extra field
if buf!=NULL, len is the size of the buffer, the extra header is copied in
buf.
the return value is the number of bytes copied in buf, or (if <0)
the error code
*/
/***************************************************************************/
/* Get the current file offset */
extern uLong ZEXPORT unzGetOffset( unzFile file );
/* Set the current file offset */
extern int ZEXPORT unzSetOffset( unzFile file, uLong pos );
#ifdef __cplusplus
}
#endif
#endif /* _unz_H */

File diff suppressed because it is too large Load Diff

View File

@ -1,246 +0,0 @@
/* zip.h -- IO for compress .zip files using zlib
Version 1.01e, February 12th, 2005
Copyright (C) 1998-2005 Gilles Vollant
This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
WinZip, InfoZip tools and compatible.
Multi volume ZipFile (span) are not supported.
Encryption compatible with pkzip 2.04g only supported
Old compressions used by old PKZip 1.x are not supported
For uncompress .zip file, look at unzip.h
I WAIT FEEDBACK at mail info@winimage.com
Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
Condition of use and distribution are the same than zlib :
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Modified by Sergey A. Tachenov to integrate with Qt.
*/
/* for more info about .ZIP format, see
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
http://www.info-zip.org/pub/infozip/doc/
PkWare has also a specification at :
ftp://ftp.pkware.com/probdesc.zip
*/
#ifndef _zip_H
#define _zip_H
#ifdef __cplusplus
extern "C"
{
#endif
#ifndef _ZLIB_H
#include "zlib.h"
#endif
#ifndef _ZLIBIOAPI_H
#include "ioapi.h"
#endif
#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */
typedef struct TagzipFile__ { int unused; } zipFile__;
typedef zipFile__ *zipFile;
#else
typedef voidp zipFile;
#endif
#define ZIP_OK (0)
#define ZIP_EOF (0)
#define ZIP_ERRNO (Z_ERRNO)
#define ZIP_PARAMERROR (-102)
#define ZIP_BADZIPFILE (-103)
#define ZIP_INTERNALERROR (-104)
#define ZIP_WRITE_DATA_DESCRIPTOR 0x8u
#ifndef DEF_MEM_LEVEL
# if MAX_MEM_LEVEL >= 8
# define DEF_MEM_LEVEL 8
# else
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
# endif
#endif
/* default memLevel */
/* tm_zip contain date/time info */
typedef struct tm_zip_s
{
uInt tm_sec; /* seconds after the minute - [0,59] */
uInt tm_min; /* minutes after the hour - [0,59] */
uInt tm_hour; /* hours since midnight - [0,23] */
uInt tm_mday; /* day of the month - [1,31] */
uInt tm_mon; /* months since January - [0,11] */
uInt tm_year; /* years - [1980..2044] */
} tm_zip;
typedef struct
{
tm_zip tmz_date; /* date in understandable format */
uLong dosDate; /* if dos_date == 0, tmu_date is used */
/* uLong flag; */ /* general purpose bit flag 2 bytes */
uLong internal_fa; /* internal file attributes 2 bytes */
uLong external_fa; /* external file attributes 4 bytes */
} zip_fileinfo;
typedef const char* zipcharpc;
#define APPEND_STATUS_CREATE (0)
#define APPEND_STATUS_CREATEAFTER (1)
#define APPEND_STATUS_ADDINZIP (2)
extern zipFile ZEXPORT zipOpen( voidpf file, int append );
/*
Create a zipfile.
file is whatever the IO API accepts. For Qt IO API it's a pointer to
QIODevice. For fopen() IO API it's a file name (const char*).
if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
will be created at the end of the file.
(useful if the file contain a self extractor code)
if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
add files in existing zip (be sure you don't add file that doesn't exist)
If the zipfile cannot be opened, the return value is NULL.
Else, the return value is a zipFile Handle, usable with other function
of this zip package.
*/
/* Note : there is no delete function into a zipfile.
If you want delete file into a zipfile, you must open a zipfile, and create another
Of couse, you can use RAW reading and writing to copy the file you did not want delte
*/
extern zipFile ZEXPORT zipOpen2( voidpf file,
int append,
zipcharpc* globalcomment,
zlib_filefunc_def* pzlib_filefunc_def );
extern int ZEXPORT zipOpenNewFileInZip( zipFile file,
const char* filename,
const zip_fileinfo* zipfi,
const void* extrafield_local,
uInt size_extrafield_local,
const void* extrafield_global,
uInt size_extrafield_global,
const char* comment,
int method,
int level );
/*
Open a file in the ZIP for writing.
filename : the filename in zip (if NULL, '-' without quote will be used
*zipfi contain supplemental information
if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
contains the extrafield data the the local header
if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
contains the extrafield data the the local header
if comment != NULL, comment contain the comment string
method contain the compression method (0 for store, Z_DEFLATED for deflate)
level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
*/
extern int ZEXPORT zipOpenNewFileInZip2( zipFile file,
const char* filename,
const zip_fileinfo* zipfi,
const void* extrafield_local,
uInt size_extrafield_local,
const void* extrafield_global,
uInt size_extrafield_global,
const char* comment,
int method,
int level,
int raw );
/*
Same than zipOpenNewFileInZip, except if raw=1, we write raw file
*/
extern int ZEXPORT zipOpenNewFileInZip3( zipFile file,
const char* filename,
const zip_fileinfo* zipfi,
const void* extrafield_local,
uInt size_extrafield_local,
const void* extrafield_global,
uInt size_extrafield_global,
const char* comment,
int method,
int level,
int raw,
int windowBits,
int memLevel,
int strategy,
const char* password,
uLong crcForCtypting );
/*
Same than zipOpenNewFileInZip2, except
windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
password : crypting password (NULL for no crypting)
crcForCtypting : crc of file to compress (needed for crypting)
*/
extern int ZEXPORT zipWriteInFileInZip( zipFile file,
const void* buf,
unsigned len );
/*
Write data in the zipfile
*/
extern int ZEXPORT zipCloseFileInZip( zipFile file );
/*
Close the current file in the zipfile
*/
extern int ZEXPORT zipCloseFileInZipRaw( zipFile file,
uLong uncompressed_size,
uLong crc32 );
/*
Close the current file in the zipfile, for fiel opened with
parameter raw=1 in zipOpenNewFileInZip2
uncompressed_size and crc32 are value for the uncompressed size
*/
extern int ZEXPORT zipClose( zipFile file,
const char* global_comment );
/*
Close the zipfile
*/
/*
Added by Sergey A. Tachenov to tweak zipping behaviour.
*/
extern int ZEXPORT zipSetFlags( zipFile file, unsigned flags );
extern int ZEXPORT zipClearFlags( zipFile file, unsigned flags );
#ifdef __cplusplus
}
#endif
#endif /* _zip_H */

View File

@ -108,7 +108,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
// zip settings + info
QSettings settings;
int scanItemsSetting = settings.value( "/qgis/scanItemsInBrowser", 0 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 2 ).toInt();
bool is_vsizip = ( thePath.startsWith( "/vsizip/" ) ||
thePath.endsWith( ".zip", Qt::CaseInsensitive ) );
bool is_vsigzip = ( thePath.startsWith( "/vsigzip/" ) ||

View File

@ -1843,9 +1843,8 @@ void buildSupportedRasterFileFilterAndExtensions( QString & theFileFiltersString
// VSIFileHandler (see qgsogrprovider.cpp)
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1600
// QSettings settings;
// if ( settings.value( "/qgis/scanZipInBrowser", 1 ).toInt() != 0 )
if ( 1 )
QSettings settings;
if ( settings.value( "/qgis/scanZipInBrowser", 2 ).toInt() != 0 )
{
QString glob = "*.zip";
glob += " *.gz";

View File

@ -231,7 +231,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
// zip settings + info
QSettings settings;
int scanItemsSetting = settings.value( "/qgis/scanItemsInBrowser", 0 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 2 ).toInt();
bool is_vsizip = ( thePath.startsWith( "/vsizip/" ) ||
thePath.endsWith( ".zip", Qt::CaseInsensitive ) );
bool is_vsigzip = ( thePath.startsWith( "/vsigzip/" ) ||

View File

@ -1791,9 +1791,8 @@ QString createFilters( QString type )
// This does not work for some file types, see VSIFileHandler doc.
// Ideally we should also add support for /vsitar/ (requires cpl_vsil_tar.cpp).
#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1600
// QSettings settings;
// if ( settings.value( "/qgis/scanZipInBrowser", 1 ).toInt() != 0 )
if ( 1 )
QSettings settings;
if ( settings.value( "/qgis/scanZipInBrowser", 2 ).toInt() != 0 )
{
myFileFilters += createFileFilter_( QObject::tr( "GDAL/OGR VSIFileHandler" ), "*.zip *.gz" );
myExtensions << "zip" << "gz";

View File

@ -228,9 +228,7 @@ void TestZipLayer::initTestCase()
// max zipSetting value depends on zlib presence
mMaxScanZipSetting = 1;
#ifdef HAVE_ZLIB
mMaxScanZipSetting = 3;
#endif
}
@ -298,11 +296,6 @@ void TestZipLayer::testPassthruRasterGzip()
void TestZipLayer::testZipItemRaster()
{
QSettings settings;
#ifndef HAVE_ZLIB
QSKIP( "This test requires ZLIB", SkipSingle );
#endif
for ( int i = 2 ; i <= mMaxScanZipSetting ; i++ )
{
settings.setValue( "/qgis/scanZipInBrowser", i );
@ -314,11 +307,6 @@ void TestZipLayer::testZipItemRaster()
void TestZipLayer::testZipItemVector()
{
QSettings settings;
#ifndef HAVE_ZLIB
QSKIP( "This test requires ZLIB", SkipSingle );
#endif
for ( int i = 2 ; i <= mMaxScanZipSetting ; i++ )
{
settings.setValue( "/qgis/scanZipInBrowser", i );
@ -329,9 +317,6 @@ void TestZipLayer::testZipItemVector()
void TestZipLayer::testZipItemAll()
{
#ifndef HAVE_ZLIB
QSKIP( "This test requires ZLIB", SkipSingle );
#endif
// test file contains invalid items (tmp1.tif, tmp1.txt and tmp1.xml)
// test for all items inside zip, using zipSetting 3 (Full Scan) which will ignore invalid items
// using zipSetting 2 (Basic Scan) would raise errors, because QgsZipItem would not test for valid items