valerie/pride
1
0
Fork 0
Code Issues Pull requests Projects Releases 10 Packages 1 Wiki Activity

Merge branch 'random-default'

Browse source
This commit is contained in:
Valerie Wolfe 2024-12-13 11:01:07 -05:00
commit a161aab0ca
3 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "pride" name = "pride"
version = "0.4.2" version = "0.4.3"
edition = "2021" edition = "2021"
authors = [ "Valerie Wolfe <sleeplessval@gmail.com>" ] authors = [ "Valerie Wolfe <sleeplessval@gmail.com>" ]
description = "Pride flags in the terminal." description = "Pride flags in the terminal."
@ -19,6 +19,7 @@ name = "pride"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
oorandom = '11.1.4'
pico-args = "0.5.0" pico-args = "0.5.0"
termion = "4.0.3" termion = "4.0.3"

8
man/pride.6
View file

@ -85,9 +85,13 @@ The transgender pride flag designed by Monica Helms in 1999.
.Sh ENVIRONMENT .Sh ENVIRONMENT
.Bl -tag -width Ds .Bl -tag -width Ds
.It PRIDE_DEFAULT .It PRIDE_DEFAULT
A string containing the name of a flag to use as the default when no A string containing the name of one or more flags to use as the default when no
.Ar flag .Ar flag
argument is provided. argument is provided. If the string contains a semicolon-separated list of flags, a random one will be selected from the list. If a space is found in the chosen substring, it will be used to provide the
.Ar flag
and
.Ar variant
arguments.
.El .El
.Sh EXIT STATUS .Sh EXIT STATUS
.Bl -tag -width Ds .Bl -tag -width Ds

37
src/main.rs
View file

@ -1,5 +1,8 @@
//! main method module //! main method module
use std::env::var; use std::{
env::var,
time::UNIX_EPOCH
};
use pico_args::Arguments; use pico_args::Arguments;
@ -20,10 +23,10 @@ use crate::{
static VERSION: &str = env!("CARGO_PKG_VERSION"); static VERSION: &str = env!("CARGO_PKG_VERSION");
pub const FLAG_HELP: [&str;2] = [ "-h", "--help" ]; pub const FLAG_HELP: [&str;2] = [ "-h", "--help" ];
pub const FLAG_LIST: [&str;2] = [ "-l", "--list" ]; pub const FLAG_LIST: [&str;2] = [ "-l", "--list" ];
pub const FLAG_SIZE: [&str;2] = [ "-s", "--size"]; pub const FLAG_SIZE: [&str;2] = [ "-s", "--size" ];
pub const FLAG_VERSION: [&str;2] = [ "-v", "--version" ]; pub const FLAG_VERSION: [&str;2] = [ "-v", "--version" ];
fn main() { fn main() {
// collect args // collect args
@ -51,13 +54,25 @@ fn main() {
let state = State::new(&mut args); let state = State::new(&mut args);
let subcommand = let ( subcommand, variant ) =
if let Ok(Some(subcommand)) = args.subcommand() { Some(subcommand) } if let Ok(Some(subcommand)) = args.subcommand() { ( Some(subcommand), args.subcommand().unwrap()) }
else if let Ok(default) = var("PRIDE_DEFAULT") { else if let Ok(default) = var("PRIDE_DEFAULT") {
if default.is_empty() { None } if default.is_empty() { ( None, None ) }
else { Some(default) } else if default.contains(';') {
} else { None }; let split: Vec<&str> = default.split(';').collect();
let variant = args.subcommand().unwrap(); if let Ok(time) = UNIX_EPOCH.elapsed() {
let index = oorandom::Rand32::new(time.as_secs()).rand_u32();
let chosen = split[index as usize % split.len()].to_owned();
if chosen.contains(' ') {
let split: Vec<&str> = chosen.split(' ').collect();
( Some(split[0].to_owned()), Some(split[1].to_owned()) )
} else { ( Some(chosen), None ) }
} else { ( None, None ) }
} else if default.contains(' ') {
let split: Vec<&str> = default.split(' ').collect();
( Some(split[0].to_owned()), Some(split[1].to_owned()) )
} else { ( Some(default), None ) }
} else { ( None, None ) };
// get color vec from matched flag // get color vec from matched flag
let flag: Flag = match subcommand.as_deref() { let flag: Flag = match subcommand.as_deref() {