Skip to content

Commit

Permalink
Merge 8feff89 into b1ca356
Browse files Browse the repository at this point in the history
  • Loading branch information
Eliot00 authored Dec 21, 2021
2 parents b1ca356 + 8feff89 commit 4ec5a65
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: zip macos artifact
if: runner.os == 'macOS'
run: |
cd quake_webapp && zip -qq -r ../web.zip dist
cd quake_webapp && mv dist web && zip -qq -r ../web.zip web
- name: Upload binaries to release
if: runner.os == 'macOS'
Expand Down
56 changes: 56 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ tracing-subscriber = "0.2"

syntect = { version = "4.2", default-features = false, features = ["default-fancy"] }

zip = "0.5"

[features]
webserver = []

Expand Down
96 changes: 88 additions & 8 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::error::Error;
use std::fs;
use std::path::PathBuf;
use std::io::{self, Cursor};
use std::path::{Path, PathBuf};
use std::{env, fs};

use clap::Parser;
use futures::executor::block_on;
Expand All @@ -22,6 +23,8 @@ pub mod pagedump;
pub mod server;
pub mod usecases;

const VERSION: &str = env!("CARGO_PKG_VERSION");

#[derive(Parser)]
#[clap(version = "0.1.2", author = "Inherd <quake@inherd.org>")]
pub struct Opts {
Expand Down Expand Up @@ -101,7 +104,7 @@ async fn main() {

pub async fn process_cmd(opts: Opts) -> Result<(), Box<dyn Error>> {
match opts.cmd {
SubCommand::Init(init) => init_projects(init)?,
SubCommand::Init(init) => init_projects(init).await?,
SubCommand::Cmd(cmd) => {
let conf = config_quake(&cmd)?;
if !cmd.input.is_empty() {
Expand Down Expand Up @@ -168,21 +171,22 @@ fn load_config(path: &str) -> Result<QuakeConfig, Box<dyn Error>> {
Ok(conf)
}

fn init_projects(config: Init) -> Result<(), Box<dyn Error>> {
async fn init_projects(config: Init) -> Result<(), Box<dyn Error>> {
fs::create_dir_all(&config.path)?;

let path = PathBuf::from(&config.path).join(".quake.yaml");
let define = PathBuf::from(&config.path).join("entries-define.yaml");
let workspace = PathBuf::from(&config.path);
let path = workspace.join(".quake.yaml");
let define = workspace.join("entries-define.yaml");

let config = QuakeConfig {
let quake_config = QuakeConfig {
workspace: config.path,
editor: "".to_string(),
search_url: "http://127.0.0.1:7700".to_string(),
server_location: "web".to_string(),
port: 8000,
};

fs::write(&path, serde_yaml::to_string(&config)?)?;
fs::write(&path, serde_yaml::to_string(&quake_config)?)?;
debug!("create .quake.yaml in {:?}", &path.display());

let todo_define = "
Expand All @@ -200,6 +204,66 @@ fn init_projects(config: Init) -> Result<(), Box<dyn Error>> {
fs::write(&define, serde_yaml::to_string(&file)?)?;
debug!("create default entry defines in {:?}", &define.display());

if config.download {
let target = format!(
"https://github.com/phodal/quake/releases/download/v{}/web.zip",
VERSION
);
debug!("download web.zip from {}", target);

let response = reqwest::get(&target).await?.bytes().await?;
unzip_all(Cursor::new(response.to_vec()), &workspace)?;
}

Ok(())
}

fn unzip_all(reader: Cursor<Vec<u8>>, plugins_path: &Path) -> Result<(), Box<dyn Error>> {
let mut archive = zip::ZipArchive::new(reader)?;

for i in 0..archive.len() {
let mut file = archive.by_index(i)?;
let out_path = match file.enclosed_name() {
Some(path) => plugins_path.join(path),
None => continue,
};

{
let comment = file.comment();
if !comment.is_empty() {
println!("Plugin {} comment: {}", i, comment);
}
}

if (&*file.name()).ends_with('/') {
println!("File {} extracted to \"{}\"", i, out_path.display());
fs::create_dir_all(&out_path)?;
} else {
println!(
"File {} extracted to \"{}\" ({} bytes)",
i,
out_path.display(),
file.size()
);
if let Some(p) = out_path.parent() {
if !p.exists() {
fs::create_dir_all(&p)?;
}
}
let mut outfile = fs::File::create(&out_path)?;
io::copy(&mut file, &mut outfile)?;
}

// Get and Set permissions
#[cfg(unix)]
{
use std::os::unix::fs::PermissionsExt;

if let Some(mode) = file.unix_mode() {
fs::set_permissions(&out_path, fs::Permissions::from_mode(mode))?;
}
}
}
Ok(())
}

Expand Down Expand Up @@ -277,6 +341,22 @@ mod tests {
});
}

#[test]
#[ignore = "need tokio runtime"]
fn should_download_webapp_dist() {
task::block_on(async {
let test_dir = "test_dir";
process_cmd(Opts {
cmd: SubCommand::Init(Init {
path: test_dir.to_string(),
download: true,
}),
})
.await
.unwrap();
})
}

fn config_dir() -> PathBuf {
PathBuf::from("_fixtures")
.join("configs")
Expand Down

0 comments on commit 4ec5a65

Please sign in to comment.