Skip to content

Commit 96c41b1

Browse files
petrsvihlikpetrsvihlik
committed
prep for view file, added comments, unified code style
1 parent 44b4294 commit 96c41b1

39 files changed

+430
-316
lines changed

‎WOPI.sln

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ VisualStudioVersion = 16.0.29319.158
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{785E1533-48CE-4B5E-8C59-D6F1FDA8C45C}"
66
ProjectSection(SolutionItems) = preProject
7+
.editorconfig = .editorconfig
78
.gitignore = .gitignore
89
appveyor.yml = appveyor.yml
910
coverage.ps1 = coverage.ps1

‎WopiHost.Abstractions/WopiClaimTypes.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
{
33
public class WopiClaimTypes
44
{
5-
public const string UserPermissions = nameof(UserPermissions);
5+
public const string USER_PERMISSIONS = nameof(USER_PERMISSIONS);
66
}
77
}

‎WopiHost.Cobalt/CobaltHostLockingStore.cs

+29-29
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public CobaltHostLockingStore(ClaimsPrincipal principal)
1616

1717
public override WhoAmIRequest.OutputType HandleWhoAmI(WhoAmIRequest.InputType input)
1818
{
19-
WhoAmIRequest.OutputType result = new WhoAmIRequest.OutputType
19+
var result = new WhoAmIRequest.OutputType
2020
{
2121
UserEmailAddress = _principal?.FindFirst(ClaimTypes.Email).Value,
2222
UserIsAnonymous = string.IsNullOrEmpty(_principal?.FindFirst(ClaimTypes.NameIdentifier).Value),
@@ -29,14 +29,14 @@ public override WhoAmIRequest.OutputType HandleWhoAmI(WhoAmIRequest.InputType in
2929

3030
public override ServerTimeRequest.OutputType HandleServerTime(ServerTimeRequest.InputType input)
3131
{
32-
ServerTimeRequest.OutputType result = new ServerTimeRequest.OutputType { ServerTime = DateTime.UtcNow };
32+
var result = new ServerTimeRequest.OutputType { ServerTime = DateTime.UtcNow };
3333

3434
return result;
3535
}
3636

3737
public override LockAndCheckOutStatusRequest.OutputType HandleLockAndCheckOutStatus(LockAndCheckOutStatusRequest.InputType input)
3838
{
39-
LockAndCheckOutStatusRequest.OutputType result = new LockAndCheckOutStatusRequest.OutputType
39+
var result = new LockAndCheckOutStatusRequest.OutputType
4040
{
4141
LockType = 1U,
4242
CheckOutType = 0U
@@ -47,84 +47,84 @@ public override LockAndCheckOutStatusRequest.OutputType HandleLockAndCheckOutSta
4747

4848
public override GetExclusiveLockRequest.OutputType HandleGetExclusiveLock(GetExclusiveLockRequest.InputType input)
4949
{
50-
GetExclusiveLockRequest.OutputType result = new GetExclusiveLockRequest.OutputType();
50+
var result = new GetExclusiveLockRequest.OutputType();
5151

5252
return result;
5353
}
5454

5555
public override RefreshExclusiveLockRequest.OutputType HandleRefreshExclusiveLock(RefreshExclusiveLockRequest.InputType input)
5656
{
57-
RefreshExclusiveLockRequest.OutputType result = new RefreshExclusiveLockRequest.OutputType();
57+
var result = new RefreshExclusiveLockRequest.OutputType();
5858

5959
return result;
6060
}
6161

6262
public override CheckExclusiveLockAvailabilityRequest.OutputType HandleCheckExclusiveLockAvailability(CheckExclusiveLockAvailabilityRequest.InputType input)
6363
{
64-
CheckExclusiveLockAvailabilityRequest.OutputType result = new CheckExclusiveLockAvailabilityRequest.OutputType();
64+
var result = new CheckExclusiveLockAvailabilityRequest.OutputType();
6565

6666
return result;
6767
}
6868

6969
public override ConvertExclusiveLockToSchemaLockRequest.OutputType HandleConvertExclusiveLockToSchemaLock(ConvertExclusiveLockToSchemaLockRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
7070
{
71-
ConvertExclusiveLockToSchemaLockRequest.OutputType result = new ConvertExclusiveLockToSchemaLockRequest.OutputType();
71+
var result = new ConvertExclusiveLockToSchemaLockRequest.OutputType();
7272

7373
return result;
7474
}
7575

7676
public override ConvertExclusiveLockWithCoauthTransitionRequest.OutputType HandleConvertExclusiveLockWithCoauthTransition(ConvertExclusiveLockWithCoauthTransitionRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
7777
{
78-
ConvertExclusiveLockWithCoauthTransitionRequest.OutputType result = new ConvertExclusiveLockWithCoauthTransitionRequest.OutputType();
78+
var result = new ConvertExclusiveLockWithCoauthTransitionRequest.OutputType();
7979

8080
return result;
8181
}
8282

8383
public override GetSchemaLockRequest.OutputType HandleGetSchemaLock(GetSchemaLockRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
8484
{
85-
GetSchemaLockRequest.OutputType result = new GetSchemaLockRequest.OutputType();
85+
var result = new GetSchemaLockRequest.OutputType();
8686

8787
return result;
8888
}
8989

9090
public override ReleaseExclusiveLockRequest.OutputType HandleReleaseExclusiveLock(ReleaseExclusiveLockRequest.InputType input)
9191
{
92-
ReleaseExclusiveLockRequest.OutputType result = new ReleaseExclusiveLockRequest.OutputType();
92+
var result = new ReleaseExclusiveLockRequest.OutputType();
9393

9494
return result;
9595
}
9696

9797
public override ReleaseSchemaLockRequest.OutputType HandleReleaseSchemaLock(ReleaseSchemaLockRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
9898
{
99-
ReleaseSchemaLockRequest.OutputType result = new ReleaseSchemaLockRequest.OutputType();
99+
var result = new ReleaseSchemaLockRequest.OutputType();
100100

101101
return result;
102102
}
103103

104104
public override RefreshSchemaLockRequest.OutputType HandleRefreshSchemaLock(RefreshSchemaLockRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
105105
{
106-
RefreshSchemaLockRequest.OutputType result = new RefreshSchemaLockRequest.OutputType { Lock = LockType.SchemaLock };
106+
var result = new RefreshSchemaLockRequest.OutputType { Lock = LockType.SchemaLock };
107107

108108
return result;
109109
}
110110

111111
public override ConvertSchemaLockToExclusiveLockRequest.OutputType HandleConvertSchemaLockToExclusiveLock(ConvertSchemaLockToExclusiveLockRequest.InputType input)
112112
{
113-
ConvertSchemaLockToExclusiveLockRequest.OutputType result = new ConvertSchemaLockToExclusiveLockRequest.OutputType();
113+
var result = new ConvertSchemaLockToExclusiveLockRequest.OutputType();
114114

115115
return result;
116116
}
117117

118118
public override CheckSchemaLockAvailabilityRequest.OutputType HandleCheckSchemaLockAvailability(CheckSchemaLockAvailabilityRequest.InputType input)
119119
{
120-
CheckSchemaLockAvailabilityRequest.OutputType result = new CheckSchemaLockAvailabilityRequest.OutputType();
120+
var result = new CheckSchemaLockAvailabilityRequest.OutputType();
121121

122122
return result;
123123
}
124124

125125
public override JoinCoauthoringRequest.OutputType HandleJoinCoauthoring(JoinCoauthoringRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
126126
{
127-
JoinCoauthoringRequest.OutputType result = new JoinCoauthoringRequest.OutputType
127+
var result = new JoinCoauthoringRequest.OutputType
128128
{
129129
Lock = LockType.SchemaLock,
130130
CoauthStatus = CoauthStatusType.Alone,
@@ -135,14 +135,14 @@ public override JoinCoauthoringRequest.OutputType HandleJoinCoauthoring(JoinCoau
135135

136136
public override ExitCoauthoringRequest.OutputType HandleExitCoauthoring(ExitCoauthoringRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
137137
{
138-
ExitCoauthoringRequest.OutputType result = new ExitCoauthoringRequest.OutputType();
138+
var result = new ExitCoauthoringRequest.OutputType();
139139

140140
return result;
141141
}
142142

143143
public override RefreshCoauthoringSessionRequest.OutputType HandleRefreshCoauthoring(RefreshCoauthoringSessionRequest.InputType input, int protocolMajorVersion, int protocolMinorVersion)
144144
{
145-
RefreshCoauthoringSessionRequest.OutputType result = new RefreshCoauthoringSessionRequest.OutputType
145+
var result = new RefreshCoauthoringSessionRequest.OutputType
146146
{
147147
Lock = LockType.SchemaLock,
148148
CoauthStatus = CoauthStatusType.Alone
@@ -153,28 +153,28 @@ public override RefreshCoauthoringSessionRequest.OutputType HandleRefreshCoautho
153153

154154
public override ConvertCoauthLockToExclusiveLockRequest.OutputType HandleConvertCoauthLockToExclusiveLock(ConvertCoauthLockToExclusiveLockRequest.InputType input)
155155
{
156-
ConvertCoauthLockToExclusiveLockRequest.OutputType result = new ConvertCoauthLockToExclusiveLockRequest.OutputType();
156+
var result = new ConvertCoauthLockToExclusiveLockRequest.OutputType();
157157

158158
return result;
159159
}
160160

161161
public override CheckCoauthLockAvailabilityRequest.OutputType HandleCheckCoauthLockAvailability(CheckCoauthLockAvailabilityRequest.InputType input)
162162
{
163-
CheckCoauthLockAvailabilityRequest.OutputType result = new CheckCoauthLockAvailabilityRequest.OutputType();
163+
var result = new CheckCoauthLockAvailabilityRequest.OutputType();
164164

165165
return result;
166166
}
167167

168168
public override MarkCoauthTransitionCompleteRequest.OutputType HandleMarkCoauthTransitionComplete(MarkCoauthTransitionCompleteRequest.InputType input)
169169
{
170-
MarkCoauthTransitionCompleteRequest.OutputType result = new MarkCoauthTransitionCompleteRequest.OutputType();
170+
var result = new MarkCoauthTransitionCompleteRequest.OutputType();
171171

172172
return result;
173173
}
174174

175175
public override GetCoauthoringStatusRequest.OutputType HandleGetCoauthoringStatus(GetCoauthoringStatusRequest.InputType input)
176176
{
177-
GetCoauthoringStatusRequest.OutputType result = new GetCoauthoringStatusRequest.OutputType
177+
var result = new GetCoauthoringStatusRequest.OutputType
178178
{
179179
CoauthStatus = CoauthStatusType.Alone
180180
};
@@ -189,35 +189,35 @@ public override Dictionary<string, EditorsTableEntry> QueryEditorsTable()
189189

190190
public override JoinEditingSessionRequest.OutputType HandleJoinEditingSession(JoinEditingSessionRequest.InputType input)
191191
{
192-
JoinEditingSessionRequest.OutputType result = new JoinEditingSessionRequest.OutputType();
192+
var result = new JoinEditingSessionRequest.OutputType();
193193

194194
return result;
195195
}
196196

197197
public override RefreshEditingSessionRequest.OutputType HandleRefreshEditingSession(RefreshEditingSessionRequest.InputType input)
198198
{
199-
RefreshEditingSessionRequest.OutputType result = new RefreshEditingSessionRequest.OutputType();
199+
var result = new RefreshEditingSessionRequest.OutputType();
200200

201201
return result;
202202
}
203203

204204
public override LeaveEditingSessionRequest.OutputType HandleLeaveEditingSession(LeaveEditingSessionRequest.InputType input)
205205
{
206-
LeaveEditingSessionRequest.OutputType result = new LeaveEditingSessionRequest.OutputType();
206+
var result = new LeaveEditingSessionRequest.OutputType();
207207

208208
return result;
209209
}
210210

211211
public override UpdateEditorMetadataRequest.OutputType HandleUpdateEditorMetadata(UpdateEditorMetadataRequest.InputType input)
212212
{
213-
UpdateEditorMetadataRequest.OutputType result = new UpdateEditorMetadataRequest.OutputType();
213+
var result = new UpdateEditorMetadataRequest.OutputType();
214214

215215
return result;
216216
}
217217

218218
public override RemoveEditorMetadataRequest.OutputType HandleRemoveEditorMetadata(RemoveEditorMetadataRequest.InputType input)
219219
{
220-
RemoveEditorMetadataRequest.OutputType result = new RemoveEditorMetadataRequest.OutputType();
220+
var result = new RemoveEditorMetadataRequest.OutputType();
221221

222222
return result;
223223
}
@@ -229,21 +229,21 @@ public override ulong GetEditorsTableWaterline()
229229

230230
public override AmIAloneRequest.OutputType HandleAmIAlone(AmIAloneRequest.InputType input)
231231
{
232-
AmIAloneRequest.OutputType result = new AmIAloneRequest.OutputType { AmIAlone = true };
232+
var result = new AmIAloneRequest.OutputType { AmIAlone = true };
233233

234234
return result;
235235
}
236236

237237
public override DocMetaInfoRequest.OutputType HandleDocMetaInfo(DocMetaInfoRequest.InputType input)
238238
{
239-
DocMetaInfoRequest.OutputType result = new DocMetaInfoRequest.OutputType();
239+
var result = new DocMetaInfoRequest.OutputType();
240240

241241
return result;
242242
}
243243

244244
public override VersionsRequest.OutputType HandleVersions(VersionsRequest.InputType input)
245245
{
246-
VersionsRequest.OutputType result = new VersionsRequest.OutputType { Enabled = false };
246+
var result = new VersionsRequest.OutputType { Enabled = false };
247247

248248
return result;
249249
}

‎WopiHost.Cobalt/CobaltSession.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class CobaltProcessor : ICobaltProcessor
1313
private CobaltFile GetCobaltFile(IWopiFile file, ClaimsPrincipal principal)
1414
{
1515
var disposal = new DisposalEscrow(file.Owner);
16-
CobaltFilePartitionConfig content = new CobaltFilePartitionConfig
16+
var content = new CobaltFilePartitionConfig
1717
{
1818
IsNewFile = true,
1919
HostBlobStore = new TemporaryHostBlobStore(new TemporaryHostBlobStore.Config(), disposal, file.Identifier + @".Content"),
@@ -23,7 +23,7 @@ private CobaltFile GetCobaltFile(IWopiFile file, ClaimsPrincipal principal)
2323
PartitionId = FilePartitionId.Content
2424
};
2525

26-
CobaltFilePartitionConfig coauth = new CobaltFilePartitionConfig
26+
var coauth = new CobaltFilePartitionConfig
2727
{
2828
IsNewFile = true,
2929
HostBlobStore = new TemporaryHostBlobStore(new TemporaryHostBlobStore.Config(), disposal, file.Identifier + @".CoauthMetadata"),
@@ -33,7 +33,7 @@ private CobaltFile GetCobaltFile(IWopiFile file, ClaimsPrincipal principal)
3333
PartitionId = FilePartitionId.CoauthMetadata
3434
};
3535

36-
CobaltFilePartitionConfig wacupdate = new CobaltFilePartitionConfig
36+
var wacupdate = new CobaltFilePartitionConfig
3737
{
3838
IsNewFile = true,
3939
HostBlobStore = new TemporaryHostBlobStore(new TemporaryHostBlobStore.Config(), disposal, file.Identifier + @".WordWacUpdate"),
@@ -43,7 +43,7 @@ private CobaltFile GetCobaltFile(IWopiFile file, ClaimsPrincipal principal)
4343
PartitionId = FilePartitionId.WordWacUpdate
4444
};
4545

46-
Dictionary<FilePartitionId, CobaltFilePartitionConfig> partitionConfigs = new Dictionary<FilePartitionId, CobaltFilePartitionConfig> { { FilePartitionId.Content, content }, { FilePartitionId.WordWacUpdate, wacupdate }, { FilePartitionId.CoauthMetadata, coauth } };
46+
var partitionConfigs = new Dictionary<FilePartitionId, CobaltFilePartitionConfig> { { FilePartitionId.Content, content }, { FilePartitionId.WordWacUpdate, wacupdate }, { FilePartitionId.CoauthMetadata, coauth } };
4747

4848

4949
var tempCobaltFile = new CobaltFile(disposal, partitionConfigs, new CobaltHostLockingStore(principal), null);
@@ -53,7 +53,7 @@ private CobaltFile GetCobaltFile(IWopiFile file, ClaimsPrincipal principal)
5353
using (var stream = file.GetReadStream())
5454
{
5555
var srcAtom = new AtomFromStream(stream);
56-
tempCobaltFile.GetCobaltFilePartition(FilePartitionId.Content).SetStream(RootId.Default.Value, srcAtom, out Metrics o1);
56+
tempCobaltFile.GetCobaltFilePartition(FilePartitionId.Content).SetStream(RootId.Default.Value, srcAtom, out var o1);
5757
tempCobaltFile.GetCobaltFilePartition(FilePartitionId.Content).GetStream(RootId.Default.Value).Flush();
5858
}
5959
}
@@ -65,7 +65,7 @@ private CobaltFile GetCobaltFile(IWopiFile file, ClaimsPrincipal principal)
6565
public Stream GetFileStream(IWopiFile file, ClaimsPrincipal principal)
6666
{
6767
//TODO: use in filescontroller
68-
using (MemoryStream ms = new MemoryStream())
68+
using (var ms = new MemoryStream())
6969
{
7070
new GenericFda(GetCobaltFile(file, principal).CobaltEndpoint).GetContentStream().CopyTo(ms);
7171
return ms;
@@ -76,11 +76,11 @@ public Stream GetFileStream(IWopiFile file, ClaimsPrincipal principal)
7676
public Action<Stream> ProcessCobalt(IWopiFile file, ClaimsPrincipal principal, byte[] newContent)
7777
{
7878
// Refactoring tip: there are more ways of initializing Atom
79-
AtomFromByteArray atomRequest = new AtomFromByteArray(newContent);
80-
RequestBatch requestBatch = new RequestBatch();
79+
var atomRequest = new AtomFromByteArray(newContent);
80+
var requestBatch = new RequestBatch();
8181

8282

83-
requestBatch.DeserializeInputFromProtocol(atomRequest, out object ctx, out ProtocolVersion protocolVersion);
83+
requestBatch.DeserializeInputFromProtocol(atomRequest, out var ctx, out var protocolVersion);
8484
var cobaltFile = GetCobaltFile(file, principal);
8585
cobaltFile.CobaltEndpoint.ExecuteRequestBatch(requestBatch);
8686

‎WopiHost.Core/Controllers/ContainersController.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ public CheckContainerInfo GetCheckContainerInfo(string id)
4848
[Produces("application/json")]
4949
public Container EnumerateChildren(string id)
5050
{
51-
Container container = new Container();
51+
var container = new Container();
5252
var files = new List<ChildFile>();
5353
var containers = new List<ChildContainer>();
5454

55-
foreach (IWopiFile wopiFile in StorageProvider.GetWopiFiles(id))
55+
foreach (var wopiFile in StorageProvider.GetWopiFiles(id))
5656
{
5757
files.Add(new ChildFile
5858
{
@@ -64,7 +64,7 @@ public Container EnumerateChildren(string id)
6464
});
6565
}
6666

67-
foreach (IWopiFolder wopiContainer in StorageProvider.GetWopiContainers(id))
67+
foreach (var wopiContainer in StorageProvider.GetWopiContainers(id))
6868
{
6969
containers.Add(new ChildContainer
7070
{

‎WopiHost.Core/Controllers/EcosystemController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public EcosystemController(IWopiStorageProvider fileProvider, IWopiSecurityHandl
2727
public RootContainerInfo GetRootContainer()
2828
{
2929
var root = StorageProvider.GetWopiContainer(@".\");
30-
RootContainerInfo rc = new RootContainerInfo
30+
var rc = new RootContainerInfo
3131
{
3232
ContainerPointer = new ChildContainer
3333
{

0 commit comments

Comments
 (0)