Introduced HTML input helpers

Author: FlorianRappl

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.12.0
+
+Released on Thursday, May 2 2019.
+
+- Reference latest AngleSharp
+- Added `InputFile` class as a standard `IFile` implementation
+- Added `AppendFile` extensions for `IHtmlInputElement`
+
 # 0.10.1
 
 Released on Monday, January 7 2019.

src/AngleSharp.Io.Tests/DisposableStream.cs

@@ -5,26 +5,14 @@
 
     sealed class DisposableStream : Stream
     {
-        public override Boolean CanRead
-        {
-            get { return false; }
-        }
-
-        public override Boolean CanSeek
-        {
-            get { return false; }
-        }
-
-        public override Boolean CanWrite
-        {
-            get { return false; }
-        }
-
-        public override Int64 Length
-        {
-            get { return 0; }
-        }
-
+        public override Boolean CanRead => false;
+
+        public override Boolean CanSeek => false;
+
+        public override Boolean CanWrite => false;
+
+        public override Int64 Length => 0;
+
         public override Int64 Position
         {
             get;

src/AngleSharp.Io/Dom/HtmlInputElementExtensions.cs

@@ -0,0 +1,51 @@
+namespace AngleSharp.Io.Dom
+{
+    using AngleSharp.Html;
+    using AngleSharp.Html.Dom;
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// Extensions for the HTML Input element.
+    /// </summary>
+    public static class HtmlInputElementExtensions
+    {
+        /// <summary>
+        /// Appends a file to the input element.
+        /// Requires the input element to be of type "file".
+        /// </summary>
+        /// <param name="input">The input to append to.</param>
+        /// <param name="file">The file to append.</param>
+        /// <returns>The input itself for chaining.</returns>
+        public static IHtmlInputElement AppendFile(this IHtmlInputElement input, InputFile file)
+        {
+            input = input ?? throw new ArgumentNullException(nameof(input));
+
+            if (input.Type == InputTypeNames.File)
+            {
+                input.Files.Add(file ?? throw new ArgumentNullException(nameof(file)));
+            }
+
+            return input;
+        }
+
+        /// <summary>
+        /// Appends a file to the input element.
+        /// Requires the input element to be of type "file".
+        /// </summary>
+        /// <param name="input">The input to append to.</param>
+        /// <param name="filePath">The path to the file, which should be appended.</param>
+        /// <returns>The input itself for chaining.</returns>
+        public static IHtmlInputElement AppendFile(this IHtmlInputElement input, String filePath)
+        {
+            filePath = filePath ?? throw new ArgumentNullException(nameof(filePath));
+            var name = Path.GetFileName(filePath);
+            var ext = Path.GetExtension(filePath);
+            var type = MimeTypeNames.FromExtension(ext);
+            var stream = File.OpenRead(filePath);
+            var modified = File.GetLastWriteTimeUtc(filePath);
+            var file = new InputFile(name, type, stream, modified);
+            return input.AppendFile(file);
+        }
+    }
+}

src/AngleSharp.Io/Dom/InputFile.cs

@@ -0,0 +1,105 @@
+namespace AngleSharp.Io.Dom
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// Represents an input file
+    /// </summary>
+    public class InputFile : IFile
+    {
+        private readonly String _fileName;
+        private readonly Stream _content;
+        private readonly String _type;
+        private readonly DateTime _modified;
+
+        /// <summary>
+        /// Creates a new input file.
+        /// </summary>
+        /// <param name="fileName">The name of the file.</param>
+        /// <param name="type">The MIME type of the file.</param>
+        /// <param name="content">The content stream.</param>
+        /// <param name="modified">The last modified date.</param>
+        public InputFile(String fileName, String type, Stream content, DateTime modified)
+        {
+            _fileName = fileName;
+            _type = type;
+            _content = content;
+            _modified = modified;
+        }
+
+        /// <summary>
+        /// Creates a new input file.
+        /// </summary>
+        /// <param name="fileName">The name of the file.</param>
+        /// <param name="type">The MIME type of the file.</param>
+        /// <param name="content">The content stream.</param>
+        public InputFile(String fileName, String type, Stream content)
+            : this(fileName, type, content, DateTime.Now)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new input file.
+        /// </summary>
+        /// <param name="fileName">The name of the file.</param>
+        /// <param name="type">The MIME type of the file.</param>
+        /// <param name="content">The content stream.</param>
+        public InputFile(String fileName, String type, Byte[] content)
+            : this(fileName, type, new MemoryStream(content), DateTime.Now)
+        {
+        }
+
+        /// <summary>
+        /// Gets the content stream.
+        /// </summary>
+        public Stream Body => _content;
+
+        /// <summary>
+        /// Gets if the input stream is closed.
+        /// </summary>
+        public Boolean IsClosed => _content.CanRead == false;
+
+        /// <summary>
+        /// Gets the last modified date.
+        /// </summary>
+        public DateTime LastModified => _modified;
+
+        /// <summary>
+        /// Gets the length of the content stream.
+        /// </summary>
+        public Int32 Length => (Int32)_content.Length;
+
+        /// <summary>
+        /// Gets the name of the file.
+        /// </summary>
+        public String Name => _fileName;
+
+        /// <summary>
+        /// Gets the MIME type of the file.
+        /// </summary>
+        public String Type => _type;
+
+        /// <summary>
+        /// Closes the content stream.
+        /// </summary>
+        public void Close() => _content.Close();
+
+        /// <summary>
+        /// Disposes the content stream.
+        /// </summary>
+        void IDisposable.Dispose() => _content.Dispose();
+
+        /// <inheritdoc />
+        public IBlob Slice(Int32 start = 0, Int32 end = Int32.MaxValue, String contentType = null)
+        {
+            var ms = new MemoryStream();
+            _content.Position = start;
+            var buffer = new Byte[Math.Max(0, Math.Min(end, _content.Length) - start)];
+            _content.Read(buffer, 0, buffer.Length);
+            ms.Write(buffer, 0, buffer.Length);
+            _content.Position = 0;
+            return new InputFile(_fileName, _type, ms);
+        }
+    }
+}

src/AngleSharp.Io/Dom/WebSocket.cs

@@ -137,44 +137,32 @@ public WebSocket(IWindow window, String url, params String[] protocols)
         /// Gets the URL the connection is made to.
         /// </summary>
         [DomName("url")]
-        public String Url
-        {
-            get { return _url.Href; }
-        }
-
+        public String Url => _url.Href;
+
         /// <summary>
         /// Gets the current state of the connection.
         /// </summary>
         [DomName("readyState")]
-        public WebSocketReadyState ReadyState
-        {
-            get { return _state; }
-        }
-
+        public WebSocketReadyState ReadyState => _state;
+
         /// <summary>
         /// Gets the number of bytes of UTF-8 text that have been queued using
         /// Send() but that, as of the last time the event loop started
         /// executing a task, had not yet been transmitted to the network.
         /// </summary>
         [DomName("bufferedAmount")]
-        public Int64 Buffered
-        {
-            get { return 0; }
-        }
-
+        public Int64 Buffered => 0;
+
         /// <summary>
         /// Gets the chosen protocol for the connection.
         /// </summary>
         [DomName("protocol")]
-        public String Protocol
-        {
-            get { return _ws.SubProtocol ?? String.Empty; }
-        }
-
+        public String Protocol => _ws.SubProtocol ?? String.Empty;
+
         #endregion
-
+
         #region Methods
-
+
         /// <summary>
         /// Transmits data using the connection.
         /// </summary>

src/AngleSharp.Io/Network/CookieFieldNames.cs

@@ -0,0 +1,65 @@
+namespace AngleSharp.Io.Network
+{
+    using System;
+
+    /// <summary>
+    /// A collection of constants found in a cookie.
+    /// </summary>
+    public static class CookieFieldNames
+    {
+        /// <summary>
+        /// The Comment attribute name.
+        /// </summary>
+        public static readonly String Comment = "Comment";
+
+        /// <summary>
+        /// The CommentURL attribute name.
+        /// </summary>
+        public static readonly String CommentUrl = "CommentURL";
+
+        /// <summary>
+        /// The Discard attribute name.
+        /// </summary>
+        public static readonly String Discard = "Discard";
+
+        /// <summary>
+        /// The Domain attribute name.
+        /// </summary>
+        public static readonly String Domain = "Domain";
+
+        /// <summary>
+        /// The Expires attribute name.
+        /// </summary>
+        public static readonly String Expires = "Expires";
+
+        /// <summary>
+        /// The Max-Age attribute name.
+        /// </summary>
+        public static readonly String MaxAge = "Max-Age";
+
+        /// <summary>
+        /// The Path attribute name.
+        /// </summary>
+        public static readonly String Path = "Path";
+
+        /// <summary>
+        /// The Port attribute name.
+        /// </summary>
+        public static readonly String Port = "Port";
+
+        /// <summary>
+        /// The Secure attribute name.
+        /// </summary>
+        public static readonly String Secure = "Secure";
+
+        /// <summary>
+        /// The Version attribute name.
+        /// </summary>
+        public static readonly String Version = "Version";
+
+        /// <summary>
+        /// The HttpOnly attribute name.
+        /// </summary>
+        public static readonly String HttpOnly = "HttpOnly";
+    }
+}