diff --git a/config/config.exs b/config/config.exs index 7df24019..25661e48 100644 --- a/config/config.exs +++ b/config/config.exs @@ -38,7 +38,7 @@ config :philomena, PhilomenaWeb.Endpoint, # Markdown config :philomena, Philomena.Markdown, - crate: "furbooru_markdown", + crate: "philomena_markdown", mode: :release config :phoenix, :template_engines, diff --git a/mix.exs b/mix.exs index 2b5f1299..4d3864fa 100644 --- a/mix.exs +++ b/mix.exs @@ -12,7 +12,7 @@ defmodule Philomena.MixProject do aliases: aliases(), deps: deps(), dialyzer: [plt_add_apps: [:mix]], - rustler_crates: [furbooru_markdown: []] + rustler_crates: [philomena_markdown: []] ] end diff --git a/mix.lock b/mix.lock index 8ccf9143..2facfecf 100644 --- a/mix.lock +++ b/mix.lock @@ -40,7 +40,7 @@ "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, "mime": {:hex, :mime, "1.6.0", "dabde576a497cef4bbdd60aceee8160e02a6c89250d6c0b29e56c0dfb00db3d2", [:mix], [], "hexpm", "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, - "mint": {:hex, :mint, "1.3.0", "396b3301102f7b775e103da5a20494b25753aed818d6d6f0ad222a3a018c3600", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "a9aac960562e43ca69a77e5176576abfa78b8398cec5543dd4fb4ab0131d5c1e"}, + "mint": {:hex, :mint, "1.4.0", "cd7d2451b201fc8e4a8fd86257fb3878d9e3752899eb67b0c5b25b180bde1212", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "10a99e144b815cbf8522dccbc8199d15802440fc7a64d67b6853adb6fa170217"}, "mix_audit": {:hex, :mix_audit, "0.1.4", "35c424173a574436a80ad7f63cf014a7d9ce727de8cd4e7b4138d90b11aec043", [:make, :mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.4.0", [hex: :yaml_elixir, repo: "hexpm", optional: false]}], "hexpm", "7a43fee661bcadbad31aa04a86d33a890421c174723814b8a3a7f0e7076936a1"}, "neotoma": {:hex, :neotoma, "1.7.3", "d8bd5404b73273989946e4f4f6d529e5c2088f5fa1ca790b4dbe81f4be408e61", [:rebar], [], "hexpm", "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28"}, "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, diff --git a/native/furbooru_markdown/.cargo/config b/native/philomena_markdown/.cargo/config similarity index 100% rename from native/furbooru_markdown/.cargo/config rename to native/philomena_markdown/.cargo/config diff --git a/native/furbooru_markdown/Cargo.lock b/native/philomena_markdown/Cargo.lock similarity index 99% rename from native/furbooru_markdown/Cargo.lock rename to native/philomena_markdown/Cargo.lock index 10243927..1b8087b9 100644 --- a/native/furbooru_markdown/Cargo.lock +++ b/native/philomena_markdown/Cargo.lock @@ -137,12 +137,11 @@ dependencies = [ [[package]] name = "comrak" version = "0.12.1" -source = "git+https://github.com/furbooru/comrak#b69625ef55b855675d9597c9dd5fe2dda50cc0c6" +source = "git+https://github.com/philomena-dev/comrak?branch=main#94941ad6f41fa308383601e5b098c643e3bf80e2" dependencies = [ "clap", "entities", "lazy_static", - "log", "pest", "pest_derive", "regex", @@ -221,19 +220,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" -[[package]] -name = "furbooru_markdown" -version = "0.2.0" -dependencies = [ - "comrak", - "jemallocator", - "lazy_static", - "log", - "pretty_env_logger", - "regex", - "rustler", -] - [[package]] name = "generic-array" version = "0.12.4" @@ -461,6 +447,19 @@ dependencies = [ "sha-1", ] +[[package]] +name = "philomena_markdown" +version = "0.2.0" +dependencies = [ + "comrak", + "jemallocator", + "lazy_static", + "log", + "pretty_env_logger", + "regex", + "rustler", +] + [[package]] name = "pkg-config" version = "0.3.19" diff --git a/native/furbooru_markdown/Cargo.toml b/native/philomena_markdown/Cargo.toml similarity index 74% rename from native/furbooru_markdown/Cargo.toml rename to native/philomena_markdown/Cargo.toml index 66ba6392..fc691309 100644 --- a/native/furbooru_markdown/Cargo.toml +++ b/native/philomena_markdown/Cargo.toml @@ -1,16 +1,16 @@ [package] -name = "furbooru_markdown" +name = "philomena_markdown" version = "0.2.0" authors = ["Xe ", "Luna ", "Liam White "] edition = "2018" [lib] -name = "furbooru_markdown" +name = "philomena_markdown" path = "src/lib.rs" crate-type = ["dylib"] [dependencies] -comrak = { git = "https://github.com/furbooru/comrak" } +comrak = { git = "https://github.com/philomena-dev/comrak", branch = "main" } lazy_static = "1.4" regex = "1.5" log = "0" diff --git a/native/furbooru_markdown/README.md b/native/philomena_markdown/README.md similarity index 84% rename from native/furbooru_markdown/README.md rename to native/philomena_markdown/README.md index e884ccc5..803fb867 100644 --- a/native/furbooru_markdown/README.md +++ b/native/philomena_markdown/README.md @@ -1,4 +1,4 @@ -# NIF for Elixir.Furbooru.Markdown +# NIF for Elixir.Philomena.Markdown ## To build the NIF module: @@ -9,8 +9,8 @@ ## To load the NIF: ```elixir -defmodule Furbooru.Markdown do - use Rustler, otp_app: , crate: "furbooru_markdown" +defmodule Philomena.Markdown do + use Rustler, otp_app: , crate: "philomena_markdown" # When your NIF is loaded, it will override this function. def add(_a, _b), do: :erlang.nif_error(:nif_not_loaded) diff --git a/native/furbooru_markdown/src/lib.rs b/native/philomena_markdown/src/lib.rs similarity index 89% rename from native/furbooru_markdown/src/lib.rs rename to native/philomena_markdown/src/lib.rs index 466439af..fed1baae 100644 --- a/native/furbooru_markdown/src/lib.rs +++ b/native/philomena_markdown/src/lib.rs @@ -38,11 +38,8 @@ fn to_html(input: String) -> String { options.extension.table = true; options.extension.description_lists = true; options.extension.superscript = true; - options.extension.subscript = true; - options.extension.spoiler = true; options.extension.strikethrough = true; - options.extension.underline = true; - // options.extension.furbooru = true; + options.extension.philomena = true; options.parse.smart = true; options.render.hardbreaks = true; options.render.github_pre_lang = true; @@ -82,11 +79,8 @@ fn to_html_unsafe(input: String) -> String { options.extension.table = true; options.extension.description_lists = true; options.extension.superscript = true; - options.extension.subscript = true; - options.extension.spoiler = true; options.extension.strikethrough = true; - options.extension.underline = true; - // options.extension.furbooru = true; + options.extension.philomena = true; options.parse.smart = true; options.render.hardbreaks = true; options.render.github_pre_lang = true;