优化更新

Author: deatil

README.md

@@ -1,19 +1,20 @@
 ## nako-blog 博客系统
 
-`nako-blog` 是使用 `actix-web`, `sea-orm` 及 `tera` 的 `rust` 博客系统
+`nako-blog` 是使用 actix-web, sea-orm 及 tera 的 `rust` 博客系统
 
 
 ### 项目介绍
 
 *  使用 `rust` 开发的通用博客系统
 *  核心使用 `actix-web`, `sea-orm` 及 `tera` 等开发
 *  博客后台使用 `pear-admin` 后端模板，非前后端分离项目
-*  博客模板为可设置模板
+*  打包静态文件, 模板文件及配置文件。只需一个文件即可部署
 
 
 ### 环境要求
 
- - rust >= 1.18
+ - rust
+ - cargo
  - Myql
  - Redis
 
@@ -62,7 +63,7 @@ git clone https://github.com/deatil/nako-blog.git
 2. 然后配置数据库等信息
 
 ```
-/conf.ini
+/assert/config/conf.ini
 ```
 
 3. 最后导入 sql 数据到数据库

assert/config/conf.ini

@@ -51,5 +51,5 @@ upload_url = "/upload"
 
 # 主题
 [view]
-blog_tpl_path = "./assert/templates/blog"
+blog_tpl_path = "blog"
 blog_theme = "nako"

src/boot/app.rs

@@ -67,7 +67,21 @@ pub async fn start() -> std::io::Result<()> {
     let server_url = format!("{host}:{port}");
 
     let conn = db::connect().await.unwrap_or_default();
-    let mut view = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/assert/templates/**/*")).unwrap_or_default();
+
+    let mut view: Tera;
+ 
+    // 是否打包
+    let is_embed = config::section::<bool>("app", "is_embed", true);
+    if is_embed {
+        view = Tera::default();
+
+        for file in embed::Templates::iter() {
+            let filename = file.as_ref();
+            view.add_raw_template(filename.clone(), embed::get_tpl_data(filename.clone()).as_str()).unwrap_or_default();
+        }
+    } else {
+        view = Tera::new(concat!(env!("CARGO_MANIFEST_DIR"), "/assert/templates/**/*")).unwrap_or_default();
+    }
 
     // 设置模板函数
     nako_view::set_fns(&mut view);

src/boot/error.rs

@@ -31,7 +31,7 @@ use crate::nako::{
 };
 
 pub(crate) async fn app_default(req: HttpRequest) -> impl Responder {
-    get_error_response(&req, "no page")
+    get_error_response(&req, "404 Not Found")
 }
 
 pub(crate) fn json_parser_error(

src/nako/app.rs

@@ -5,8 +5,10 @@ use actix_web::{
     HttpResponse,
 };
 
-use crate::nako::http;
 use crate::nako::{
+    http,
+    embed,
+    utils,
     config,
 };
 
@@ -53,10 +55,30 @@ pub fn attach_path(name: String) -> String {
 
 // 列出模板
 pub fn list_tpls_by_prefix(file_prefix: String) -> Vec<String> {
-    let tpl = config::section::<String>("view", "blog_tpl_path", "./assert/templates/blog".to_string());
+    let base_path = "./assert/templates";
+
+    let tpl_path = config::section::<String>("view", "blog_tpl_path", "blog".to_string());
     let theme = config::section::<String>("view", "blog_theme", "nako".to_string());
 
-    let path = format!("{}/{}/", tpl, theme);
+    // 打包静态文件
+    let is_embed = config::section::<bool>("app", "is_embed", true);
+    if is_embed {
+        let prefix = format!("{}/{}/{}", tpl_path, theme, file_prefix);
+
+        let mut tpl_list: Vec<String> = Vec::new();
+        for file in embed::Templates::iter() {
+            let filename = file.as_ref();
+            let file_name = filename.clone();
+
+            if file_name.starts_with(&prefix) {
+                tpl_list.push(utils::get_path_filename(filename.clone()));
+            }
+        }
+
+        return tpl_list;
+    }
+
+    let path = format!("{}/{}/{}/", base_path, tpl_path, theme);
 
     let path_object = Path::new(&path);
 
@@ -101,9 +123,10 @@ pub fn page_tpls() -> Vec<String> {
 
 // 模板路径
 pub fn view_path(name: &str) -> String {
+    let tpl_path = config::section::<String>("view", "blog_tpl_path", "blog".to_string());
     let theme = config::section::<String>("view", "blog_theme", "nako".to_string());
 
-    let path = format!("blog/{}/{}", theme, name);
+    let path = format!("{}/{}/{}", tpl_path, theme, name);
 
     path
 }

src/nako/file.rs

@@ -17,7 +17,7 @@ impl File {
     }
 
     /// 判断是否存在
-    pub fn exists(f: &str) -> bool {
+    pub fn exists(&self, f: &str) -> bool {
         if path::Path::new(f).exists() {
             return true;
         }
@@ -26,14 +26,14 @@ impl File {
     }
 
     /// 删除文件
-    pub fn remove(f: &str) -> Result<(), Error> {
+    pub fn remove(&self, f: &str) -> Result<(), Error> {
         fs::remove_file(f)?;
 
         Ok(())
     }
 
     /// 创建文件
-    pub fn create(f: &str) -> Result<fs::File, Error> {
+    pub fn create(&self, f: &str) -> Result<fs::File, Error> {
         let file = fs::OpenOptions::new()
             .write(true)
             .create_new(true)
@@ -43,7 +43,7 @@ impl File {
     }
 
     /// 读取
-    pub fn read(f: &str) -> Result<String, Error> {
+    pub fn read(&self, f: &str) -> Result<String, Error> {
         let mut file = fs::File::open(f)?;
 
         let mut buffer = Vec::new();
@@ -55,7 +55,7 @@ impl File {
     }
 
     /// 写入信息
-    pub fn write(f: &str, content: String) -> Result<(), Error> {
+    pub fn write(&self, f: &str, content: String) -> Result<(), Error> {
         let path = path::Path::new(f);
 
         let mut file = fs::File::create(path)?;
@@ -65,14 +65,14 @@ impl File {
     }
 
     /// 创建文件夹
-    pub fn mkdir(d: &str) -> Result<(), Error> {
+    pub fn mkdir(&self, d: &str) -> Result<(), Error> {
         fs::create_dir_all(d)?;
 
         Ok(())
     }
 
     /// 删除文件夹
-    pub fn rmdir(d: &str) -> Result<(), Error> {
+    pub fn rmdir(&self, d: &str) -> Result<(), Error> {
         fs::remove_dir(d)?;
 
         Ok(())

src/nako/http.rs

@@ -11,8 +11,6 @@ use actix_web::{
 
 use crate::nako::{
     app,
-    embed,
-    config,
     global::Serialize,
 };
 
@@ -69,17 +67,7 @@ pub fn view_data() -> tera::Context {
 pub fn view(view: &mut tera::Tera, name: &str, ctx: &tera::Context) -> HttpResponse {
     let err = format!("html is error.");
 
-    let render: tera::Result<String>;
-
-    let is_embed = config::section::<bool>("app", "is_embed", true);
-    if is_embed {
-        let tpl_data = embed::get_tpl_data(name);
-        render = view.render_str(tpl_data.as_str(), ctx);
-    } else {
-        render = view.render(name, ctx);
-    }
-
-    let res_body: String = match render {
+    let res_body: String = match view.render(name, ctx) {
         Ok(v) => v,
         Err(e) => {
             if app::is_debug() {

src/nako/utils.rs

@@ -57,6 +57,17 @@ pub fn get_extension(filename: &str) -> String {
     "".to_string()
 }
 
+pub fn get_path_filename(path: &str) -> String {
+    let path_string = path.to_string();
+    let files = path_string.split("/").collect::<Vec<_>>();
+    let file_name = files.last();
+
+    match file_name {
+        Some(v) => v.to_string(),
+        None => "".to_string(),
+    }
+}
+
 pub fn formatsize<T: humansize::ToF64 + humansize::Unsigned>(size: T) -> String {
     let res: String = format_size(size, DECIMAL);