morrigan/crabbysearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add ability to put the themes folder on different paths

Browse source
This commit is contained in:
neon_arch 2023-05-24 17:37:41 +03:00
parent 707bf153cd
commit 29456650f1
4 changed files with 48 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib.rs
View file

@ -6,6 +6,7 @@ pub mod config_parser;
pub mod engines;
pub mod search_results_handler;
pub mod server;
pub mod theme_handler;
use std::net::TcpListener;
@ -15,6 +16,7 @@ use actix_files as fs;
use actix_web::{dev::Server, middleware::Logger, web, App, HttpServer};
use config_parser::parser::Config;
use handlebars::Handlebars;
use theme_handler::theme_path_handler::handle_different_theme_path;
/// Runs the web server on the provided TCP listener and returns a `Server` instance.
///
@ -39,8 +41,10 @@ use handlebars::Handlebars;
pub fn run(listener: TcpListener, config: Config) -> std::io::Result<Server> {
let mut handlebars: Handlebars = Handlebars::new();
let theme_folder_path: String = handle_different_theme_path()?;
handlebars
.register_templates_directory(".html", "./public/templates")
.register_templates_directory(".html", format!("{}/templates", theme_folder_path))
.unwrap();
let handlebars_ref: web::Data<Handlebars> = web::Data::new(handlebars);
@ -51,8 +55,14 @@ pub fn run(listener: TcpListener, config: Config) -> std::io::Result<Server> {
.app_data(web::Data::new(config.clone()))
.wrap(Logger::default()) // added logging middleware for logging.
// Serve images and static files (css and js files).
.service(fs::Files::new("/static", "./public/static").show_files_listing())
.service(fs::Files::new("/images", "./public/images").show_files_listing())
.service(
fs::Files::new("/static", format!("{}/static", theme_folder_path))
.show_files_listing(),
)
.service(
fs::Files::new("/images", format!("{}/images", theme_folder_path))
.show_files_listing(),
)
.service(routes::robots_data) // robots.txt
.service(routes::index) // index page
.service(routes::search) // search page