Allow the user to disable the use of the cdnjs #17
Conversation
|
Thanks for the PR, that's definitely a nice feature to have. I see a bit of duplicate code that could be merged into functions but apart from that it looks good. I'm a bit busy right now, will review it as soon as I have more time, probably some time in the next week. |
| /// CSS file to style the page from a local source | ||
| pub async fn css(request: HttpRequest, identity: Identity) -> impl Responder { | ||
| if let Err(response) = auth(identity, request).await { | ||
| return response; | ||
| } | ||
|
|
||
| let contents = { | ||
| #[cfg(feature = "dev")] | ||
| { | ||
| fs::read_to_string(&*CSS_PATH).expect("Can't read spectre.min.css") | ||
| } | ||
| #[cfg(not(feature = "dev"))] | ||
| { | ||
| CSS_CONTENTS.to_owned() | ||
| } | ||
| }; | ||
| HttpResponse::Ok() | ||
| .header("Content-Type", "text/css") | ||
| .body(contents) | ||
| } | ||
|
|
||
| /// Icon-specific CSS file to style the page from a local source | ||
| pub async fn icon(request: HttpRequest, identity: Identity) -> impl Responder { | ||
| if let Err(response) = auth(identity, request).await { | ||
| return response; | ||
| } | ||
|
|
||
| let contents = { | ||
| #[cfg(feature = "dev")] | ||
| { | ||
| fs::read_to_string(&*ICON_PATH).expect("Can't read spectre.min.css") | ||
| } | ||
| #[cfg(not(feature = "dev"))] | ||
| { | ||
| ICON_CONTENTS.to_owned() | ||
| } | ||
| }; | ||
| HttpResponse::Ok() | ||
| .header("Content-Type", "text/css") | ||
| .body(contents) | ||
| } | ||
|
|
||
| /// JS file to highlight code from a local source | ||
| pub async fn js(request: HttpRequest, identity: Identity) -> impl Responder { | ||
| if let Err(response) = auth(identity, request).await { | ||
| return response; | ||
| } | ||
|
|
||
| let contents = { | ||
| #[cfg(feature = "dev")] | ||
| { | ||
| fs::read_to_string(&*JS_PATH).expect("Can't read spectre.min.css") | ||
| } | ||
| #[cfg(not(feature = "dev"))] | ||
| { | ||
| JS_CONTENTS.to_owned() | ||
| } | ||
| }; | ||
| HttpResponse::Ok() | ||
| .header("Content-Type", "text/javascript") | ||
| .body(contents) | ||
| } |
There was a problem hiding this comment.
Same here, a lot of duplicate code that could be merged, however that one is trickier since different values are used depending on whether or not the dev feature is enabled. Cleanest way to do it would probably be a macro, I can take care of that since you're new to Rust.
src/setup.rs
Outdated
| @@ -120,6 +122,7 @@ impl Default for Config { | |||
| impl Default for HighlightConfig { | |||
| fn default() -> Self { | |||
| Self { | |||
| themepath: "https://cdnjs.cloudflare.com/ajax/libs/spectre.css/0.5.8/".to_owned(), | |||
|
Hey, sorry for not following up with that but this whole situation has been quite something and made me forget about this PR. I plan to rewrite filite completely in the next few days and get rid of the CDN altogether. I'll keep this open until the rewrite is done, but I'll probably close it afterwards. |
|
Thanks for getting back to me, glad to hear that the feature I wanted will be available in any case. Looking forward to updating. |
I wanted to host this pastebin as an I2P service and discovered there wasn't a way to disable the use of the CDN as the source of the CSS and Javascript. I wanted to at least be able to use the defaults without the CDN, so today(at last) I wrote my first ~95 lines of Rust. I added a new variable(themepath) which can either point to a CDN source or be left blank to use the default theme without needing another service. Looking forward to your feedback.