diff --git a/.gitignore b/.gitignore index 80c36c06a..4fa7c49a9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ src/as/*/build src/as/*/node_modules src/as/*/.wireit -src/rust/*/target +src/rust/**/target src/rust/node_modules .idea diff --git a/src/rust/wpcomics/Cargo.toml b/src/rust/wpcomics/Cargo.toml index f9f3dc4b8..fdba8a30a 100644 --- a/src/rust/wpcomics/Cargo.toml +++ b/src/rust/wpcomics/Cargo.toml @@ -1,5 +1,6 @@ [workspace] members = ["template", "sources/*"] +resolver = "2" [profile.dev] panic = "abort" diff --git a/src/rust/wpcomics/sources/comiconlinefree/Cargo.lock b/src/rust/wpcomics/sources/comiconlinefree/Cargo.lock new file mode 100644 index 000000000..1f06e3420 --- /dev/null +++ b/src/rust/wpcomics/sources/comiconlinefree/Cargo.lock @@ -0,0 +1,99 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aidoku" +version = "0.2.0" +source = "git+https://github.com/Aidoku/aidoku-rs#004bddabade7b24c58cf925b08f90dd093b00c9d" +dependencies = [ + "aidoku_imports", + "aidoku_macros", + "aidoku_proc_macros", + "dlmalloc", +] + +[[package]] +name = "aidoku_imports" +version = "0.2.0" +source = "git+https://github.com/Aidoku/aidoku-rs#004bddabade7b24c58cf925b08f90dd093b00c9d" + +[[package]] +name = "aidoku_macros" +version = "0.1.0" +source = "git+https://github.com/Aidoku/aidoku-rs#004bddabade7b24c58cf925b08f90dd093b00c9d" + +[[package]] +name = "aidoku_proc_macros" +version = "0.2.0" +source = "git+https://github.com/Aidoku/aidoku-rs#004bddabade7b24c58cf925b08f90dd093b00c9d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "comiconlinefree" +version = "0.1.0" +dependencies = [ + "aidoku", + "wpcomics_template", +] + +[[package]] +name = "dlmalloc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "203540e710bfadb90e5e29930baf5d10270cec1f43ab34f46f78b147b2de715a" +dependencies = [ + "libc", +] + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "proc-macro2" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "wpcomics_template" +version = "0.1.0" +dependencies = [ + "aidoku", +] diff --git a/src/rust/wpcomics/sources/comiconlinefree/res/source.json b/src/rust/wpcomics/sources/comiconlinefree/res/source.json index 668e7bc36..77e83d07a 100644 --- a/src/rust/wpcomics/sources/comiconlinefree/res/source.json +++ b/src/rust/wpcomics/sources/comiconlinefree/res/source.json @@ -4,7 +4,7 @@ "lang": "en", "name": "ComicOnlineFree", "version": 1, - "url": "https://comiconlinefree.net", + "url": "https://comiconlinefree.org", "nsfw": 1 }, "listings": [ diff --git a/src/rust/wpcomics/template/src/template.rs b/src/rust/wpcomics/template/src/template.rs index 8063d6302..cc30d0440 100644 --- a/src/rust/wpcomics/template/src/template.rs +++ b/src/rust/wpcomics/template/src/template.rs @@ -188,7 +188,7 @@ impl WPComicsSource { pub fn get_manga_details(&self, id: String) -> Result { cache_manga_page(self, id.as_str()); - let details = unsafe { Node::new(&CACHED_MANGA.clone().unwrap())? }; + let details = unsafe { Node::new(CACHED_MANGA.clone().unwrap())? }; let title = details.select(self.manga_details_title).text().read(); let cover = append_protocol(details.select(self.manga_details_cover).attr("src").read()); let author = (self.manga_details_author_transformer)( @@ -238,7 +238,7 @@ impl WPComicsSource { let mut skipped_first = false; let mut chapters: Vec = Vec::new(); cache_manga_page(self, id.as_str()); - let html = unsafe { Node::new(&CACHED_MANGA.clone().unwrap())? }; + let html = unsafe { Node::new(CACHED_MANGA.clone().unwrap())? }; let title_untrimmed = (self.manga_details_title_transformer)( html.select(self.manga_details_title).text().read(), );