Stop parsing Url in markdown

CommonMark accepts any URI.

Co-authored-by: nico2sh <mail@nico2sh.com>

Cargo.lock

@@ -2598,7 +2598,6 @@ dependencies = [
  "rustc-hash 2.1.1",
  "thiserror 2.0.17",
  "unicode-segmentation",
- "url",
 ]
 
 [[package]]
@@ -3203,9 +3202,10 @@ version = "0.1.0"
 dependencies = [
  "iced",
  "image",
- "open",
  "reqwest",
  "tokio",
+ "url",
+ "webbrowser",
 ]
 
 [[package]]

examples/changelog/src/main.rs

@@ -44,7 +44,7 @@ enum Message {
         Result<(Changelog, Vec<changelog::Contribution>), changelog::Error>,
     ),
     PullRequestFetched(Result<changelog::PullRequest, changelog::Error>),
-    UrlClicked(markdown::Url),
+    LinkClicked(markdown::Uri),
     TitleChanged(String),
     CategorySelected(changelog::Category),
     Next,
@@ -113,7 +113,7 @@ impl Generator {
 
                 Task::none()
             }
-            Message::UrlClicked(url) => {
+            Message::LinkClicked(url) => {
                 let _ = webbrowser::open(url.as_str());
 
                 Task::none()
@@ -281,7 +281,7 @@ impl Generator {
 
                             let description =
                                 markdown(description, self.theme())
-                                    .map(Message::UrlClicked);
+                                    .map(Message::LinkClicked);
 
                             let labels =
                                 row(pull_request.labels.iter().map(|label| {
@@ -351,7 +351,7 @@ impl Generator {
                                     self.theme(),
                                 ),
                             )
-                            .map(Message::UrlClicked),
+                            .map(Message::LinkClicked),
                         )
                         .spacing(10),
                     )

examples/markdown/Cargo.toml

@@ -12,10 +12,13 @@ iced.features = ["markdown", "highlighter", "image", "tokio", "debug"]
 reqwest.version = "0.12"
 reqwest.features = ["json"]
 
-image.workspace = true
 tokio.workspace = true
+tokio.features = ["fs"]
 
-open = "5.3"
+image.workspace = true
+url.workspace = true
+
+webbrowser = "1"
 
 # Disabled to keep amount of build dependencies low
 # This can be re-enabled on demand

examples/markdown/src/main.rs

@@ -32,7 +32,7 @@ pub fn main() -> iced::Result {
 struct Markdown {
     content: markdown::Content,
     raw: text_editor::Content,
-    images: HashMap<markdown::Url, Image>,
+    images: HashMap<markdown::Uri, Image>,
     mode: Mode,
     theme: Theme,
     now: Instant,
@@ -57,9 +57,9 @@ enum Image {
 enum Message {
     Edit(text_editor::Action),
     Copy(String),
-    LinkClicked(markdown::Url),
+    LinkClicked(markdown::Uri),
-    ImageShown(markdown::Url),
+    ImageShown(markdown::Uri),
-    ImageDownloaded(markdown::Url, Result<image::Handle, Error>),
+    ImageDownloaded(markdown::Uri, Result<image::Handle, Error>),
     ToggleStream(bool),
     NextToken,
     Tick,
@@ -100,20 +100,19 @@ impl Markdown {
             }
             Message::Copy(content) => clipboard::write(content),
             Message::LinkClicked(link) => {
-                let _ = open::that_in_background(link.to_string());
+                let _ = webbrowser::open(&link);
-
                 Task::none()
             }
-            Message::ImageShown(url) => {
+            Message::ImageShown(uri) => {
-                if self.images.contains_key(&url) {
+                if self.images.contains_key(&uri) {
                     return Task::none();
                 }
 
-                let _ = self.images.insert(url.clone(), Image::Loading);
+                let _ = self.images.insert(uri.clone(), Image::Loading);
 
                 Task::perform(
-                    download_image(url.clone()),
+                    download_image(uri.clone()),
-                    Message::ImageDownloaded.with(url),
+                    Message::ImageDownloaded.with(uri),
                 )
             }
             Message::ImageDownloaded(url, result) => {
@@ -240,19 +239,19 @@ impl Markdown {
 }
 
 struct CustomViewer<'a> {
-    images: &'a HashMap<markdown::Url, Image>,
+    images: &'a HashMap<markdown::Uri, Image>,
     now: Instant,
 }
 
 impl<'a> markdown::Viewer<'a, Message> for CustomViewer<'a> {
-    fn on_link_click(url: markdown::Url) -> Message {
+    fn on_link_click(url: markdown::Uri) -> Message {
         Message::LinkClicked(url)
     }
 
     fn image(
         &self,
         _settings: markdown::Settings,
-        url: &'a markdown::Url,
+        url: &'a markdown::Uri,
         _title: &'a str,
         _alt: &markdown::Text,
     ) -> Element<'a, Message> {
@@ -295,21 +294,31 @@ impl<'a> markdown::Viewer<'a, Message> for CustomViewer<'a> {
     }
 }
 
-async fn download_image(url: markdown::Url) -> Result<image::Handle, Error> {
+async fn download_image(uri: markdown::Uri) -> Result<image::Handle, Error> {
     use std::io;
     use tokio::task;
+    use url::Url;
 
-    println!("Trying to download image: {url}");
+    let bytes = match Url::parse(&uri) {
+        Ok(url) if url.scheme() == "http" || url.scheme() == "https" => {
+            println!("Trying to download image: {url}");
 
-    let client = reqwest::Client::new();
+            let client = reqwest::Client::new();
 
-    let bytes = client
+            client
-        .get(url)
+                .get(url)
-        .send()
+                .send()
-        .await?
+                .await?
-        .error_for_status()?
+                .error_for_status()?
-        .bytes()
+                .bytes()
-        .await?;
+                .await?
+        }
+        _ => {
+            return Err(Error::IOFailed(Arc::new(io::Error::other(format!(
+                "unsupported uri: {uri}"
+            )))));
+        }
+    };
 
     let image = task::spawn_blocking(move || {
         Ok::<_, Error>(

widget/Cargo.toml

@@ -24,7 +24,7 @@ svg = ["iced_renderer/svg"]
 canvas = ["iced_renderer/geometry"]
 qr_code = ["canvas", "dep:qrcode"]
 wgpu = ["iced_renderer/wgpu-bare"]
-markdown = ["dep:pulldown-cmark", "dep:url"]
+markdown = ["dep:pulldown-cmark"]
 highlighter = ["dep:iced_highlighter"]
 advanced = []
 crisp = []
@@ -49,6 +49,3 @@ pulldown-cmark.optional = true
 
 iced_highlighter.workspace = true
 iced_highlighter.optional = true
-
-url.workspace = true
-url.optional = true

widget/src/markdown.rs

@@ -18,7 +18,7 @@
 //! }
 //!
 //! enum Message {
-//!     LinkClicked(markdown::Url),
+//!     LinkClicked(markdown::Uri),
 //! }
 //!
 //! impl State {
@@ -63,7 +63,11 @@ use std::sync::Arc;
 
 pub use core::text::Highlight;
 pub use pulldown_cmark::HeadingLevel;
-pub use url::Url;
+
+/// A [`String`] representing a [URI] in a Markdown document
+///
+/// [URI]: https://en.wikipedia.org/wiki/Uniform_Resource_Identifier
+pub type Uri = String;
 
 /// A bunch of Markdown that has been parsed.
 #[derive(Debug, Default)]
@@ -176,7 +180,7 @@ impl Content {
     }
 
     /// Returns the URLs of the Markdown images present in the [`Content`].
-    pub fn images(&self) -> &HashSet<Url> {
+    pub fn images(&self) -> &HashSet<Uri> {
         &self.state.images
     }
 }
@@ -209,7 +213,7 @@ pub enum Item {
     /// An image.
     Image {
         /// The destination URL of the image.
-        url: Url,
+        url: Uri,
         /// The title of the image.
         title: String,
         /// The alternative text of the image.
@@ -249,7 +253,7 @@ pub struct Row {
 pub struct Text {
     spans: Vec<Span>,
     last_style: Cell<Option<Style>>,
-    last_styled_spans: RefCell<Arc<[text::Span<'static, Url>]>>,
+    last_styled_spans: RefCell<Arc<[text::Span<'static, Uri>]>>,
 }
 
 impl Text {
@@ -265,7 +269,7 @@ impl Text {
     ///
     /// This method performs caching for you. It will only reallocate if the [`Style`]
     /// provided changes.
-    pub fn spans(&self, style: Style) -> Arc<[text::Span<'static, Url>]> {
+    pub fn spans(&self, style: Style) -> Arc<[text::Span<'static, Uri>]> {
         if Some(style) != self.last_style.get() {
             *self.last_styled_spans.borrow_mut() =
                 self.spans.iter().map(|span| span.view(&style)).collect();
@@ -282,7 +286,7 @@ enum Span {
     Standard {
         text: String,
         strikethrough: bool,
-        link: Option<Url>,
+        link: Option<Uri>,
         strong: bool,
         emphasis: bool,
         code: bool,
@@ -296,7 +300,7 @@ enum Span {
 }
 
 impl Span {
-    fn view(&self, style: &Style) -> text::Span<'static, Url> {
+    fn view(&self, style: &Style) -> text::Span<'static, Uri> {
         match self {
             Span::Standard {
                 text,
@@ -361,7 +365,7 @@ impl Span {
 /// }
 ///
 /// enum Message {
-///     LinkClicked(markdown::Url),
+///     LinkClicked(markdown::Uri),
 /// }
 ///
 /// impl State {
@@ -395,7 +399,7 @@ pub fn parse(markdown: &str) -> impl Iterator<Item = Item> + '_ {
 struct State {
     leftover: String,
     references: HashMap<String, String>,
-    images: HashSet<Url>,
+    images: HashSet<Uri>,
     #[cfg(feature = "highlighter")]
     highlighter: Option<Highlighter>,
 }
@@ -603,15 +607,13 @@ fn parse_with<'a>(
                 None
             }
             pulldown_cmark::Tag::Link { dest_url, .. } if !metadata => {
-                link = Url::parse(&dest_url).ok();
+                link = Some(dest_url.into_string());
                 None
             }
             pulldown_cmark::Tag::Image {
                 dest_url, title, ..
             } if !metadata => {
-                image = Url::parse(&dest_url)
+                image = Some((dest_url.into_string(), title.into_string()));
-                    .ok()
-                    .map(|url| (url, title.into_string()));
                 None
             }
             pulldown_cmark::Tag::List(first_item) if !metadata => {
@@ -1104,7 +1106,7 @@ impl From<Theme> for Style {
 /// }
 ///
 /// enum Message {
-///     LinkClicked(markdown::Url),
+///     LinkClicked(markdown::Uri),
 /// }
 ///
 /// impl State {
@@ -1132,7 +1134,7 @@ impl From<Theme> for Style {
 pub fn view<'a, Theme, Renderer>(
     items: impl IntoIterator<Item = &'a Item>,
     settings: impl Into<Settings>,
-) -> Element<'a, Url, Theme, Renderer>
+) -> Element<'a, Uri, Theme, Renderer>
 where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
@@ -1209,7 +1211,7 @@ pub fn heading<'a, Message, Theme, Renderer>(
     level: &'a HeadingLevel,
     text: &'a Text,
     index: usize,
-    on_link_click: impl Fn(Url) -> Message + 'a,
+    on_link_click: impl Fn(Uri) -> Message + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -1251,7 +1253,7 @@ where
 pub fn paragraph<'a, Message, Theme, Renderer>(
     settings: Settings,
     text: &Text,
-    on_link_click: impl Fn(Url) -> Message + 'a,
+    on_link_click: impl Fn(Uri) -> Message + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -1337,7 +1339,7 @@ where
 pub fn code_block<'a, Message, Theme, Renderer>(
     settings: Settings,
     lines: &'a [Text],
-    on_link_click: impl Fn(Url) -> Message + Clone + 'a,
+    on_link_click: impl Fn(Uri) -> Message + Clone + 'a,
 ) -> Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
@@ -1486,8 +1488,8 @@ where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
-    /// Produces a message when a link is clicked with the given [`Url`].
+    /// Produces a message when a link is clicked with the given [`Uri`].
-    fn on_link_click(url: Url) -> Message;
+    fn on_link_click(url: Uri) -> Message;
 
     /// Displays an image.
     ///
@@ -1495,7 +1497,7 @@ where
     fn image(
         &self,
         settings: Settings,
-        url: &'a Url,
+        url: &'a Uri,
         title: &'a str,
         alt: &Text,
     ) -> Element<'a, Message, Theme, Renderer> {
@@ -1611,12 +1613,12 @@ where
 #[derive(Debug, Clone, Copy)]
 struct DefaultViewer;
 
-impl<'a, Theme, Renderer> Viewer<'a, Url, Theme, Renderer> for DefaultViewer
+impl<'a, Theme, Renderer> Viewer<'a, Uri, Theme, Renderer> for DefaultViewer
 where
     Theme: Catalog + 'a,
     Renderer: core::text::Renderer<Font = Font> + 'a,
 {
-    fn on_link_click(url: Url) -> Url {
+    fn on_link_click(url: Uri) -> Uri {
         url
     }
 }