Merge pull request anspar#5 from Vahegian/develop

Develop

.github/workflows/release.yml

@@ -79,6 +79,4 @@ jobs:
           upload_url: ${{ needs.create-release.outputs.upload_url }}
           asset_path: ./target/release/arag.exe
           asset_name: arag.exe
-          asset_content_type: application/octet-stream
-
-
+          asset_content_type: application/octet-stream

Cargo.toml

@@ -16,5 +16,5 @@ console = "0.15.0" # MIT
 serde_yaml = "0.8"
 notify = "4.0.17" # CCO or  Artistic License 2.0
 minifier = "0.0.42" # MIT
-rocket = { version = "0.5.0-rc.1", features = ["json"] }
+rocket = { version = "0.5.0-rc.2", features = ["json"] }
 sha2 = "0.10.2" # MIT

src/main.rs

@@ -7,8 +7,7 @@ use opener;
 use rocket::fairing::AdHoc;
 use rocket::figment::Figment;
 use rocket::http::Status;
-use rocket::response::content::{Html, Json};
-use rocket::response::status;
+use rocket::response::{content, status};
 use rocket::{tokio, State};
 use std::env;
 use std::error::Error;
@@ -114,19 +113,22 @@ async fn cache_dependencies(dep: &Vec<String>) -> Result<(), Box<dyn std::error:
 }
 
 #[get("/")]
-pub async fn index(state: &State<AragState<'_>>) -> status::Custom<Html<String>> {
+pub fn index(state: &State<AragState<'_>>) -> status::Custom<content::RawHtml<String>> {
     let state = &**state;
     let build = pkg(state.clone(), false);
     let mut su = state.files_updated.lock().unwrap();
     *su = false;
-    status::Custom(Status::Ok, Html(build))
+    status::Custom(Status::Ok, content::RawHtml(build))
 }
 
 #[get("/update")]
-pub async fn update(state: &State<AragState<'_>>) -> status::Custom<Json<String>> {
+pub fn update(state: &State<AragState<'_>>) -> status::Custom<content::RawJson<String>> {
     let state = &**state;
     let fu = state.files_updated.lock().unwrap();
-    status::Custom(Status::Ok, Json(format!("{{\"update\": {fu}}}")))
+    status::Custom(
+        Status::Ok,
+        content::RawJson(format!("{{\"update\": {fu}}}")),
+    )
 }
 
 #[rocket::main]