v7.1.4792

Author: ITHitBuild

CS/CalDAVServer.FileSystemStorage.AspNet/CalDAVServer.FileSystemStorage.AspNet.csproj

@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>3DFC448C-7D81-4ADD-BBEC-E2D0C00591B6</ProjectGuid>
+    <ProjectGuid>2281EA16-FF31-44C9-BD95-9BB6D43322FA</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -74,6 +74,7 @@
     <Compile Include="Discovery.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="ExtendedAttributes\FileSystemInfoExtension.cs" />
+    <Compile Include="ExtendedAttributes\FileSystemExtendedAttribute.cs" />
     <Compile Include="ExtendedAttributes\IExtendedAttribute.cs" />
     <Compile Include="ExtendedAttributes\LinuxExtendedAttribute.cs" />
     <Compile Include="ExtendedAttributes\OSXExtendedAttribute.cs" />
@@ -123,10 +124,10 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="ITHit.WebDAV.Server">
-      <HintPath>..\packages\ITHit.WebDAV.Server.7.1.4620\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
+      <HintPath>..\packages\ITHit.WebDAV.Server.7.1.4792\lib\net451\ITHit.WebDAV.Server.dll</HintPath>
     </Reference>
     <Reference Include="ITHit.WebDAV.Server.Web">
-      <HintPath>..\packages\ITHit.WebDAV.Server.Web.7.1.4620\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
+      <HintPath>..\packages\ITHit.WebDAV.Server.Web.7.1.4792\lib\net451\ITHit.WebDAV.Server.Web.dll</HintPath>
     </Reference>
   </ItemGroup>
   <PropertyGroup>
@@ -144,7 +145,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>9658</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:18524/</IISUrl>
+          <IISUrl>http://localhost:13414/</IISUrl>
           <NTLMAuthentication>True</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

CS/CalDAVServer.FileSystemStorage.AspNet/DavContext.cs

@@ -14,6 +14,8 @@
 using ITHit.WebDAV.Server.Quota;
 using CalDAVServer.FileSystemStorage.AspNet.Acl;
 using CalDAVServer.FileSystemStorage.AspNet.CalDav;
+using CalDAVServer.FileSystemStorage.AspNet.ExtendedAttributes;
+
 
 
 namespace CalDAVServer.FileSystemStorage.AspNet
@@ -180,6 +182,24 @@ public DavContext(HttpContext httpContext) : base(httpContext)
             RepositoryPath = configRepositoryPath.StartsWith("~") ?
                 HttpContext.Current.Server.MapPath(configRepositoryPath) : configRepositoryPath;
 
+            string attrStoragePath = (ConfigurationManager.AppSettings["AttrStoragePath"] ?? string.Empty).TrimEnd(Path.DirectorySeparatorChar);
+            attrStoragePath = attrStoragePath.StartsWith("~") ?
+                HttpContext.Current.Server.MapPath(attrStoragePath) : attrStoragePath;
+
+            if (!FileSystemInfoExtension.IsUsingFileSystemAttribute)
+            {
+                if (!string.IsNullOrEmpty(attrStoragePath))
+                {
+                    FileSystemInfoExtension.UseFileSystemAttribute(new FileSystemExtendedAttribute(attrStoragePath, this.RepositoryPath));
+                } 
+                else if (!(new DirectoryInfo(RepositoryPath).IsExtendedAttributesSupported()))
+                {
+                    var tempPath = Path.Combine(Path.GetTempPath(), System.Reflection.Assembly.GetExecutingAssembly().GetName().Name);
+                    FileSystemInfoExtension.UseFileSystemAttribute(new FileSystemExtendedAttribute(tempPath, this.RepositoryPath));
+                }
+            }
+
+
             if (!Directory.Exists(RepositoryPath))
             {
                 CalDAVServer.FileSystemStorage.AspNet.Logger.Instance.LogError("Repository path specified in Web.config is invalid.", null);

CS/CalDAVServer.FileSystemStorage.AspNet/DavFile.cs

@@ -229,9 +229,17 @@ public override async Task CopyToAsync(IItemCollectionAsync destFolder, string d
             {
                 File.Copy(fileSystemInfo.FullName, newFilePath);
 
+                var newFileSystemInfo = new FileInfo(newFilePath);
+                if (FileSystemInfoExtension.IsUsingFileSystemAttribute)
+                {
+                    await fileSystemInfo.CopyExtendedAttributes(newFileSystemInfo);
+                }
+
                 // Locks should not be copied, delete them.
                 if (await fileSystemInfo.HasExtendedAttributeAsync("Locks"))
-                    await new FileInfo(newFilePath).DeleteExtendedAttributeAsync("Locks");
+                {
+                    await newFileSystemInfo.DeleteExtendedAttributeAsync("Locks");
+                }
             }
             catch (UnauthorizedAccessException)
             {
@@ -284,8 +292,13 @@ public override async Task MoveToAsync(IItemCollectionAsync destFolder, string d
             {
                 File.Move(fileSystemInfo.FullName, newDirPath);
 
-                // Locks should not be copied, delete them.
                 var newFileInfo = new FileInfo(newDirPath);
+                if (FileSystemInfoExtension.IsUsingFileSystemAttribute)
+                {
+                    await fileSystemInfo.MoveExtendedAttributes(newFileInfo);
+                }
+
+                // Locks should not be copied, delete them.
                 if (await newFileInfo.HasExtendedAttributeAsync("Locks"))
                     await newFileInfo.DeleteExtendedAttributeAsync("Locks");
             }
@@ -307,6 +320,11 @@ public override async Task MoveToAsync(IItemCollectionAsync destFolder, string d
         /// <param name="multistatus">Information about items that failed to delete.</param>
         public override async Task DeleteAsync(MultistatusException multistatus)
         {
+            if (FileSystemInfoExtension.IsUsingFileSystemAttribute)
+            {
+                await fileSystemInfo.DeleteExtendedAttributes();
+            }
+
             fileSystemInfo.Delete();
         }