Commit Graph

40 Commits

Author SHA1 Message Date
Douglas Bumby
4e3625684d cleanup 2015-04-06 17:18:27 -04:00
Douglas Bumby
cc24921107 Copyright year + miscellaneous changes 2015-04-06 17:17:26 -04:00
Douglas Bumby
487093160b Merge pull request #137 from soffes/TheRealKerni-patch-1
The real kerni patch 1
2015-04-06 17:08:51 -04:00
Douglas Bumby
dbc332ce70 #92 2015-04-06 17:08:24 -04:00
Douglas Bumby
938749897d MERGE: Add writeFileAtPath:withFileName: in SSZipArchive.h so that it can be called. 2015-04-06 17:05:47 -04:00
Douglas Bumby
c881c8528f Merge pull request #121 from rileytestut/master
Added option to keep parent directory when compressing directory contents
2015-04-06 16:53:21 -04:00
DimonDeveloper
5492b7bcea Archive empty folder in other folder 2015-04-06 23:39:15 +03:00
Douglas Bumby
4b4cce2666 Merging in some changes 2015-04-06 15:51:07 -04:00
Douglas Bumby
ae50a6d40a fix the merges 2015-04-06 15:13:07 -04:00
Douglas Bumby
a75d901a85 Merge pull request #112 from iosphere/fix-shadowed-variable
Fix warning on shadowed variable when creating zip file
2015-04-06 15:00:27 -04:00
Douglas Bumby
cb037e1010 Merge pull request #113 from iosphere/zipArchiveProgressEvent-type
Report file size as unsigned long long to delegate
2015-04-06 14:59:07 -04:00
Douglas Bumby
801d1198b5 Merge pull request #122 from boherna/master
Adds progress and completion handlers. Support for adding folders and subfolders to ZIP packages.
2015-04-06 14:09:09 -04:00
Douglas Bumby
b37ab60ba0 Merge pull request #131 from soffes/zlandau-cancelunzip
Zlandau cancelunzip
2015-04-06 13:44:27 -04:00
Douglas Bumby
a90b2a9611 Merge fixes 2015-04-06 13:42:48 -04:00
Douglas Bumby
0c9aaee02b Revert "Add support for archives in folders" 2015-04-06 13:35:21 -04:00
Lars Immisch
9426653711 Add support for archives in folders 2015-03-27 10:53:38 +01:00
Riley Testut
33c7884202 Added option to keep parent directory when compressing directory contents 2014-12-21 18:02:19 -06:00
Bohdan Hernandez
553c4be486 Merge remote-tracking branch 'upstream/master'
* upstream/master:
  Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning
  Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning

Conflicts:
	SSZipArchive/minizip/ioapi.c
2014-11-05 20:51:56 +00:00
nicked
55437a8b8e Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning 2014-10-31 11:09:31 +01:00
nicked
d68c99b890 Fixed GCC_WARN_64_TO_32_BIT_CONVERSION warning 2014-10-31 11:08:04 +01:00
Bohdan Hernandez
e1bfb6e8ed Merge remote-tracking branch 'upstream/master'
* upstream/master:
  Change the CalendarUnit for iOS 8.0
2014-10-29 13:22:06 +00:00
Fan Liu
a8f065f2a1 Change the CalendarUnit for iOS 8.0 2014-10-26 03:50:58 +08:00
Bohdan Hernandez
b89dfcf4fd Merge branch 'master' of https://github.com/soffes/ssziparchive
# By Adam Yanalunas (2) and Landon Fuller (1)
# Via Adam Yanalunas
* 'master' of https://github.com/soffes/ssziparchive:
  Updated podspec for v0.3.2
  Relative symlink fixture for new symlink detection in #91
  Replace symlink heuristic with a well-defined test.
2014-09-22 00:45:08 +01:00
Lukas Mollidor
54875c8192 Report file size as unsigned long long to delegate 2014-09-12 19:11:46 +02:00
Lukas Mollidor
df0d5536e8 Fix warning on shadowed variable when creating zip file 2014-09-12 18:44:36 +02:00
Adam Yanalunas
c363747a15 Merge pull request #91 from landonf/master
Fix symlink detection
2014-09-08 11:26:01 -07:00
Bohdan Hernandez
47c50d0482 Adds progress and completion handlers. 2014-07-29 18:54:28 +01:00
Zacharyl Landau
2385ac9241 Add a delegate for cancelling unzips
This adds a zipArchiveShouldUnzipFileAtIndex, which is called before
each call to zipArchiveWillUnzipFileAtIndex, allowing a delegate to
cancel the unzip progress.
2014-07-16 11:28:25 -07:00
Bohdan Hernandez
b91fe135e2 Removes some compile warnings. 2014-05-12 09:52:50 +01:00
Bohdan Hernandez
57b6018ca0 Merge branch 'master' of https://github.com/soffes/ssziparchive
# By Andreas Dangel (2) and others
# Via Erickson Pacioles (1) and Sam Soffes (1)
* 'master' of https://github.com/soffes/ssziparchive:
  Fixed warnings from Xcode Analyzer
  Fix warnings on 64-bit
  Add a unit test for zipArchiveProgressEvent.
  Add a progress event while unzipping. The progress is determined by the compressed file size and zip entries.
2014-04-28 10:46:50 +01:00
Mr. Fahrenheit
1b2ec1a9ec Fixed warnings from Xcode Analyzer 2014-04-06 19:42:33 +08:00
Andreas Dangel
281571d99f Add a progress event while unzipping.
The progress is determined by the compressed file size and zip entries.
2014-03-14 21:22:20 -04:00
Bohdan Hernandez
de0ffe7478 Support for adding folders and subfolders to ZIP packages. 2014-02-09 02:48:44 +00:00
Andreas Linde
e422866c97 Fix clang analyzer warning appearing in line 1534
Removing the clang analyzer silencer in these lines fixed another clang analyzer warning that appeared in line 1534.
In addition these lines do not cause a static analyzer warning in latest Xcode any longer.
Tested with Xcode 5.0.2
2014-01-17 12:47:36 +01:00
Landon Fuller
653caaa9b2 Replace symlink heuristic with a well-defined test.
As per the PKWARE ZIP File Format Specification (6.3.2), this
patch tests the file 'version made by' field for the UNIX (3)
constant, and then interprets the external file attributes accordingly,
assuming an st_mode field in the high 16 bits.
2014-01-16 11:53:45 -05:00
Sam Soffes
d3c40f0e95 Happy New Year 🎉 2014-01-01 11:00:26 -08:00
Christopher Denter
a5de5b6bef Issue #85: Keep relative symbolic links relative.
Before, the library resolved symbolic links that are relative
into absolute paths, using the current working directory of the process
that's doing the unzipping, which to me seems pretty wrong.
This was due to using -[NSURL fileURLWithPath:], which transforms
relative URLs to absolute URLs automatically.

I don't see much of a reason to use NSFileManager here, so I made that
use symlink() directly. Alternatively, one could also use -[NSURL
URLWithString:].

This keeps relative symlinks relative after unzipping.
2013-11-08 19:04:42 +01:00
Sam Soffes
b91252282e Simplify project structure 2013-09-10 00:03:11 -07:00
Sam Soffes
164ae9bfd3 Move minizip up 2013-09-09 09:00:52 -07:00
Sam Soffes
364be2ed4f Restructure project and move to XCTest 2013-09-07 08:33:47 -07:00