From 3402805ebb151e3bbf0addd9969e870dcdd322b9 Mon Sep 17 00:00:00 2001 From: Leonid Tsarev Date: Mon, 8 Jan 2018 18:48:09 +0300 Subject: [PATCH 1/3] refactor MediaLinkExtension to make it pluggable --- .../MediaLinks/MediaLinkExtension.cs | 181 +++++++++++------- 1 file changed, 110 insertions(+), 71 deletions(-) diff --git a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs index e575dd03..cc24a87f 100644 --- a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs +++ b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs @@ -1,8 +1,10 @@ -// Copyright (c) Alexandre Mutel. All rights reserved. +// Copyright (c) Alexandre Mutel. All rights reserved. // This file is licensed under the BSD-Clause 2 license. // See the license.txt file in the project root for more information. using System; +using System.Collections.Generic; +using System.Linq; using Markdig.Renderers; using Markdig.Renderers.Html; using Markdig.Renderers.Html.Inlines; @@ -47,88 +49,125 @@ namespace Markdig.Extensions.MediaLinks private bool TryLinkInlineRenderer(HtmlRenderer renderer, LinkInline linkInline) { - if (linkInline.IsImage && linkInline.Url != null) + if (!linkInline.IsImage || linkInline.Url == null) { - Uri uri; - // Only process absolute Uri - if (Uri.TryCreate(linkInline.Url, UriKind.RelativeOrAbsolute, out uri) && uri.IsAbsoluteUri) + return false; + } + + Uri uri; + // Only process absolute Uri + if (!Uri.TryCreate(linkInline.Url, UriKind.RelativeOrAbsolute, out uri) || !uri.IsAbsoluteUri) + { + return false; + } + + if (TryRenderIframeFromKnownProviders(uri, renderer, linkInline)) + { + return true; + } + + if (TryGuessAudioVideoFile(uri, renderer, linkInline)) + { + return true; + } + + return false; + } + + private static HtmlAttributes GetHtmlAttributes(LinkInline linkInline) + { + var htmlAttributes = new HtmlAttributes(); + var fromAttributes = linkInline.TryGetAttributes(); + if (fromAttributes != null) + { + fromAttributes.CopyTo(htmlAttributes, false, false); + } + + return htmlAttributes; + } + + private bool TryGuessAudioVideoFile(Uri uri, HtmlRenderer renderer, LinkInline linkInline) + { + var path = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped); + // Otherwise try to detect if we have an audio/video from the file extension + string mimeType; + var lastDot = path.LastIndexOf('.'); + if (lastDot >= 0 && + Options.ExtensionToMimeType.TryGetValue(path.Substring(lastDot), out mimeType)) + { + var htmlAttributes = GetHtmlAttributes(linkInline); + var isAudio = mimeType.StartsWith("audio"); + var tagType = isAudio ? "audio" : "video"; + + renderer.Write($"<{tagType}"); + htmlAttributes.AddPropertyIfNotExist("width", Options.Width); + if (!isAudio) { - var htmlAttributes = new HtmlAttributes(); - var fromAttributes = linkInline.TryGetAttributes(); - if (fromAttributes != null) - { - fromAttributes.CopyTo(htmlAttributes, false, false); - } - - // TODO: this code is not pluggable, so for now, we handle only the following web providers: - // - youtube - // - vimeo - var path = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped); - - string iFrameUrl = null; - if (uri.Host.StartsWith("www.youtube.com", StringComparison.OrdinalIgnoreCase)) - { - var query = SplitQuery(uri); - if (query.Length > 0 && query[0].StartsWith("v=")) - { - iFrameUrl = $"https://www.youtube.com/embed/{query[0].Substring(2)}"; - } - } - else if (uri.Host.StartsWith("vimeo.com", StringComparison.OrdinalIgnoreCase)) - { - var items = path.Split('/'); - if (items.Length > 0) - { - iFrameUrl = $"https://player.vimeo.com/video/{items[items.Length - 1]}"; - } - } - - if (iFrameUrl != null) - { - renderer.Write($""); - return true; - } - else - { - // Otherwise try to detect if we have an audio/video from the file extension - string mimeType; - var lastDot = path.LastIndexOf('.'); - if (lastDot >= 0 && - Options.ExtensionToMimeType.TryGetValue(path.Substring(lastDot), out mimeType)) - { - var isAudio = mimeType.StartsWith("audio"); - var tagType = isAudio ? "audio" : "video"; - - renderer.Write($"<{tagType}"); - htmlAttributes.AddPropertyIfNotExist("width", Options.Width); - if (!isAudio) - { - htmlAttributes.AddPropertyIfNotExist("height", Options.Height); - } - htmlAttributes.AddPropertyIfNotExist("controls", null); - renderer.WriteAttributes(htmlAttributes); - - renderer.Write($">"); - - return true; - } - } + htmlAttributes.AddPropertyIfNotExist("height", Options.Height); } + htmlAttributes.AddPropertyIfNotExist("controls", null); + renderer.WriteAttributes(htmlAttributes); + + renderer.Write($">"); + + return true; } return false; } + #region Known providers + private static readonly Dictionary> KnownHosts = new Dictionary>() + { + {"www.youtube.com", YouTube}, + {"vimeo.com", Vimeo }, + }; + + + private bool TryRenderIframeFromKnownProviders(Uri uri, HtmlRenderer renderer, LinkInline linkInline) + { + var iFrameUrl = + KnownHosts + .Where(pair => uri.Host.StartsWith(pair.Key, StringComparison.OrdinalIgnoreCase)) // when host is match + .Select(pair => pair.Value(uri)) // try to call delegate to get iframeUrl + .FirstOrDefault(iframeSrc => iframeSrc != null); // use first success + + if (iFrameUrl == null) + { + return false; + } + + var htmlAttributes = GetHtmlAttributes(linkInline); + renderer.Write($""); + + return true; + } + private static readonly string[] SplitAnd = {"&"}; private static string[] SplitQuery(Uri uri) { var query = uri.Query.Substring(uri.Query.IndexOf('?') + 1); return query.Split(SplitAnd, StringSplitOptions.RemoveEmptyEntries); } + + private static string YouTube(Uri uri) + { + var query = SplitQuery(uri); + return query.Length > 0 && query[0].StartsWith("v=") + ? $"https://www.youtube.com/embed/{query[0].Substring(2)}" + : null; + } + + private static string Vimeo(Uri uri) + { + var items = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped).Split('/'); + return items.Length > 0 ? $"https://player.vimeo.com/video/{items[items.Length - 1]}" : null; + } + #endregion } } \ No newline at end of file From 796b1433169d228e3081dd5f7266e6e5361aecab Mon Sep 17 00:00:00 2001 From: Leonid Tsarev Date: Mon, 8 Jan 2018 19:14:01 +0300 Subject: [PATCH 2/3] Add support for yandex music --- src/Markdig.Tests/Specs/MediaSpecs.md | 3 + src/Markdig.Tests/Specs/Specs.cs | 7 ++- .../MediaLinks/MediaLinkExtension.cs | 58 +++++++++++++++---- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/src/Markdig.Tests/Specs/MediaSpecs.md b/src/Markdig.Tests/Specs/MediaSpecs.md index 7b166641..08c6f1f7 100644 --- a/src/Markdig.Tests/Specs/MediaSpecs.md +++ b/src/Markdig.Tests/Specs/MediaSpecs.md @@ -12,8 +12,11 @@ Allows to embed audio/video links to popular website: ![Video2](https://vimeo.com/8607834) ![Video3](https://sample.com/video.mp4) + +![Audio4](https://music.yandex.ru/album/411845/track/4402274) .

+

```````````````````````````````` \ No newline at end of file diff --git a/src/Markdig.Tests/Specs/Specs.cs b/src/Markdig.Tests/Specs/Specs.cs index 96725a74..d8893151 100644 --- a/src/Markdig.Tests/Specs/Specs.cs +++ b/src/Markdig.Tests/Specs/Specs.cs @@ -1,4 +1,4 @@ -using System; +using System; using NUnit.Framework; namespace Markdig.Tests @@ -19729,14 +19729,17 @@ namespace Markdig.Tests // ![Video2](https://vimeo.com/8607834) // // ![Video3](https://sample.com/video.mp4) + // + // ![Audio4](https://music.yandex.ru/album/411845/track/4402274) // // Should be rendered as: //

//

//

+ //

Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 1, "Extensions Media links"); - TestParser.TestSpec("![Video1](https://www.youtube.com/watch?v=mswPy5bt3TQ)\n\n![Video2](https://vimeo.com/8607834)\n\n![Video3](https://sample.com/video.mp4)", "

\n

\n

", "medialinks|advanced+medialinks"); + TestParser.TestSpec("![Video1](https://www.youtube.com/watch?v=mswPy5bt3TQ)\n\n![Video2](https://vimeo.com/8607834)\n\n![Video3](https://sample.com/video.mp4)\n\n![Audio4](https://music.yandex.ru/album/411845/track/4402274)", "

\n

\n

\n

", "medialinks|advanced+medialinks"); } } // # Extensions diff --git a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs index cc24a87f..239828e4 100644 --- a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs +++ b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs @@ -116,32 +116,50 @@ namespace Markdig.Extensions.MediaLinks } #region Known providers - private static readonly Dictionary> KnownHosts = new Dictionary>() + + private class KnownProvider { - {"www.youtube.com", YouTube}, - {"vimeo.com", Vimeo }, + public string HostPrefix { get; set; } + public Func Delegate { get; set; } + public bool AllowFullScreen { get; set; } = true; //Should be false for audio embedding + } + + private static readonly List KnownHosts = new List() + { + new KnownProvider {HostPrefix = "www.youtube.com", Delegate = YouTube}, + new KnownProvider {HostPrefix = "vimeo.com", Delegate = Vimeo}, + new KnownProvider {HostPrefix = "music.yandex.ru", Delegate = Yandex, AllowFullScreen = false}, }; private bool TryRenderIframeFromKnownProviders(Uri uri, HtmlRenderer renderer, LinkInline linkInline) { - var iFrameUrl = + var foundProvider = KnownHosts - .Where(pair => uri.Host.StartsWith(pair.Key, StringComparison.OrdinalIgnoreCase)) // when host is match - .Select(pair => pair.Value(uri)) // try to call delegate to get iframeUrl - .FirstOrDefault(iframeSrc => iframeSrc != null); // use first success + .Where(pair => uri.Host.StartsWith(pair.HostPrefix, StringComparison.OrdinalIgnoreCase)) // when host is match + .Select(provider => + new + { + provider.AllowFullScreen, + Result = provider.Delegate(uri) // try to call delegate to get iframeUrl + } + ) + .FirstOrDefault(provider => provider.Result != null); // use first success - if (iFrameUrl == null) + if (foundProvider == null) { return false; } var htmlAttributes = GetHtmlAttributes(linkInline); - renderer.Write($""); @@ -168,6 +186,26 @@ namespace Markdig.Extensions.MediaLinks var items = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped).Split('/'); return items.Length > 0 ? $"https://player.vimeo.com/video/{items[items.Length - 1]}" : null; } + + private static string Yandex(Uri uri) + { + var items = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped).Split('/'); + var albumKeyword + = items.Skip(0).FirstOrDefault(); + var albumId + = items.Skip(1).FirstOrDefault(); + var trackKeyword + = items.Skip(2).FirstOrDefault(); + var trackId + = items.Skip(3).FirstOrDefault(); + + if (albumKeyword != "album" || albumId == null || trackKeyword != "track" || trackId == null) + { + return null; + } + + return $"https://music.yandex.ru/iframe/#track/{trackId}/{albumId}/"; + } #endregion } } \ No newline at end of file From 558db1fd709bceb8dab818178c9f0837f9414f0e Mon Sep 17 00:00:00 2001 From: Leonid Tsarev Date: Mon, 8 Jan 2018 19:30:23 +0300 Subject: [PATCH 3/3] Support odnoklassniki.ru (meaning: classmates, top 2 social network in Russia) --- src/Markdig.Tests/Specs/MediaSpecs.md | 3 +++ src/Markdig.Tests/Specs/Specs.cs | 5 ++++- src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Markdig.Tests/Specs/MediaSpecs.md b/src/Markdig.Tests/Specs/MediaSpecs.md index 08c6f1f7..e9bd4910 100644 --- a/src/Markdig.Tests/Specs/MediaSpecs.md +++ b/src/Markdig.Tests/Specs/MediaSpecs.md @@ -14,9 +14,12 @@ Allows to embed audio/video links to popular website: ![Video3](https://sample.com/video.mp4) ![Audio4](https://music.yandex.ru/album/411845/track/4402274) + +![Video5](https://ok.ru/video/26870090463) .

+

```````````````````````````````` \ No newline at end of file diff --git a/src/Markdig.Tests/Specs/Specs.cs b/src/Markdig.Tests/Specs/Specs.cs index d8893151..855c6cd0 100644 --- a/src/Markdig.Tests/Specs/Specs.cs +++ b/src/Markdig.Tests/Specs/Specs.cs @@ -19731,15 +19731,18 @@ namespace Markdig.Tests // ![Video3](https://sample.com/video.mp4) // // ![Audio4](https://music.yandex.ru/album/411845/track/4402274) + // + // ![Video5](https://ok.ru/video/26870090463) // // Should be rendered as: //

//

//

//

+ //

Console.WriteLine("Example {0}" + Environment.NewLine + "Section: {0}" + Environment.NewLine, 1, "Extensions Media links"); - TestParser.TestSpec("![Video1](https://www.youtube.com/watch?v=mswPy5bt3TQ)\n\n![Video2](https://vimeo.com/8607834)\n\n![Video3](https://sample.com/video.mp4)\n\n![Audio4](https://music.yandex.ru/album/411845/track/4402274)", "

\n

\n

\n

", "medialinks|advanced+medialinks"); + TestParser.TestSpec("![Video1](https://www.youtube.com/watch?v=mswPy5bt3TQ)\n\n![Video2](https://vimeo.com/8607834)\n\n![Video3](https://sample.com/video.mp4)\n\n![Audio4](https://music.yandex.ru/album/411845/track/4402274)\n\n![Video5](https://ok.ru/video/26870090463)", "

\n

\n

\n

\n

", "medialinks|advanced+medialinks"); } } // # Extensions diff --git a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs index 239828e4..9090fc8a 100644 --- a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs +++ b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs @@ -129,6 +129,7 @@ namespace Markdig.Extensions.MediaLinks new KnownProvider {HostPrefix = "www.youtube.com", Delegate = YouTube}, new KnownProvider {HostPrefix = "vimeo.com", Delegate = Vimeo}, new KnownProvider {HostPrefix = "music.yandex.ru", Delegate = Yandex, AllowFullScreen = false}, + new KnownProvider {HostPrefix = "ok.ru", Delegate = Odnoklassniki}, }; @@ -187,6 +188,12 @@ namespace Markdig.Extensions.MediaLinks return items.Length > 0 ? $"https://player.vimeo.com/video/{items[items.Length - 1]}" : null; } + private static string Odnoklassniki(Uri uri) + { + var items = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped).Split('/'); + return items.Length > 0 ? $"https://ok.ru/videoembed/{items[items.Length - 1]}" : null; + } + private static string Yandex(Uri uri) { var items = uri.GetComponents(UriComponents.Path, UriFormat.Unescaped).Split('/');