Skip to content

Commit 1a5b7d7

Browse files
ITHitBuildITHitBuild
committed
v5.5.15752.0-Beta2
1 parent 183402d commit 1a5b7d7

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

+303
-1297
lines changed

‎Common/Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<Platforms>AnyCPU;x64</Platforms>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ITHit.FileSystem" Version="5.0.15216.0-Beta" />
13+
<PackageReference Include="ITHit.FileSystem" Version="5.5.15752.0-Beta2" />
1414
</ItemGroup>
1515
</Project>

‎README.md‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1 @@
1-
2-
<h1>User-mode File System Examples for Windows and macOS in .NET/C#</h1>
3-
<div class="description"></div>
4-
<ul class="list">
5-
<li>
6-
<a class="link-header" href="https://github.com/ITHit/UserFileSystemSamples/tree/master/Windows/VirtualFileSystem">
7-
<h2>Virtual File System Sample in .NET, C#</h2>
8-
</a>
9-
10-
<a href="https://github.com/ITHit/UserFileSystemSamples/tree/master/Windows/VirtualFileSystem">
11-
<p>
12-
This sample implements a virtual file system with synchronization support, on-demand loading,&nbsp;selective offline files support, upload and download progress, and error reporting. It synchronizes files and folders both from remote storage to the user f <span>...</span>
13-
</p>
14-
</a>
15-
</li>
16-
<li>
17-
<a class="link-header" href="https://github.com/ITHit/UserFileSystemSamples/tree/master/macOS">
18-
<h2>Virtual File System Sample for Mac in .NET, C#</h2>
19-
</a>
20-
21-
<a href="https://github.com/ITHit/UserFileSystemSamples/tree/master/macOS">
22-
<p>
23-
This sample implements a virtual file system for Mac with synchronization support and folders on-demand listing.&nbsp;It synchronizes files and folders both from remote storage to the user file system and from the user file system to remote storage. This <span>...</span>
24-
</p>
25-
</a>
26-
</li>
27-
<li>
28-
<a class="link-header" href="https://github.com/ITHit/UserFileSystemSamples/tree/master/Windows/VirtualDrive/">
29-
<h2>Virtual Drive Sample in .NET, C#</h2>
30-
</a>
31-
32-
<a href="https://github.com/ITHit/UserFileSystemSamples/tree/master/Windows/VirtualDrive/">
33-
<p>
34-
This is a virtual drive implementation with thumbnail support, Microsoft Office and AutoCAD documents editing support, and automatic Microsoft Office/AutoCAD documents locking. It also demonstrates custom column support in Windows File Manager.&nbsp;To si <span>...</span>
35-
</p>
36-
</a>
37-
</li>
38-
<li>
39-
<a class="link-header" href="https://github.com/ITHit/UserFileSystemSamples/tree/master/Windows/WebDAVDrive/">
40-
<h2>WebDAV Drive Sample in .NET, C#</h2>
41-
</a>
42-
43-
<a href="https://github.com/ITHit/UserFileSystemSamples/tree/master/Windows/WebDAVDrive/">
44-
<p>
45-
This sample implements a virtual file system that displays documents from a WebDAV server. You can edit documents, upload and download documents as well as manage folders structure using Windows File Manager. This sample provides automatic documents <span>...</span>
46-
</p>
47-
</a>
48-
</li>
49-
</ul>
50-
1+
��

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Include="ITHit.FileSystem.Windows" Version="5.0.15216.0-Beta" />
23+
<PackageReference Include="ITHit.FileSystem.Windows" Version="5.5.15752.0-Beta2" />
2424
<ProjectReference Include="..\..\..\Common\Common.csproj" />
2525
</ItemGroup>
2626
</Project>

‎Windows/Common/Core/FsPath.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Threading.Tasks;
66
using Windows.Storage;
77
using FileAttributes = System.IO.FileAttributes;
8+
using ITHit.FileSystem.Windows;
89

910
namespace ITHit.FileSystem.Samples.Common.Windows
1011
{
@@ -103,7 +104,7 @@ public static string GetAttString(string path)
103104
{
104105
try
105106
{
106-
return Convert.ToString((int)File.GetAttributes(path), 2);
107+
return PlaceholderItem.GetFileAttributeLetters(File.GetAttributes(path));
107108
}
108109
catch
109110
{

‎Windows/Common/Core/LogFormatter.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,16 @@ private void WriteLog(IEngine sender, EngineMessageEventArgs e, log4net.Core.Lev
198198
//targetPath = targetPath?.Replace(remoteStorageRootPath, "<RS root>");
199199
//}
200200

201-
string message = Format(DateTimeOffset.Now.ToString("hh:mm:ss.fff"), process, priorityHint?.ToString(), fileId, "", e.ComponentName, e.Message, sourcePath, att, targetPath);
201+
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);
202202

203203
if (level == log4net.Core.Level.Error)
204204
{
205205
Exception ex = ((EngineErrorEventArgs)e).Exception;
206-
message += Environment.NewLine;
207-
log.Error(message, ex);
206+
if (ex != null)
207+
{
208+
message += Environment.NewLine;
209+
log.Error(message, ex);
210+
}
208211
}
209212
else if (level == log4net.Core.Level.Info)
210213
{
@@ -217,19 +220,19 @@ private void WriteLog(IEngine sender, EngineMessageEventArgs e, log4net.Core.Lev
217220

218221
}
219222

220-
private static string Format(string date, string process, string priorityHint, string fileId, string remoteStorageId, string componentName, string message, string sourcePath, string attributes, string targetPath)
223+
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)
221224
{
222225
// {fileId,-18} | {remoteStorageId,-remoteStorageIdWidth}
223-
return $"{Environment.NewLine}|{date, -12}| {process,-25}| {priorityHint,-5}| {componentName,-26}| {message,-45}| {sourcePath,-sourcePathWidth} | {attributes, 23 } | {targetPath}";
226+
return $"{Environment.NewLine}|{date, -12}| {process,-25}| {priorityHint,-5}| {componentName,-26}| {callerLineNumber, 4} | {message,-45}| {sourcePath,-sourcePathWidth} | {attributes, 23 } | {targetPath}";
224227
}
225228

226229
/// <summary>
227230
/// Prints logging data headers.
228231
/// </summary>
229232
private void PrintHeader()
230233
{
231-
log.Info(Format("Time", "Process Name", "Prty", "FS ID", "RS ID", "Component", "Message", "Source Path", "Attributes", "Target Path"));
232-
log.Info(Format("----", "------------", "----", "_____", "_____", "---------", "-------", "-----------", "----------", "-----------"));
234+
log.Info(Format("Time", "Process Name", "Prty", "FS ID", "RS ID", "Component", "Line", "Caller Member Name", "Caller File Path", "Message", "Source Path", "Attributes", "Target Path"));
235+
log.Info(Format("----", "------------", "----", "_____", "_____", "---------", "____", "------------------", "----------------", "-------", "-----------", "----------", "-----------"));
233236
}
234237
}
235238

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@
99
<Platforms>AnyCPU;x64</Platforms>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<Compile Remove="ETagManager.cs" />
13-
<Compile Remove="ExternalDataManager.cs" />
14-
<Compile Remove="FilteredDocsMonitor.cs" />
15-
<Compile Remove="IMapping.cs" />
16-
<Compile Remove="LockManager.cs" />
17-
<Compile Remove="ServerToClientSync.cs" />
18-
</ItemGroup>
19-
<ItemGroup>
20-
<PackageReference Include="ITHit.FileSystem.Windows" Version="5.0.15216.0-Beta" />
12+
<PackageReference Include="ITHit.FileSystem.Windows" Version="5.5.15752.0-Beta2" />
2113
<ProjectReference Include="..\..\..\Common\Common.csproj" />
2214
<ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
2315
</ItemGroup>

0 commit comments

Comments
 (0)