Compare commits
No commits in common. "main" and "v1.0.1" have entirely different histories.
164
Cargo.lock
generated
164
Cargo.lock
generated
|
|
@ -11,12 +11,6 @@ dependencies = [
|
|||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "android-tzdata"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
|
||||
|
||||
[[package]]
|
||||
name = "android_system_properties"
|
||||
version = "0.1.5"
|
||||
|
|
@ -81,16 +75,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.38"
|
||||
version = "0.4.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
|
||||
checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
|
||||
dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
"time",
|
||||
"wasm-bindgen",
|
||||
"windows-targets",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -179,12 +174,6 @@ dependencies = [
|
|||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
|
||||
[[package]]
|
||||
name = "expanduser"
|
||||
version = "1.2.2"
|
||||
|
|
@ -204,14 +193,14 @@ checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
|
|||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
"wasi 0.9.0+wasi-snapshot-preview1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.3"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||
|
||||
[[package]]
|
||||
name = "iana-time-zone"
|
||||
|
|
@ -239,11 +228,11 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.2.6"
|
||||
version = "1.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
|
||||
checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"autocfg",
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
|
|
@ -292,6 +281,25 @@ version = "2.5.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
|
||||
[[package]]
|
||||
name = "nom8"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.15"
|
||||
|
|
@ -409,16 +417,16 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "0.6.5"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
|
||||
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "soyuz-cli"
|
||||
version = "1.0.2"
|
||||
version = "1.0.1"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"expanduser",
|
||||
|
|
@ -468,10 +476,21 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.7.8"
|
||||
name = "time"
|
||||
version = "0.1.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
|
||||
checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
|
|
@ -481,24 +500,24 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml_datetime"
|
||||
version = "0.6.5"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
|
||||
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.19.15"
|
||||
version = "0.19.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
|
||||
checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"nom8",
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -519,6 +538,12 @@ version = "0.9.0+wasi-snapshot-preview1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.84"
|
||||
|
|
@ -603,76 +628,3 @@ name = "winapi-x86_64-pc-windows-gnu"
|
|||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.5.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
|
|
|||
12
Cargo.toml
12
Cargo.toml
|
|
@ -1,13 +1,13 @@
|
|||
[package]
|
||||
name = "soyuz-cli"
|
||||
version = "1.0.2"
|
||||
version = "1.0.1"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
chrono = "~0.4.38"
|
||||
expanduser = "~1.2.2"
|
||||
regex = "~1.7.1"
|
||||
serde = { version = "~1.0.152", features = ["derive"] }
|
||||
toml = { version = "~0.7.3", features = ["parse"] }
|
||||
chrono = "0.4.24"
|
||||
expanduser = "1.2.2"
|
||||
regex = "1.7.1"
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
toml = { version = "0.7.2", features = ["parse"] }
|
||||
|
|
|
|||
14
README.md
14
README.md
|
|
@ -17,18 +17,10 @@ It is mostly a wrapper around `rsync`. Additionally it will maintain an archive
|
|||
|
||||
## Installation
|
||||
|
||||
The easiest way to install `soyuz-cli` is using the install script. Note that these scripts **will overwrite any previously installed version**.
|
||||
|
||||
If you are using a recent version of MacOS, run this command in `Terminal`:
|
||||
The easiest way to install `soyuz-cli` is using the install script. If you are using MacOS, run this command in `Terminal`:
|
||||
|
||||
```sh
|
||||
curl -kL https://hugh.run/install-soyuz | bash
|
||||
```
|
||||
|
||||
To install for MacOS Mojave, run this command instead:
|
||||
|
||||
```sh
|
||||
curl -kL https://hugh.run/install-soyuz-mojave | bash
|
||||
curl https://hugh.run/install-soyuz | bash
|
||||
```
|
||||
|
||||
Alternatively, you can build from source if you have rust and cargo installed.
|
||||
|
|
@ -44,4 +36,4 @@ Once installed, run `soyuz settings` to create a new settings file. The settings
|
|||
|
||||
## Commands
|
||||
|
||||
Run `soyuz help` for a list of commands and what they do.
|
||||
Run `soyuz help` for a list of commands and what they do.
|
||||
|
|
@ -2,10 +2,11 @@
|
|||
|
||||
# This script installs soyuz-cli
|
||||
|
||||
# Download latest binary
|
||||
wget -q --show-progress https://github.com/hughrun/soyuz-cli/releases/latest/download/MacOS
|
||||
# mv to /usr/local/bin and rename
|
||||
mv MacOS /usr/local/bin/soyuz
|
||||
# Get the latest version number
|
||||
url=$(curl $1 -s -L -I -o /dev/null -w '%{url_effective}' https://github.com/hughrun/soyuz-cli/releases/latest)
|
||||
version=${url##*/} # retain the part after the last slash
|
||||
# Download latest binary and save in /usr/local/bin
|
||||
curl -L https://github.com/hughrun/soyuz-cli/releases/download/$version/MacOS > /usr/local/bin/soyuz
|
||||
# make it executable
|
||||
chmod +x /usr/local/bin/soyuz
|
||||
|
||||
|
|
|
|||
105
src/main.rs
105
src/main.rs
|
|
@ -140,11 +140,6 @@ fn publish() -> Result<(), Box<dyn std::error::Error>> {
|
|||
let post = fs::read_to_string(format!("{}/{}", dirpath, &filename))?;
|
||||
let post_lines: Vec<&str> = post.lines().collect();
|
||||
let title = post_lines[0].strip_prefix("# ");
|
||||
if title.is_none() {
|
||||
println!("ABORTING: Your latest post does not have a title.");
|
||||
println!("Use a '# Heading' on the first line.");
|
||||
return Ok(())
|
||||
}
|
||||
let entry_string = format!("=> {} {} ({})", filename, sliced, title.unwrap());
|
||||
let home_entry_string = format!("=> /{}/{} {} ({})", &year, filename, sliced, title.unwrap());
|
||||
if let Ok(index) = fs::read_to_string(&indexfilepath) {
|
||||
|
|
@ -284,75 +279,53 @@ fn sync(args: &Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
|
|||
}
|
||||
}
|
||||
|
||||
fn write(args: &Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
|
||||
|
||||
fn write() -> Result<(), Box<dyn std::error::Error>> {
|
||||
println!("Checking server for latest post...");
|
||||
let config = read_config()?;
|
||||
let dt = Local::now();
|
||||
let year = &dt.format("%Y").to_string();
|
||||
let local_dir: std::path::PathBuf = expanduser(&config.local_dir)?;
|
||||
let remote_dir: std::path::PathBuf = expanduser(&config.remote_dir)?;
|
||||
fs::create_dir_all(format!("{}{}", &local_dir.display(), &year))?;
|
||||
let filepath = format!("{}{}/{}.gmi", local_dir.display(), year, dt.format("%Y-%m-%d"));
|
||||
|
||||
match args.len() {
|
||||
2 => {
|
||||
let remote_dir: std::path::PathBuf = expanduser(&config.remote_dir)?;
|
||||
let spath = format!("{}", remote_dir.display());
|
||||
let remote_vec = spath.split(':').collect::<Vec<_>>();
|
||||
let server_name = remote_vec[0];
|
||||
let server_path = remote_vec[1];
|
||||
let remote_filepath = format!("{}{}/{}.gmi", server_path, year, dt.format("%Y-%m-%d"));
|
||||
let cmd = format!("[[ -f {} ]] && echo 'true' || echo 'false';", &remote_filepath);
|
||||
|
||||
println!("Checking server for latest post...");
|
||||
let check = Command::new("ssh")
|
||||
.args(["-q", &server_name, &cmd])
|
||||
.stdout(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("reading from server failed");
|
||||
let output = check
|
||||
.wait_with_output()
|
||||
.expect("something fucked up");
|
||||
let out = std::str::from_utf8(&output.stdout);
|
||||
let out2 = out.clone()?.trim();
|
||||
match out?.trim() {
|
||||
"true" => {
|
||||
// user has already published today
|
||||
println!("\x1B[1;31mYou have already published today!\x1B[0m");
|
||||
println!("To edit a post published with soyuz-web, run 'soyuz sync down' first.");
|
||||
println!("To edit a published post already saved locally, use 'soyuz write --edit'");
|
||||
Ok(())
|
||||
},
|
||||
"false" => {
|
||||
// open a new file
|
||||
Ok(open_file(filepath.into()))
|
||||
},
|
||||
_ => {
|
||||
println!("Something went wrong checking your gemini server");
|
||||
println!("Error: {:?}", out2);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
},
|
||||
3 => {
|
||||
match args[2].as_str() {
|
||||
"--edit" => Ok(open_file(filepath.into())),
|
||||
_ => {
|
||||
println!("Unknown command. Try 'soyuz help'.");
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
},
|
||||
_ => {
|
||||
println!("Unknown command. Try 'soyuz help'.");
|
||||
let spath = format!("{}", remote_dir.display());
|
||||
let remote_vec = spath.split(':').collect::<Vec<_>>();
|
||||
let server_name = remote_vec[0];
|
||||
let server_path = remote_vec[1];
|
||||
let remote_filepath = format!("{}{}/{}.gmi", server_path, year, dt.format("%Y-%m-%d"));
|
||||
let cmd = format!("[[ -f {} ]] && echo 'true' || echo 'false';", &remote_filepath);
|
||||
let check = Command::new("ssh")
|
||||
.args(["-q", &server_name, &cmd])
|
||||
.stdout(Stdio::piped())
|
||||
.spawn()
|
||||
.expect("reading from server failed");
|
||||
let output = check
|
||||
.wait_with_output()
|
||||
.expect("something fucked up");
|
||||
let out = std::str::from_utf8(&output.stdout);
|
||||
let out2 = out.clone()?.trim();
|
||||
match out?.trim() {
|
||||
"true" => {
|
||||
// user has already published today
|
||||
println!("\x1B[1;31mYou have already published today!\x1B[0m");
|
||||
println!("To edit your post, run 'sync down' first.");
|
||||
Ok(())
|
||||
},
|
||||
"false" => {
|
||||
// open a new file
|
||||
Ok(open_file(filepath.into()))
|
||||
},
|
||||
_ => {
|
||||
println!("Something went wrong checking your gemini server");
|
||||
println!("Error: {:?}", out2);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fn match_single_arg(args: &Vec<String>) -> Result<(), Box<dyn std::error::Error>> {
|
||||
match args[1].as_str() {
|
||||
"write" => write(args),
|
||||
"write" => write(),
|
||||
"settings" => settings(),
|
||||
"publish" => publish(),
|
||||
"sync" => sync(args),
|
||||
|
|
@ -365,13 +338,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>>{
|
|||
match &args.len() {
|
||||
1 => Ok(help()),
|
||||
2 => match_single_arg(&args),
|
||||
3 | 4 => {
|
||||
match args[1].as_str() {
|
||||
"sync" => sync(&args),
|
||||
"write" => write(&args),
|
||||
&_ => Ok(help())
|
||||
}
|
||||
},
|
||||
3 | 4 => sync(&args),
|
||||
_ => Ok(help())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue