Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
white49
Alamofire
提交
545be1d5
A
Alamofire
项目概览
white49
/
Alamofire
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
Alamofire
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
545be1d5
编写于
6月 20, 2015
作者:
C
Christian Noon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Multipart form data now exposes a contentLength property.
上级
f3d04f31
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
6 deletion
+24
-6
Source/MultipartFormData.swift
Source/MultipartFormData.swift
+24
-6
未找到文件。
Source/MultipartFormData.swift
浏览文件 @
545be1d5
...
...
@@ -86,12 +86,14 @@ public class MultipartFormData {
class
BodyPart
{
let
headers
:
[
String
:
String
]
let
bodyStream
:
NSInputStream
let
bodyContentLength
:
UInt64
var
hasInitialBoundary
=
false
var
hasFinalBoundary
=
false
init
(
headers
:
[
String
:
String
],
bodyStream
:
NSInputStream
)
{
init
(
headers
:
[
String
:
String
],
bodyStream
:
NSInputStream
,
bodyContentLength
:
UInt64
)
{
self
.
headers
=
headers
self
.
bodyStream
=
bodyStream
self
.
bodyContentLength
=
bodyContentLength
}
}
...
...
@@ -100,6 +102,9 @@ public class MultipartFormData {
/// The `Content-Type` header value containing the boundary used to generate the `multipart/form-data`.
public
var
contentType
:
String
{
return
"multipart/form-data;boundary=
\(
self
.
boundaryKey
)
"
}
/// The content length of all body parts used to generate the `multipart/form-data` not including the boundaries.
public
var
contentLength
:
UInt64
{
return
self
.
bodyParts
.
reduce
(
0
)
{
$0
+
$1
.
bodyContentLength
}
}
private
let
stringEncoding
:
NSStringEncoding
private
let
boundaryKey
:
String
private
var
bodyParts
:
[
BodyPart
]
...
...
@@ -200,8 +205,21 @@ public class MultipartFormData {
return
errorWithCode
(
NSURLErrorBadURL
,
failureReason
:
"The URL is not reachable:
\(
URL
)
"
)
}
let
bodyContentLength
:
UInt64
var
fileAttributesError
:
NSError
?
if
let
path
=
URL
.
path
,
attributes
=
NSFileManager
.
defaultManager
()
.
attributesOfItemAtPath
(
path
,
error
:
&
fileAttributesError
),
fileSize
=
(
attributes
[
NSFileSize
]
as?
NSNumber
)?
.
unsignedLongLongValue
{
bodyContentLength
=
fileSize
}
else
{
return
errorWithCode
(
NSURLErrorBadURL
,
failureReason
:
"Could not fetch attributes from the URL:
\(
URL
)
"
)
}
if
let
bodyStream
=
NSInputStream
(
URL
:
URL
)
{
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
bodyStream
)
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
bodyStream
,
bodyContentLength
:
bodyContentLength
)
self
.
bodyParts
.
append
(
bodyPart
)
}
else
{
let
failureReason
=
"Failed to create an input stream from the URL:
\(
URL
)
"
...
...
@@ -230,7 +248,7 @@ public class MultipartFormData {
let
headers
=
contentHeaders
(
name
:
name
,
fileName
:
fileName
,
mimeType
:
mimeType
)
let
bodyStream
=
NSInputStream
(
data
:
data
)
let
bodyContentLength
=
UInt64
(
data
.
length
)
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
bodyStream
)
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
bodyStream
,
bodyContentLength
:
bodyContentLength
)
self
.
bodyParts
.
append
(
bodyPart
)
}
...
...
@@ -251,7 +269,7 @@ public class MultipartFormData {
let
headers
=
contentHeaders
(
name
:
name
)
let
bodyStream
=
NSInputStream
(
data
:
data
)
let
bodyContentLength
=
UInt64
(
data
.
length
)
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
bodyStream
)
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
bodyStream
,
bodyContentLength
:
bodyContentLength
)
self
.
bodyParts
.
append
(
bodyPart
)
}
...
...
@@ -271,9 +289,9 @@ public class MultipartFormData {
:param: fileName The filename to associate with the stream content in the `Content-Disposition` HTTP header.
:param: mimeType The MIME type to associate with the stream content in the `Content-Type` HTTP header.
*/
public
func
appendBodyPart
(
#stream
:
NSInputStream
,
name
:
String
,
fileName
:
String
,
mimeType
:
String
)
{
public
func
appendBodyPart
(
#stream
:
NSInputStream
,
name
:
String
,
fileName
:
String
,
length
:
UInt64
,
mimeType
:
String
)
{
let
headers
=
contentHeaders
(
name
:
name
,
fileName
:
fileName
,
mimeType
:
mimeType
)
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
stream
)
let
bodyPart
=
BodyPart
(
headers
:
headers
,
bodyStream
:
stream
,
bodyContentLength
:
length
)
self
.
bodyParts
.
append
(
bodyPart
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录