Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
Zip
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Jira
Jira
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
YongYue
Zip
Commits
6e161445
Commit
6e161445
authored
Jul 27, 2016
by
Mostafa Berg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+Updated to Swift2.3
+Updated Xcode 8 recommended settings
parent
3b9765a3
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
15 deletions
+25
-15
Zip.xcodeproj/project.pbxproj
Zip.xcodeproj/project.pbxproj
+11
-1
Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme
Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme
+1
-1
Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme
Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme
+1
-1
Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
+1
-1
Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
+1
-1
Zip/QuickZip.swift
Zip/QuickZip.swift
+5
-5
Zip/Zip.swift
Zip/Zip.swift
+1
-1
Zip/ZipUtilities.swift
Zip/ZipUtilities.swift
+4
-4
No files found.
Zip.xcodeproj/project.pbxproj
View file @
6e161445
...
@@ -493,7 +493,7 @@
...
@@ -493,7 +493,7 @@
isa
=
PBXProject
;
isa
=
PBXProject
;
attributes
=
{
attributes
=
{
LastSwiftUpdateCheck
=
0720
;
LastSwiftUpdateCheck
=
0720
;
LastUpgradeCheck
=
0
72
0
;
LastUpgradeCheck
=
0
80
0
;
ORGANIZATIONNAME
=
"Roy Marmelstein"
;
ORGANIZATIONNAME
=
"Roy Marmelstein"
;
TargetAttributes
=
{
TargetAttributes
=
{
343F50FE1C8DAEEC0028C434
=
{
343F50FE1C8DAEEC0028C434
=
{
...
@@ -504,9 +504,11 @@
...
@@ -504,9 +504,11 @@
};
};
347E3A731C1DFFB500A11FD3
=
{
347E3A731C1DFFB500A11FD3
=
{
CreatedOnToolsVersion
=
7.2
;
CreatedOnToolsVersion
=
7.2
;
LastSwiftMigration
=
0800
;
};
};
347E3A7D1C1DFFB500A11FD3
=
{
347E3A7D1C1DFFB500A11FD3
=
{
CreatedOnToolsVersion
=
7.2
;
CreatedOnToolsVersion
=
7.2
;
LastSwiftMigration
=
0800
;
};
};
};
};
};
};
...
@@ -714,6 +716,7 @@
...
@@ -714,6 +716,7 @@
SKIP_INSTALL
=
YES
;
SKIP_INSTALL
=
YES
;
SUPPORTED_PLATFORMS
=
"appletvsimulator appletvos"
;
SUPPORTED_PLATFORMS
=
"appletvsimulator appletvos"
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Owholemodule"
;
TARGETED_DEVICE_FAMILY
=
3
;
TARGETED_DEVICE_FAMILY
=
3
;
TVOS_DEPLOYMENT_TARGET
=
9.0
;
TVOS_DEPLOYMENT_TARGET
=
9.0
;
};
};
...
@@ -762,6 +765,7 @@
...
@@ -762,6 +765,7 @@
SDKROOT
=
macosx
;
SDKROOT
=
macosx
;
SKIP_INSTALL
=
YES
;
SKIP_INSTALL
=
YES
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Owholemodule"
;
};
};
name
=
Release
;
name
=
Release
;
};
};
...
@@ -901,6 +905,7 @@
...
@@ -901,6 +905,7 @@
SKIP_INSTALL
=
YES
;
SKIP_INSTALL
=
YES
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
SWIFT_VERSION
=
2.3
;
};
};
name
=
Debug
;
name
=
Debug
;
};
};
...
@@ -922,6 +927,8 @@
...
@@ -922,6 +927,8 @@
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SKIP_INSTALL
=
YES
;
SKIP_INSTALL
=
YES
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_INCLUDE_PATHS
=
"${SRCROOT}/Zip/minizip/**"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Owholemodule"
;
SWIFT_VERSION
=
2.3
;
};
};
name
=
Release
;
name
=
Release
;
};
};
...
@@ -932,6 +939,7 @@
...
@@ -932,6 +939,7 @@
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.roymarmelstein.ZipTests
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.roymarmelstein.ZipTests
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_VERSION
=
2.3
;
};
};
name
=
Debug
;
name
=
Debug
;
};
};
...
@@ -942,6 +950,8 @@
...
@@ -942,6 +950,8 @@
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.roymarmelstein.ZipTests
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.roymarmelstein.ZipTests
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Owholemodule"
;
SWIFT_VERSION
=
2.3
;
};
};
name
=
Release
;
name
=
Release
;
};
};
...
...
Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme
View file @
6e161445
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"0
72
0"
LastUpgradeVersion =
"0
80
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
...
Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme
View file @
6e161445
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"0
73
0"
LastUpgradeVersion =
"0
80
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
...
Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme
View file @
6e161445
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"0
72
0"
LastUpgradeVersion =
"0
80
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
...
Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme
View file @
6e161445
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<Scheme
LastUpgradeVersion =
"0
72
0"
LastUpgradeVersion =
"0
80
0"
version =
"1.3"
>
version =
"1.3"
>
<BuildAction
<BuildAction
parallelizeBuildables =
"YES"
parallelizeBuildables =
"YES"
...
...
Zip/QuickZip.swift
View file @
6e161445
...
@@ -45,8 +45,8 @@ extension Zip {
...
@@ -45,8 +45,8 @@ extension Zip {
let
directoryName
=
fileName
.
stringByReplacingOccurrencesOfString
(
".
\(
fileExtension
)
"
,
withString
:
""
)
let
directoryName
=
fileName
.
stringByReplacingOccurrencesOfString
(
".
\(
fileExtension
)
"
,
withString
:
""
)
let
documentsUrl
=
fileManager
.
URLsForDirectory
(
.
DocumentDirectory
,
inDomains
:
.
UserDomainMask
)[
0
]
as
NSURL
let
documentsUrl
=
fileManager
.
URLsForDirectory
(
.
DocumentDirectory
,
inDomains
:
.
UserDomainMask
)[
0
]
as
NSURL
let
destinationUrl
=
documentsUrl
.
URLByAppendingPathComponent
(
directoryName
,
isDirectory
:
true
)
let
destinationUrl
=
documentsUrl
.
URLByAppendingPathComponent
(
directoryName
,
isDirectory
:
true
)
try
self
.
unzipFile
(
path
,
destination
:
destinationUrl
,
overwrite
:
true
,
password
:
nil
,
progress
:
progress
)
try
self
.
unzipFile
(
path
,
destination
:
destinationUrl
!
,
overwrite
:
true
,
password
:
nil
,
progress
:
progress
)
return
destinationUrl
return
destinationUrl
!
}
}
//MARK: Quick Zip
//MARK: Quick Zip
...
@@ -84,8 +84,8 @@ extension Zip {
...
@@ -84,8 +84,8 @@ extension Zip {
let
fileManager
=
NSFileManager
.
defaultManager
()
let
fileManager
=
NSFileManager
.
defaultManager
()
let
documentsUrl
=
fileManager
.
URLsForDirectory
(
.
DocumentDirectory
,
inDomains
:
.
UserDomainMask
)[
0
]
as
NSURL
let
documentsUrl
=
fileManager
.
URLsForDirectory
(
.
DocumentDirectory
,
inDomains
:
.
UserDomainMask
)[
0
]
as
NSURL
let
destinationUrl
=
documentsUrl
.
URLByAppendingPathComponent
(
"
\(
fileName
)
.zip"
)
let
destinationUrl
=
documentsUrl
.
URLByAppendingPathComponent
(
"
\(
fileName
)
.zip"
)
try
self
.
zipFiles
(
paths
,
zipFilePath
:
destinationUrl
,
password
:
nil
,
progress
:
progress
)
try
self
.
zipFiles
(
paths
,
zipFilePath
:
destinationUrl
!
,
password
:
nil
,
progress
:
progress
)
return
destinationUrl
return
destinationUrl
!
}
}
...
...
Zip/Zip.swift
View file @
6e161445
...
@@ -139,7 +139,7 @@ public class Zip {
...
@@ -139,7 +139,7 @@ public class Zip {
if
pathString
.
rangeOfCharacterFromSet
(
NSCharacterSet
(
charactersInString
:
"/
\\
"
))
!=
nil
{
if
pathString
.
rangeOfCharacterFromSet
(
NSCharacterSet
(
charactersInString
:
"/
\\
"
))
!=
nil
{
pathString
=
pathString
.
stringByReplacingOccurrencesOfString
(
"
\\
"
,
withString
:
"/"
)
pathString
=
pathString
.
stringByReplacingOccurrencesOfString
(
"
\\
"
,
withString
:
"/"
)
}
}
guard
let
fullPath
=
destination
.
URLByAppendingPathComponent
(
pathString
)
.
path
else
{
guard
let
fullPath
=
destination
.
URLByAppendingPathComponent
(
pathString
)
!
.
path
else
{
throw
ZipError
.
UnzipFail
throw
ZipError
.
UnzipFail
}
}
let
creationDate
=
NSDate
()
let
creationDate
=
NSDate
()
...
...
Zip/ZipUtilities.swift
View file @
6e161445
...
@@ -72,18 +72,18 @@ internal class ZipUtilities {
...
@@ -72,18 +72,18 @@ internal class ZipUtilities {
if
let
directoryPath
=
directory
.
path
,
let
enumerator
=
fileManager
.
enumeratorAtPath
(
directoryPath
)
{
if
let
directoryPath
=
directory
.
path
,
let
enumerator
=
fileManager
.
enumeratorAtPath
(
directoryPath
)
{
while
let
filePathComponent
=
enumerator
.
nextObject
()
as?
String
{
while
let
filePathComponent
=
enumerator
.
nextObject
()
as?
String
{
let
path
=
directory
.
URLByAppendingPathComponent
(
filePathComponent
)
let
path
=
directory
.
URLByAppendingPathComponent
(
filePathComponent
)
guard
let
filePath
=
path
.
path
,
let
directoryName
=
directory
.
lastPathComponent
else
{
guard
let
filePath
=
path
!
.
path
,
let
directoryName
=
directory
.
lastPathComponent
else
{
continue
continue
}
}
var
isDirectory
:
ObjCBool
=
false
var
isDirectory
:
ObjCBool
=
false
fileManager
.
fileExistsAtPath
(
filePath
,
isDirectory
:
&
isDirectory
)
fileManager
.
fileExistsAtPath
(
filePath
,
isDirectory
:
&
isDirectory
)
if
!
isDirectory
{
if
!
isDirectory
{
let
fileName
=
(
directoryName
as
NSString
)
.
stringByAppendingPathComponent
(
filePathComponent
)
let
fileName
=
(
directoryName
as
NSString
)
.
stringByAppendingPathComponent
(
filePathComponent
)
let
processedPath
=
ProcessedFilePath
(
filePathURL
:
path
,
fileName
:
fileName
)
let
processedPath
=
ProcessedFilePath
(
filePathURL
:
path
!
,
fileName
:
fileName
)
processedFilePaths
.
append
(
processedPath
)
processedFilePaths
.
append
(
processedPath
)
}
}
else
{
else
{
let
directoryContents
=
expandDirectoryFilePath
(
path
)
let
directoryContents
=
expandDirectoryFilePath
(
path
!
)
processedFilePaths
.
appendContentsOf
(
directoryContents
)
processedFilePaths
.
appendContentsOf
(
directoryContents
)
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment