Skip to content

Commit cac6176

Browse files
qimingyuanqimingyuan
committed
Update based on new spec
1 parent 68e2e7e commit cac6176

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2433
-1489
lines changed

‎Dropbox.Api/Dropbox.Api.Doc.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,10 @@
145145
<Compile Include="Sharing\AddFolderMemberError.cs" />
146146
<Compile Include="Sharing\AddMember.cs" />
147147
<Compile Include="Sharing\AddMemberSelectorError.cs" />
148-
<Compile Include="Sharing\BasicSharedFolderMetadata.cs" />
149148
<Compile Include="Sharing\CollectionLinkMetadata.cs" />
150149
<Compile Include="Sharing\CreateSharedLinkArg.cs" />
151150
<Compile Include="Sharing\CreateSharedLinkError.cs" />
152151
<Compile Include="Sharing\FolderPolicy.cs" />
153-
<Compile Include="Sharing\FullSharedFolderMetadata.cs" />
154152
<Compile Include="Sharing\GetMetadataArgs.cs" />
155153
<Compile Include="Sharing\GetSharedLinksArg.cs" />
156154
<Compile Include="Sharing\GetSharedLinksError.cs" />
@@ -162,7 +160,11 @@
162160
<Compile Include="Sharing\JobError.cs" />
163161
<Compile Include="Sharing\JobStatus.cs" />
164162
<Compile Include="Sharing\LinkMetadata.cs" />
165-
<Compile Include="Sharing\ListFoldersArgs.cs" />
163+
<Compile Include="Sharing\ListFolderMembersArgs.cs" />
164+
<Compile Include="Sharing\ListFolderMembersContinueArg.cs" />
165+
<Compile Include="Sharing\ListFolderMembersContinueError.cs" />
166+
<Compile Include="Sharing\ListFoldersContinueArg.cs" />
167+
<Compile Include="Sharing\ListFoldersContinueError.cs" />
166168
<Compile Include="Sharing\ListFoldersResult.cs" />
167169
<Compile Include="Sharing\MemberPolicy.cs" />
168170
<Compile Include="Sharing\MemberSelector.cs" />
@@ -184,6 +186,7 @@
184186
<Compile Include="Sharing\SharePathError.cs" />
185187
<Compile Include="Sharing\SharedFolderAccessError.cs" />
186188
<Compile Include="Sharing\SharedFolderMemberError.cs" />
189+
<Compile Include="Sharing\SharedFolderMembers.cs" />
187190
<Compile Include="Sharing\SharedFolderMetadata.cs" />
188191
<Compile Include="Sharing\SharedLinkPolicy.cs" />
189192
<Compile Include="Sharing\SharingRoutes.cs" />

‎Dropbox.Api/Dropbox.Api.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,10 @@
165165
<Compile Include="Sharing\AddFolderMemberError.cs" />
166166
<Compile Include="Sharing\AddMember.cs" />
167167
<Compile Include="Sharing\AddMemberSelectorError.cs" />
168-
<Compile Include="Sharing\BasicSharedFolderMetadata.cs" />
169168
<Compile Include="Sharing\CollectionLinkMetadata.cs" />
170169
<Compile Include="Sharing\CreateSharedLinkArg.cs" />
171170
<Compile Include="Sharing\CreateSharedLinkError.cs" />
172171
<Compile Include="Sharing\FolderPolicy.cs" />
173-
<Compile Include="Sharing\FullSharedFolderMetadata.cs" />
174172
<Compile Include="Sharing\GetMetadataArgs.cs" />
175173
<Compile Include="Sharing\GetSharedLinksArg.cs" />
176174
<Compile Include="Sharing\GetSharedLinksError.cs" />
@@ -182,7 +180,11 @@
182180
<Compile Include="Sharing\JobError.cs" />
183181
<Compile Include="Sharing\JobStatus.cs" />
184182
<Compile Include="Sharing\LinkMetadata.cs" />
185-
<Compile Include="Sharing\ListFoldersArgs.cs" />
183+
<Compile Include="Sharing\ListFolderMembersArgs.cs" />
184+
<Compile Include="Sharing\ListFolderMembersContinueArg.cs" />
185+
<Compile Include="Sharing\ListFolderMembersContinueError.cs" />
186+
<Compile Include="Sharing\ListFoldersContinueArg.cs" />
187+
<Compile Include="Sharing\ListFoldersContinueError.cs" />
186188
<Compile Include="Sharing\ListFoldersResult.cs" />
187189
<Compile Include="Sharing\MemberPolicy.cs" />
188190
<Compile Include="Sharing\MemberSelector.cs" />
@@ -204,6 +206,7 @@
204206
<Compile Include="Sharing\SharePathError.cs" />
205207
<Compile Include="Sharing\SharedFolderAccessError.cs" />
206208
<Compile Include="Sharing\SharedFolderMemberError.cs" />
209+
<Compile Include="Sharing\SharedFolderMembers.cs" />
207210
<Compile Include="Sharing\SharedFolderMetadata.cs" />
208211
<Compile Include="Sharing\SharedLinkPolicy.cs" />
209212
<Compile Include="Sharing\SharingRoutes.cs" />

‎Dropbox.Api/Dropbox.Api.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>$id$</id>
5-
<version>2.0.3</version>
5+
<version>2.1.0</version>
66
<title>Dropbox v2 API Beta</title>
77
<authors>Dropbox Inc</authors>
88
<owners>Dropbox Inc</owners>
@@ -12,7 +12,7 @@
1212
<iconUrl>https://cf.dropboxstatic.com/static/images/icons/blue_dropbox_glyph.png</iconUrl>
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>Portable class library for accessing the Dropbox v2 API</description>
15-
<releaseNotes>Preview Release. Bug fixes.</releaseNotes>
15+
<releaseNotes>Preview Release. Update shared folder APIs.</releaseNotes>
1616
<copyright>Copyright (c) Dropbox Inc. 2015</copyright>
1717
<tags>Dropbox Api</tags>
1818
</metadata>

‎Dropbox.Api/Files/CommitInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public CommitInfo(string path,
5555
{
5656
throw new sys.ArgumentNullException("path");
5757
}
58-
else if (!re.Regex.IsMatch(path, @"/.*"))
58+
else if (!re.Regex.IsMatch(path, @"\A/.*\z"))
5959
{
6060
throw new sys.ArgumentOutOfRangeException("path");
6161
}

‎Dropbox.Api/Files/CreateFolderArg.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public CreateFolderArg(string path)
3838
{
3939
throw new sys.ArgumentNullException("path");
4040
}
41-
else if (!re.Regex.IsMatch(path, @"/.*"))
41+
else if (!re.Regex.IsMatch(path, @"\A/.*\z"))
4242
{
4343
throw new sys.ArgumentOutOfRangeException("path");
4444
}

‎Dropbox.Api/Files/DeleteArg.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public DeleteArg(string path)
3737
{
3838
throw new sys.ArgumentNullException("path");
3939
}
40-
else if (!re.Regex.IsMatch(path, @"/.*"))
40+
else if (!re.Regex.IsMatch(path, @"\A/.*\z"))
4141
{
4242
throw new sys.ArgumentOutOfRangeException("path");
4343
}

‎Dropbox.Api/Files/DeletedMetadata.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@ public class DeletedMetadata : Metadata
3737
/// contains a slash.</param>
3838
/// <param name="pathLower">The lowercased full path in the user's Dropbox. This always
3939
/// starts with a slash.</param>
40+
/// <param name="parentSharedFolderId">Set if this file or folder is contained in a
41+
/// shared folder.</param>
4042
public DeletedMetadata(string name,
41-
string pathLower)
42-
: base(name, pathLower)
43+
string pathLower,
44+
string parentSharedFolderId = null)
45+
: base(name, pathLower, parentSharedFolderId)
4346
{
4447
}
4548

@@ -69,6 +72,10 @@ public override void EncodeFields(DeletedMetadata value, enc.IJsonWriter writer)
6972
{
7073
WriteProperty("name", value.Name, writer, enc.StringEncoder.Instance);
7174
WriteProperty("path_lower", value.PathLower, writer, enc.StringEncoder.Instance);
75+
if (value.ParentSharedFolderId != null)
76+
{
77+
WriteProperty("parent_shared_folder_id", value.ParentSharedFolderId, writer, enc.StringEncoder.Instance);
78+
}
7279
}
7380
}
7481

@@ -107,6 +114,9 @@ protected override void SetField(DeletedMetadata value, string fieldName, enc.IJ
107114
case "path_lower":
108115
value.PathLower = enc.StringDecoder.Instance.Decode(reader);
109116
break;
117+
case "parent_shared_folder_id":
118+
value.ParentSharedFolderId = enc.StringDecoder.Instance.Decode(reader);
119+
break;
110120
default:
111121
reader.Skip();
112122
break;

‎Dropbox.Api/Files/DownloadArg.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public DownloadArg(string path,
4040
{
4141
throw new sys.ArgumentNullException("path");
4242
}
43-
else if (!re.Regex.IsMatch(path, @"((/|id:).*)|(rev:[0-9a-f]{9,})"))
43+
else if (!re.Regex.IsMatch(path, @"\A((/|id:).*)|(rev:[0-9a-f]{9,})\z"))
4444
{
4545
throw new sys.ArgumentOutOfRangeException("path");
4646
}
4747

48-
if (rev != null && (rev.Length < 9 || !re.Regex.IsMatch(rev, @"[0-9a-f]+")))
48+
if (rev != null && (rev.Length < 9 || !re.Regex.IsMatch(rev, @"\A[0-9a-f]+\z")))
4949
{
5050
throw new sys.ArgumentOutOfRangeException("rev");
5151
}

‎Dropbox.Api/Files/FileMetadata.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public class FileMetadata : Metadata
4646
/// field is the same rev as elsewhere in the API and can be used to detect changes and
4747
/// avoid conflicts.</param>
4848
/// <param name="size">The file size in bytes.</param>
49+
/// <param name="parentSharedFolderId">Set if this file or folder is contained in a
50+
/// shared folder.</param>
4951
/// <param name="id">A unique identifier for the file.</param>
5052
/// <param name="mediaInfo">Additional information if the file is a photo or
5153
/// video.</param>
@@ -55,15 +57,16 @@ public FileMetadata(string name,
5557
sys.DateTime serverModified,
5658
string rev,
5759
ulong size,
60+
string parentSharedFolderId = null,
5861
string id = null,
5962
MediaInfo mediaInfo = null)
60-
: base(name, pathLower)
63+
: base(name, pathLower, parentSharedFolderId)
6164
{
6265
if (rev == null)
6366
{
6467
throw new sys.ArgumentNullException("rev");
6568
}
66-
else if (rev.Length < 9 || !re.Regex.IsMatch(rev, @"[0-9a-f]+"))
69+
else if (rev.Length < 9 || !re.Regex.IsMatch(rev, @"\A[0-9a-f]+\z"))
6770
{
6871
throw new sys.ArgumentOutOfRangeException("rev");
6972
}
@@ -146,6 +149,10 @@ public override void EncodeFields(FileMetadata value, enc.IJsonWriter writer)
146149
WriteProperty("server_modified", value.ServerModified, writer, enc.DateTimeEncoder.Instance);
147150
WriteProperty("rev", value.Rev, writer, enc.StringEncoder.Instance);
148151
WriteProperty("size", value.Size, writer, enc.UInt64Encoder.Instance);
152+
if (value.ParentSharedFolderId != null)
153+
{
154+
WriteProperty("parent_shared_folder_id", value.ParentSharedFolderId, writer, enc.StringEncoder.Instance);
155+
}
149156
if (value.Id != null)
150157
{
151158
WriteProperty("id", value.Id, writer, enc.StringEncoder.Instance);
@@ -204,6 +211,9 @@ protected override void SetField(FileMetadata value, string fieldName, enc.IJson
204211
case "size":
205212
value.Size = enc.UInt64Decoder.Instance.Decode(reader);
206213
break;
214+
case "parent_shared_folder_id":
215+
value.ParentSharedFolderId = enc.StringDecoder.Instance.Decode(reader);
216+
break;
207217
case "id":
208218
value.Id = enc.StringDecoder.Instance.Decode(reader);
209219
break;

0 commit comments

Comments
 (0)