调整命名空间

Mozi.HttpEmbedded/Mozi.HttpEmbedded.csproj

@@ -103,11 +103,11 @@
     <Compile Include="StatusCode.cs" />
     <Compile Include="Encode\StringEncoder.cs" />
     <Compile Include="TransformHeader.cs" />
-    <Compile Include="WebDav\Exception\ConflictException.cs" />
-    <Compile Include="WebDav\Exception\WebDavException.cs" />
-    <Compile Include="WebDav\Exception\ForbiddenException.cs" />
-    <Compile Include="WebDav\Exception\NotFoundException.cs" />
-    <Compile Include="WebDav\Exception\UnauthorizedException.cs" />
+    <Compile Include="WebDav\Exceptions\ConflictException.cs" />
+    <Compile Include="WebDav\Exceptions\WebDavException.cs" />
+    <Compile Include="WebDav\Exceptions\ForbiddenException.cs" />
+    <Compile Include="WebDav\Exceptions\NotFoundException.cs" />
+    <Compile Include="WebDav\Exceptions\UnauthorizedException.cs" />
     <Compile Include="WebDav\LockProperty.cs" />
     <Compile Include="WebDav\Method\Copy.cs" />
     <Compile Include="WebDav\Method\Delete.cs" />
@@ -121,9 +121,9 @@
     <Compile Include="WebDav\Method\Put.cs" />
     <Compile Include="WebDav\Method\Unlock.cs" />
     <Compile Include="WebDav\Method\MethodHandlerBase.cs" />
-    <Compile Include="WebDav\Storage\BaseClasses\WebDAVStoreBase.cs" />
-    <Compile Include="WebDav\Storage\BaseClasses\WebDAVStoreDocumentBase.cs" />
-    <Compile Include="WebDav\Storage\BaseClasses\WebDAVStoreItemBase.cs" />
+    <Compile Include="WebDav\Storage\Base\WebDAVStoreBase.cs" />
+    <Compile Include="WebDav\Storage\Base\WebDAVStoreDocumentBase.cs" />
+    <Compile Include="WebDav\Storage\Base\WebDAVStoreItemBase.cs" />
     <Compile Include="WebDav\Storage\DiskStore\WebDAVDiskStore.cs" />
     <Compile Include="WebDav\Storage\DiskStore\DiskStoreCollection.cs" />
     <Compile Include="WebDav\Storage\DiskStore\DiskStoreDocument.cs" />

Mozi.HttpEmbedded/WebDav/DAVExtensions.cs

 using System;
 using Mozi.HttpEmbedded.WebDav.Storage;
-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 
 namespace Mozi.HttpEmbedded.WebDav
 {

Mozi.HttpEmbedded/WebDav/DAVServer.cs

 using System.Collections.Generic;
-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 using Mozi.HttpEmbedded.WebDav.Method;
-using Mozi.HttpEmbedded.WebDav.MethodHandlers;
 using Mozi.HttpEmbedded.WebDav.Storage;
 using Mozi.HttpEmbedded.WebDav.Storage.DiskStore;
 

Mozi.HttpEmbedded/WebDav/Exception/ConflictException.cs → Mozi.HttpEmbedded/WebDav/Exceptions/ConflictException.cs

 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Exception
+namespace Mozi.HttpEmbedded.WebDav.Exceptions
 {
     /// <summary>
     /// 409

Mozi.HttpEmbedded/WebDav/Exception/ForbiddenException.cs → Mozi.HttpEmbedded/WebDav/Exceptions/ForbiddenException.cs

 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Exception
+namespace Mozi.HttpEmbedded.WebDav.Exceptions
 {
     /// <summary>
     /// 403

Mozi.HttpEmbedded/WebDav/Exception/NotFoundException.cs → Mozi.HttpEmbedded/WebDav/Exceptions/NotFoundException.cs

 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Exception
+namespace Mozi.HttpEmbedded.WebDav.Exceptions
 {
     /// <summary>
     /// 404

Mozi.HttpEmbedded/WebDav/Exception/UnauthorizedException.cs → Mozi.HttpEmbedded/WebDav/Exceptions/UnauthorizedException.cs

 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Exception
+namespace Mozi.HttpEmbedded.WebDav.Exceptions
 {
     /// <summary>
     /// 

Mozi.HttpEmbedded/WebDav/Exception/WebDavException.cs → Mozi.HttpEmbedded/WebDav/Exceptions/WebDavException.cs

 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Exception
+namespace Mozi.HttpEmbedded.WebDav.Exceptions
 {
     /// <summary>
     /// </summary>
     [Serializable]
-    public class WebDavException : Exception
+    public class WebDavException : System.Exception
     {
         private StatusCode _status;
         private string message;
 
         public override string Message { get; }
 
-        public WebDavException(StatusCode status, string message, Exception innerException)
+        public WebDavException(StatusCode status, string message, System.Exception innerException)
         {
             _status = status;
             Message = message;

Mozi.HttpEmbedded/WebDav/Method/Copy.cs

 using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.Encode;
-using Mozi.HttpEmbedded.WebDav.MethodHandlers;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
 namespace Mozi.HttpEmbedded.WebDav.Method
@@ -23,27 +22,27 @@ namespace Mozi.HttpEmbedded.WebDav.Method
             IWebDavStoreItem source = WebDavExtensions.GetStoreItem(context.Request.Path, store);
             if (source is IWebDavStoreDocument || source is IWebDavStoreCollection)
             {
-                string destinationUri = context.Request.Headers["Destination"];
-                IWebDavStoreCollection destinationParentCollection = GetParentCollection(store, destinationUri);
+                string destPath = context.Request.Headers["destItem"];
+                IWebDavStoreCollection destParentCollection = GetParentCollection(store, destPath);
 
                 bool copyContent = GetDepthHeader(context.Request) != 0;
                 bool isNew = true;
-                UrlTree ut = new UrlTree(destinationUri);
-                string destinationName = UrlEncoder.Decode(ut.Last().TrimEnd('/', '\\'));
-                IWebDavStoreItem destination = destinationParentCollection.GetItemByName(destinationName);
+                UrlTree ut = new UrlTree(destPath);
+                string destName = UrlEncoder.Decode(ut.Last().TrimEnd('/', '\\'));
+                IWebDavStoreItem destItem = destParentCollection.GetItemByName(destName);
 
-                if (destination != null)
+                if (destItem != null)
                 {
-                    if (source.ItemPath == destination.ItemPath)
+                    if (source.ItemPath == destItem.ItemPath)
                         return StatusCode.Forbidden;
                     if (!GetOverwriteHeader(context.Request))
                         return StatusCode.PreconditionFailed;
-                    if (destination is IWebDavStoreCollection)
-                        destinationParentCollection.Delete(destination);
+                    if (destItem is IWebDavStoreCollection)
+                        destParentCollection.Delete(destItem);
                     isNew = false;
                 }
 
-                destinationParentCollection.CopyItemHere(source, destinationName, copyContent);
+                destParentCollection.CopyItemHere(source, destName, copyContent);
                 return isNew ? StatusCode.Created : StatusCode.NoContent;
             }
             else

Mozi.HttpEmbedded/WebDav/Method/Delete.cs

-using Mozi.HttpEmbedded.WebDav.MethodHandlers;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
 namespace Mozi.HttpEmbedded.WebDav.Method

Mozi.HttpEmbedded/WebDav/Method/Head.cs

 using Mozi.HttpEmbedded.Source;
-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     ///  <c>PROPFIND</c> WebDAV윈嵐렘랬

Mozi.HttpEmbedded/WebDav/Method/IMethodHandler.cs

 using Mozi.HttpEmbedded.WebDav.Storage;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     /// </summary>

Mozi.HttpEmbedded/WebDav/Method/Lock.cs

 using System;
-using System.Text;
 using System.Xml;
 using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.Encode;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     ///  <c>LOCK</c> WebDAV扩展方法
@@ -88,8 +87,8 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
                 collection.CreateDocument(ut.Last().TrimEnd('/', '\\'));
                 isNew = true;
             }
-           
-            
+
+
 
             /***************************************************************************************************
              * Create the body for the response
@@ -97,7 +96,7 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
 
             //实例化XML文档
             XmlDocument responseDoc = new XmlDocument();
-            string responseXml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><D:prop " +"xmlns:D=\"DAV:\"><D:lockdiscovery><D:activelock/></D:lockdiscovery></D:prop>";
+            string responseXml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><D:prop " + "xmlns:D=\"DAV:\"><D:lockdiscovery><D:activelock/></D:lockdiscovery></D:prop>";
             responseDoc.LoadXml(responseXml);
 
             //锁定节点
@@ -113,9 +112,9 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
             activelock.AppendChild(timeoutProperty.ToXmlElement(responseDoc));
 
             // depth头属性
-            WebDavProperty depthProperty = new WebDavProperty("depth", (depth == 0 ? "0" : "Infinity"));
+            WebDavProperty depthProperty = new WebDavProperty("depth", depth == 0 ? "0" : "Infinity");
             activelock.AppendChild(depthProperty.ToXmlElement(responseDoc));
-            
+
             // locktoken头属性
             WebDavProperty locktokenProperty = new WebDavProperty("locktoken", "");
             XmlElement locktokenElement = locktokenProperty.ToXmlElement(responseDoc);

Mozi.HttpEmbedded/WebDav/Method/MethodHandlerBase.cs

@@ -2,9 +2,9 @@
 using Mozi.HttpEmbedded.Encode;
 using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.WebDav.Storage;
-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     /// </summary>
@@ -21,9 +21,9 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
             }
             catch (UnauthorizedAccessException)
             {
-                throw  new WebDavUnauthorizedException();
+                throw new WebDavUnauthorizedException();
             }
-            catch(WebDavNotFoundException)
+            catch (WebDavNotFoundException)
             {
                 throw new WebDavConflictException();
             }
@@ -51,32 +51,30 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
             {
                 throw new WebDavNotFoundException();
             }
-            if (item == null)
-                throw new WebDavNotFoundException();
-
-            return item;
+            if (item != null)
+            {
+                return item;
+            }
+            throw new WebDavNotFoundException();
         }
 
         public static int GetDepthHeader(HttpRequest request)
         {
             string depth = request.Headers["Depth"];
 
-            if (string.IsNullOrEmpty(depth) || depth.Equals("infinity"))
-            {
-                return DepthInfinity;
-            }
-
-            int value;
-            if (!int.TryParse(depth, out value))
+            if (!string.IsNullOrEmpty(depth) && !depth.Equals("infinity"))
             {
+                int value;
+                if (int.TryParse(depth, out value))
+                {
+                    if (value == 0 || value == 1)
+                    {
+                        return value;
+                    }
+                    return DepthInfinity;
+                }
                 return DepthInfinity;
             }
-
-            if (value == 0 || value == 1)
-            {
-                return value;
-            }
-
             return DepthInfinity;
         }
 
@@ -98,15 +96,14 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
             }
             return timeout;
         }
-        public static Uri GetDestinationHeader(HttpRequest request)
+        public static Uri GetdestItemHeader(HttpRequest request)
         {
-            string destinationUri = request.Headers["Destination"];
+            string destPath = request.Headers["destItem"];
 
-           
-            if (!string.IsNullOrEmpty(destinationUri))
-                return new Uri(destinationUri);
-            
-            throw new WebDavConflictException();
+
+            if (string.IsNullOrEmpty(destPath))
+                throw new WebDavConflictException();
+            return new Uri(destPath);
         }
     }
 }

Mozi.HttpEmbedded/WebDav/Method/MkCol.cs

@@ -2,7 +2,7 @@ using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.Encode;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     ///  <c>MKCOL</c> WebDAVչ
@@ -19,17 +19,19 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
         /// <param name="store"><see cref="IWebDavStore" /> <see cref="DavServer" /></param>
         public StatusCode ProcessRequest(DavServer server, HttpContext context, IWebDavStore store)
         {
-            if (context.Request.Body.Length > 0)
-                return StatusCode.UnsupportedMediaType;
-            IWebDavStoreCollection collection = GetParentCollection(store, context.Request.Path.Replace("/","\\"));
-            UrlTree ut = new UrlTree(context.Request.Path);
-            string collectionName = UrlEncoder.Decode(ut.Last().TrimEnd('/', '\\'));
-            if (collection.GetItemByName(collectionName) != null)
-                return StatusCode.MethodNotAllowed;
+            if (context.Request.Body.Length == 0)
+            {
+                IWebDavStoreCollection collection = GetParentCollection(store, context.Request.Path.Replace("/", "\\"));
+                UrlTree ut = new UrlTree(context.Request.Path);
+                string collectionName = UrlEncoder.Decode(ut.Last().TrimEnd('/', '\\'));
+                if (collection.GetItemByName(collectionName) != null)
+                    return StatusCode.MethodNotAllowed;
 
-            collection.CreateCollection(collectionName);
+                collection.CreateCollection(collectionName);
 
-            return StatusCode.Success;
+                return StatusCode.Success;
+            }
+            return StatusCode.UnsupportedMediaType;
         }
     }
 }
\ No newline at end of file

Mozi.HttpEmbedded/WebDav/Method/Move.cs

@@ -2,7 +2,7 @@ using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.Encode;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     ///  <c>MOVE</c> WebDAVչ
@@ -21,24 +21,30 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
         {
             var source = WebDavExtensions.GetStoreItem(context.Request.Path, store);
 
-            string destinationUri = context.Request.Headers["Destination"];
-            IWebDavStoreCollection destinationParentCollection = GetParentCollection(store, destinationUri);
+            string destPath = context.Request.Headers["destItem"];
+            IWebDavStoreCollection destParentCollection = GetParentCollection(store, destPath);
 
             bool isNew = true;
-            UrlTree ut = new UrlTree(destinationUri);
-            string destinationName = UrlEncoder.Decode(ut.Last().TrimEnd('/', '\\'));
-            IWebDavStoreItem destination = destinationParentCollection.GetItemByName(destinationName);
-            if (destination != null)
+            UrlTree ut = new UrlTree(destPath);
+            string destName = UrlEncoder.Decode(ut.Last().TrimEnd('/', '\\'));
+            IWebDavStoreItem destItem = destParentCollection.GetItemByName(destName);
+            if (destItem != null)
             {
-                if (source.ItemPath == destination.ItemPath)
+                if (source.ItemPath == destItem.ItemPath)
+                {
                     return StatusCode.Forbidden;
+                }
+
                 if (!GetOverwriteHeader(context.Request))
+                {
                     return StatusCode.PreconditionFailed;
-                destinationParentCollection.Delete(destination);
+                }
+
+                destParentCollection.Delete(destItem);
                 isNew = false;
             }
 
-            destinationParentCollection.MoveItemHere(source, destinationName);
+            destParentCollection.MoveItemHere(source, destName);
 
             return StatusCode.Success;
         }

Mozi.HttpEmbedded/WebDav/Method/Propfind.cs

 using System;
 using System.Collections.Generic;
 using System.Xml;
-using Mozi.HttpEmbedded.WebDav.MethodHandlers;
 using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.Encode;
 using Mozi.HttpEmbedded.WebDav.Storage;
-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 
 namespace Mozi.HttpEmbedded.WebDav.Method
 {
@@ -15,7 +14,7 @@ namespace Mozi.HttpEmbedded.WebDav.Method
     internal class Propfind : MethodHandlerBase, IMethodHandler
     {
         private string _requestUri;
-        private List<WebDavProperty> _requestedProperties;
+        private List<WebDavProperty> _reqProps;
         private List<IWebDavStoreItem> _webDavStoreItems;
 
         /// <summary>
@@ -46,7 +45,7 @@ namespace Mozi.HttpEmbedded.WebDav.Method
             XmlDocument requestDoc = GetXmlDocument(context.Request);
 
             //提取请求信息
-            _requestedProperties = new List<WebDavProperty>();
+            _reqProps = new List<WebDavProperty>();
             if (requestDoc.DocumentElement != null)
             {
                 if (requestDoc.DocumentElement.LocalName != "propfind")
@@ -61,25 +60,25 @@ namespace Mozi.HttpEmbedded.WebDav.Method
                         switch (n.LocalName)
                         {
                             case "allprop":
-                                _requestedProperties = GetAllProperties();
+                                _reqProps = GetAllProperties();
                                 break;
                             case "propname":
                                 isPropname = true;
-                                _requestedProperties = GetAllProperties();
+                                _reqProps = GetAllProperties();
                                 break;
                             case "prop":
                                 foreach (XmlNode child in n.ChildNodes)
-                                    _requestedProperties.Add(new WebDavProperty(child.LocalName, "", child.NamespaceURI));
+                                    _reqProps.Add(new WebDavProperty(child.LocalName, "", child.NamespaceURI));
                                 break;
                             default:
-                                _requestedProperties.Add(new WebDavProperty(n.LocalName, "", n.NamespaceURI));
+                                _reqProps.Add(new WebDavProperty(n.LocalName, "", n.NamespaceURI));
                                 break;
                         }
                     }
                 }
             }
             else
-                _requestedProperties = GetAllProperties();
+                _reqProps = GetAllProperties();
             XmlDocument responseDoc = ResponseDocument(context, isPropname, StatusCode.Success);
 
 
@@ -242,7 +241,7 @@ namespace Mozi.HttpEmbedded.WebDav.Method
                 WebDavProperty propProperty = new WebDavProperty("prop", "");
                 XmlElement propElement = propProperty.ToXmlElement(responseDoc);
 
-                foreach (WebDavProperty davProperty in _requestedProperties)
+                foreach (WebDavProperty davProperty in _reqProps)
                 {
                     propElement.AppendChild(PropChildElement(davProperty, responseDoc, webDavStoreItem, propname));
                 }

Mozi.HttpEmbedded/WebDav/Method/Proppatch.cs

 using System;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml;
 using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.Encode;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     ///  <c>PROPPATCH</c> WebDAV扩展方法
@@ -25,7 +24,7 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
         /// <param name="store"><see cref="IWebDavStore" /><see cref="DavServer" /></param>
         public StatusCode ProcessRequest(DavServer server, HttpContext context, IWebDavStore store)
         {
-           
+
             string requestUri = context.Request.Path;
 
             XmlNamespaceManager manager = null;
@@ -63,10 +62,6 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
                 Log.Warn(ex.Message);
             }
 
-            /***************************************************************************************************
-             * Take action
-             ***************************************************************************************************/
-
             //父目录资源清单
             IWebDavStoreCollection collection = GetParentCollection(store, context.Request.Path);
 
@@ -115,20 +110,20 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
             WebDavProperty propstatProperty = new WebDavProperty("propstat", "");
             XmlElement propstatElement = propstatProperty.ToXmlElement(responseDoc);
 
-            WebDavProperty statusProperty = new WebDavProperty("status", "HTTP/1.1 " + context.Response.Status.Code + " " +context.Response.Status.Text);
+            WebDavProperty statusProperty = new WebDavProperty("status", "HTTP/1.1 " + context.Response.Status.Code + " " + context.Response.Status.Text);
             propstatElement.AppendChild(statusProperty.ToXmlElement(responseDoc));
 
-           
+
             foreach (WebDavProperty property in from XmlNode child in propNode.ChildNodes
-                where child.Name.ToLower()
-                    .Contains("creationtime") || child.Name.ToLower()
-                        .Contains("fileattributes") || child.Name.ToLower()
-                            .Contains("lastaccesstime") || child.Name.ToLower()
-                                .Contains("lastmodifiedtime")
-                let node = propNode.SelectSingleNode(child.Name, manager)
-                select node != null
-                    ? new WebDavProperty(child.LocalName, "", node.NamespaceURI)
-                    : new WebDavProperty(child.LocalName, "", ""))
+                                                where child.Name.ToLower()
+                                                    .Contains("creationtime") || child.Name.ToLower()
+                                                        .Contains("fileattributes") || child.Name.ToLower()
+                                                            .Contains("lastaccesstime") || child.Name.ToLower()
+                                                                .Contains("lastmodifiedtime")
+                                                let node = propNode.SelectSingleNode(child.Name, manager)
+                                                select node != null
+                                                    ? new WebDavProperty(child.LocalName, "", node.NamespaceURI)
+                                                    : new WebDavProperty(child.LocalName, "", ""))
                 propstatElement.AppendChild(property.ToXmlElement(responseDoc));
 
             responseNode.AppendChild(propstatElement);
@@ -137,7 +132,7 @@ namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
             byte[] responseBytes = StringEncoder.Encode(resp);
 
             context.Response.Headers.Add(HeaderProperty.ContentType.PropertyTag, "text/xml");
-            
+
             context.Response.Write(responseBytes);
 
             return StatusCode.MultiStatus;

Mozi.HttpEmbedded/WebDav/Method/Put.cs

 using System.IO;
 using Mozi.HttpEmbedded.Common;
 using Mozi.HttpEmbedded.Encode;
-using Mozi.HttpEmbedded.WebDav.MethodHandlers;
 using Mozi.HttpEmbedded.WebDav.Storage;
 
 namespace Mozi.HttpEmbedded.WebDav.Method

Mozi.HttpEmbedded/WebDav/Method/Unlock.cs

 using Mozi.HttpEmbedded.WebDav.Storage;
 
-namespace Mozi.HttpEmbedded.WebDav.MethodHandlers
+namespace Mozi.HttpEmbedded.WebDav.Method
 {
     /// <summary>
     ///  <c>PUT</c> WebDAV扩展方法

Mozi.HttpEmbedded/WebDav/Storage/BaseClasses/WebDAVStoreBase.cs → Mozi.HttpEmbedded/WebDav/Storage/Base/WebDAVStoreBase.cs

 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Storage.BaseClasses
+namespace Mozi.HttpEmbedded.WebDav.Storage.Base
 {
     /// <summary>
     /// This class is a base class for <see cref="IWebDavStore" /> implementations.

Mozi.HttpEmbedded/WebDav/Storage/BaseClasses/WebDAVStoreDocumentBase.cs → Mozi.HttpEmbedded/WebDav/Storage/Base/WebDAVStoreDocumentBase.cs

 using Mozi.HttpEmbedded.Source;
 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Storage.BaseClasses
+namespace Mozi.HttpEmbedded.WebDav.Storage.Base
 {
     /// <summary>
     /// This is the base class for <see cref="IWebDavStoreItem" /> implementations.

Mozi.HttpEmbedded/WebDav/Storage/BaseClasses/WebDAVStoreItemBase.cs → Mozi.HttpEmbedded/WebDav/Storage/Base/WebDAVStoreItemBase.cs

-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 using System;
 
-namespace Mozi.HttpEmbedded.WebDav.Storage.BaseClasses
+namespace Mozi.HttpEmbedded.WebDav.Storage.Base
 {
     /// <summary>
     /// This is the base class for <see cref="IWebDavStoreItem" /> implementations.

Mozi.HttpEmbedded/WebDav/Storage/DiskStore/DiskStoreCollection.cs

-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -325,22 +325,22 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
         /// Copies an existing store item into this collection, overwriting any existing items.
         /// </summary>
         /// <param name="source">The store item to copy from.</param>
-        /// <param name="destinationName">The name of the copy to create of <paramref name="source" />.</param>
+        /// <param name="destName">The name of the copy to create of <paramref name="source" />.</param>
         /// <param name="includeContent">The boolean for copying the containing files/folders or not.</param>
         /// <returns>
         /// The created <see cref="IWebDavStoreItem" /> instance.
         /// </returns>
         /// <exception cref="WebDavUnauthorizedException">If the user is unauthorized or has no access</exception>
-        public IWebDavStoreItem CopyItemHere(IWebDavStoreItem source, string destinationName, bool includeContent)
+        public IWebDavStoreItem CopyItemHere(IWebDavStoreItem source, string destName, bool includeContent)
         {
-            string destinationItemPath = Path.Combine(ItemPath, destinationName);
+            string destItemItemPath = Path.Combine(ItemPath, destName);
 
             if (source.IsCollection)
             {
                 try
                 {
                     WindowsImpersonationContext wic = Identity.Impersonate();
-                    DirectoryCopy(source.ItemPath, destinationItemPath, true);
+                    DirectoryCopy(source.ItemPath, destItemItemPath, true);
                     wic.Undo();
                 }
                 catch
@@ -348,8 +348,8 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
                     throw new WebDavUnauthorizedException();
                 }
 
-                DiskStoreCollection collection = new DiskStoreCollection(this, destinationItemPath);
-                _items.Add(destinationName, new WeakReference(collection));
+                DiskStoreCollection collection = new DiskStoreCollection(this, destItemItemPath);
+                _items.Add(destName, new WeakReference(collection));
                 return collection;
             }
 
@@ -357,7 +357,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
             try
             {
                 WindowsImpersonationContext wic = Identity.Impersonate();
-                System.IO.File.Copy(source.ItemPath, destinationItemPath, true);
+                System.IO.File.Copy(source.ItemPath, destItemItemPath, true);
                 wic.Undo();
             }
             catch
@@ -365,8 +365,8 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
                 throw new WebDavUnauthorizedException();
             }
 
-            DiskStoreDocument document = new DiskStoreDocument(this, destinationItemPath);
-            _items.Add(destinationName, new WeakReference(document));
+            DiskStoreDocument document = new DiskStoreDocument(this, destItemItemPath);
+            _items.Add(destName, new WeakReference(document));
             return document;
 
         }
@@ -392,7 +392,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
                     + sourceDirName);
             }
 
-            // If the destination directory doesn't exist, create it. 
+            // If the destItem directory doesn't exist, create it. 
             if (!Directory.Exists(destDirName))
             {
                 Directory.CreateDirectory(destDirName);
@@ -413,7 +413,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
         /// Moves an existing store item into this collection, overwriting any existing items.
         /// </summary>
         /// <param name="source">The store item to move.</param>
-        /// <param name="destinationName">The
+        /// <param name="destName">The
         /// <see cref="IWebDavStoreItem" /> that refers to the item that was moved,
         /// in its new location.</param>
         /// <returns>
@@ -425,7 +425,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
         /// Note that the method should fail without creating or overwriting content in the
         /// target collection if the move cannot go through.
         /// </remarks>
-        public IWebDavStoreItem MoveItemHere(IWebDavStoreItem source, string destinationName)
+        public IWebDavStoreItem MoveItemHere(IWebDavStoreItem source, string destName)
         {
 
             string sourceItemPath = "";
@@ -438,7 +438,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
             }
 
 
-            string destinationItemPath = Path.Combine(ItemPath, destinationName);
+            string destItemItemPath = Path.Combine(ItemPath, destName);
 
 
             if (source.IsCollection)
@@ -447,7 +447,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
                 {
 
                     WindowsImpersonationContext wic = Identity.Impersonate();
-                    Directory.Move(sourceItemPath, destinationItemPath);
+                    Directory.Move(sourceItemPath, destItemItemPath);
                     wic.Undo();
                 }
                 catch
@@ -456,8 +456,8 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
                 }
 
 
-                var collection = new DiskStoreCollection(this, destinationItemPath);
-                _items.Add(destinationName, new WeakReference(collection));
+                var collection = new DiskStoreCollection(this, destItemItemPath);
+                _items.Add(destName, new WeakReference(collection));
                 return collection;
             }
 
@@ -465,7 +465,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
             {
 
                 WindowsImpersonationContext wic = Identity.Impersonate();
-                System.IO.File.Move(sourceItemPath, destinationItemPath);
+                System.IO.File.Move(sourceItemPath, destItemItemPath);
                 wic.Undo();
             }
             catch
@@ -474,8 +474,8 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
             }
 
 
-            DiskStoreDocument document = new DiskStoreDocument(this, destinationItemPath);
-            _items.Add(destinationName, new WeakReference(document));
+            DiskStoreDocument document = new DiskStoreDocument(this, destItemItemPath);
+            _items.Add(destName, new WeakReference(document));
             return document;
 
         }

Mozi.HttpEmbedded/WebDav/Storage/DiskStore/DiskStoreDocument.cs

@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Security.Principal;
 using Mozi.HttpEmbedded.Source;
-using Mozi.HttpEmbedded.WebDav.Exception;
+using Mozi.HttpEmbedded.WebDav.Exceptions;
 using Mozi.HttpEmbedded.WebDav.Utilities;
 
 namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
@@ -59,7 +59,7 @@ namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
         {
             get
             {
-                return Md5Util.Md5HashStringForUtf8String(ItemPath + ModificationDate + Hidden + Size);
+                return Md5Util.Md5Hash4Utf8String(ItemPath + ModificationDate + Hidden + Size);
             }
         }
 

Mozi.HttpEmbedded/WebDav/Storage/DiskStore/DiskStoreItem.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Security.Principal;
 using System.Threading;
-using Mozi.HttpEmbedded.WebDav.Storage.BaseClasses;
+using Mozi.HttpEmbedded.WebDav.Storage.Base;
 
 namespace Mozi.HttpEmbedded.WebDav.Storage.DiskStore
 {

Mozi.HttpEmbedded/WebDav/Storage/IWebDAVStoreCollection.cs

@@ -58,18 +58,18 @@ namespace Mozi.HttpEmbedded.WebDav.Storage
         /// Copies an existing store item into this collection, overwriting any existing items.
         /// </summary>
         /// <param name="source">The store item to copy from.</param>
-        /// <param name="destinationName">The name of the copy to create of <paramref name="source" />.</param>
+        /// <param name="destName">The name of the copy to create of <paramref name="source" />.</param>
         /// <param name="includeContent">The boolean for copying the containing files/folders or not.</param>
         /// <returns>
         /// The created <see cref="IWebDavStoreItem" /> instance.
         /// </returns>
-        IWebDavStoreItem CopyItemHere(IWebDavStoreItem source, string destinationName, bool includeContent);
+        IWebDavStoreItem CopyItemHere(IWebDavStoreItem source, string destName, bool includeContent);
 
         /// <summary>
         /// Moves an existing store item into this collection, overwriting any existing items.
         /// </summary>
         /// <param name="source">The store item to move.</param>
-        /// <param name="destinationName">The 
+        /// <param name="destName">The 
         /// <see cref="IWebDavStoreItem" /> that refers to the item that was moved,
         /// in its new location.</param>
         /// <returns>
@@ -79,6 +79,6 @@ namespace Mozi.HttpEmbedded.WebDav.Storage
         /// Note that the method should fail without creating or overwriting content in the
         /// target collection if the move cannot go through.
         /// </remarks>
-        IWebDavStoreItem MoveItemHere(IWebDavStoreItem source, string destinationName);
+        IWebDavStoreItem MoveItemHere(IWebDavStoreItem source, string destName);
     }
 }
\ No newline at end of file

Mozi.HttpEmbedded/WebDav/Utilities/Md5Util.cs

@@ -5,15 +5,9 @@ using Mozi.HttpEmbedded.Encode;
 
 namespace Mozi.HttpEmbedded.WebDav.Utilities
 {
-    /// <summary>
-    /// For generating an MD5 hash
-    /// </summary>
-    /// <remarks>
-    /// Source: <see href="https://gist.github.com/kristopherjohnson/3021045" />
-    /// </remarks>
     internal static class Md5Util
     {
-        public static string Md5HashStringForUtf8String(string s)
+        public static string Md5Hash4Utf8String(string s)
         {
             byte[] bytes =StringEncoder.Encode(s);
 
@@ -22,14 +16,6 @@ namespace Mozi.HttpEmbedded.WebDav.Utilities
  
             return HexStringFromBytes(hashBytes);
         }
-
-        /// <summary>
-        /// Convert an array of bytes to a string of hex digits
-        /// </summary>
-        /// <param name="bytes">Array of bytes</param>
-        /// <returns>
-        /// String of hex digits
-        /// </returns>
         public static string HexStringFromBytes(byte[] bytes)
         {
             StringBuilder sb = new StringBuilder();