Skip to content

Commit c662f00

Browse files
ITHitBuildITHitBuild
committed
v7.2.23868.0
1 parent 69d2b0c commit c662f00

Some content is hidden

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

47 files changed

+602
-261
lines changed

‎Common/Common.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Platforms>AnyCPU;x64</Platforms>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23701.0" />
14-
<PackageReference Include="ITHit.FileSystem" Version="7.1.23701.0" />
13+
<PackageReference Include="ITHit.FileSystem.Windows" Version="7.2.23868.0" />
14+
<PackageReference Include="ITHit.FileSystem" Version="7.2.23868.0" />
1515
</ItemGroup>
1616
</Project>

‎Common/FileSystemItemMetadataExt.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,8 @@ public class FileSystemItemMetadataExt : IFileSystemItemMetadata, IChangedItem
6262

6363
///<inheritdoc/>
6464
public Func<Task> AfterAction { get; set; }
65+
66+
///<inheritdoc/>
67+
public ICustomData Properties { get; set; }
6568
}
6669
}

‎Windows/Common/Core/Common.Windows.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.1.23701.0" />
24-
<PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23701.0" />
23+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.2.23868.0" />
24+
<PackageReference Include="ITHit.FileSystem.Windows" Version="7.2.23868.0" />
2525
<ProjectReference Include="..\..\..\Common\Common.csproj" />
2626
</ItemGroup>
2727
</Project>

‎Windows/Common/Core/LogFormatter.cs‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
using ITHit.FileSystem.Windows;
1414
using ITHit.FileSystem.Windows.Package;
15+
using Windows.Storage.Search;
1516

1617
namespace ITHit.FileSystem.Samples.Common.Windows
1718
{
@@ -103,11 +104,11 @@ public void PrintEnvironmentDescription()
103104
{
104105
log.Info($"\n{"Sparse package location:",indent} {sparsePackagePath}");
105106
var cert = System.Security.Cryptography.X509Certificates.X509Certificate.CreateFromSignedFile(sparsePackagePath);
106-
log.Info($"\n{"Sparse package cert:", indent} Subject: {cert.Subject}, Issued by: {cert.Issuer}");
107+
log.Info($"\n{"Sparse package cert:",indent} Subject: {cert.Subject}, Issued by: {cert.Issuer}");
107108
}
108109
else
109110
{
110-
log.Info($"\n{"Sparse package:", indent} Not found");
111+
log.Info($"\n{"Sparse package:",indent} Not found");
111112
}
112113
}
113114

@@ -147,7 +148,13 @@ public async Task PrintEngineDescriptionAsync(EngineWindows engine)
147148
private async Task PrintIndexingStateAsync(string path)
148149
{
149150
StorageFolder userFileSystemRootFolder = await StorageFolder.GetFolderFromPathAsync(path);
150-
log.Info($"\n{"Indexed state:",indent} {await userFileSystemRootFolder.GetIndexedStateAsync()}");
151+
IndexedState indexedState = await userFileSystemRootFolder.GetIndexedStateAsync();
152+
log.Info($"\n{"Indexed state:",indent} {indexedState}");
153+
154+
if (indexedState != IndexedState.FullyIndexed)
155+
{
156+
log.ErrorFormat($"\nIndexing is disabled. Indexing must be enabled for {path}");
157+
}
151158
}
152159

153160
public void LogMessage(string message)
@@ -195,7 +202,7 @@ private void WriteLog(IEngine sender, EngineMessageEventArgs e, log4net.Core.Lev
195202
string sourcePath = e.SourcePath?.FitString(sourcePathWidth, 6);
196203
string targetPath = e.TargetPath?.FitString(sourcePathWidth, 6);
197204

198-
string message = Format(DateTimeOffset.Now.ToString("hh:mm:ss.fff"), process, priorityHint?.ToString(), fileId, "", e.ComponentName, e.CallerLineNumber.ToString(), e.CallerMemberName, e.CallerFilePath, e.Message, sourcePath, att, targetPath);
205+
string message = Format(DateTimeOffset.Now.ToString("hh:mm:ss.fff"), process, priorityHint?.ToString(), fileId, "", e.ComponentName, e.CallerLineNumber.ToString(), e.CallerMemberName, e.CallerFilePath, e.Message, sourcePath, att, targetPath);
199206

200207
if (level == log4net.Core.Level.Error)
201208
{
@@ -214,13 +221,13 @@ private void WriteLog(IEngine sender, EngineMessageEventArgs e, log4net.Core.Lev
214221
{
215222
log.Debug(message);
216223
}
217-
224+
218225
}
219226

220227
private static string Format(string date, string process, string priorityHint, string fileId, string remoteStorageId, string componentName, string callerLineNumber, string callerMemberName, string callerFilePath, string message, string sourcePath, string attributes, string targetPath)
221228
{
222229
// {fileId,-18} | {remoteStorageId,-remoteStorageIdWidth}
223-
return $"{Environment.NewLine}|{date, -12}| {process,-25}| {priorityHint,-5}| {componentName,-26}| {callerLineNumber, 4} | {message,-45}| {sourcePath,-sourcePathWidth} | {attributes, 10 } | {targetPath}";
230+
return $"{Environment.NewLine}|{date,-12}| {process,-25}| {priorityHint,-5}| {componentName,-26}| {callerLineNumber,4} | {message,-45}| {sourcePath,-sourcePathWidth} | {attributes,10} | {targetPath}";
224231
}
225232

226233
/// <summary>

‎Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Compile Remove="IVirtualFolder.cs" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="ITHit.FileSystem.Windows" Version="7.1.23701.0" />
16+
<PackageReference Include="ITHit.FileSystem.Windows" Version="7.2.23868.0" />
1717
<ProjectReference Include="..\..\..\Common\Common.csproj" />
1818
<ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
1919
</ItemGroup>

‎Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.1.23701.0" />
22+
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.2.23868.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<None Update="log4net.config">

‎Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This is an advanced project with ETags support, Microsoft Office documents editi
4040
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
4141
</ItemGroup>
4242
<ItemGroup>
43-
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.1.23701.0" />
43+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.2.23868.0" />
4444
<ProjectReference Include="..\..\..\Common\Common.csproj" />
4545
<ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
4646
</ItemGroup>

‎Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Copyright>IT HIT LTD.</Copyright>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.1.23701.0" />
15+
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.2.23868.0" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<None Update="log4net.config">

‎Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="log4net" Version="2.0.13" />
2020
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.774.44" />
21-
<PackageReference Include="ITHitWebDAVClient" Version="7.0.4689" />
21+
<PackageReference Include="ITHitWebDAVClient" Version="7.0.4672" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎Windows/WebDAVDrive/WebDAVDrive/VirtualFolder.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,21 +188,21 @@ public async Task<IChanges> GetChangesAsync(string syncToken, bool deep, long? l
188188
if (itemInfo.ChangeType == Change.Changed)
189189
{
190190
itemInfo.AfterAction = async () =>
191-
{
191+
{
192192
if (Engine.Placeholders.TryFindByRemoteStorageId(itemInfo.RemoteStorageItemId, out PlaceholderItem placeholderItem))
193193
{
194194
await placeholderItem.SavePropertiesAsync(itemInfo as FileSystemItemMetadataExt);
195195
}
196196
};
197-
197+
198198
if (Engine.Placeholders.TryFindByRemoteStorageId(itemInfo.RemoteStorageItemId, out PlaceholderItem placeholderItem))
199199
{
200-
if (placeholderItem.TryGetETag(out string eTag) && !eTag.Equals((itemInfo as FileSystemItemMetadataExt).ETag))
200+
if (placeholderItem.TryGetETag(out string eTag) && !(eTag?.Equals((itemInfo as FileSystemItemMetadataExt).ETag) ?? false))
201201
{
202202
itemInfo.ChangeType = Change.MetadataAndContent;
203203
}
204204
}
205-
}
205+
}
206206
changes.Add(itemInfo);
207207
}
208208
}

0 commit comments

Comments
 (0)