enum variants to control character set

This commit is contained in:
Brandon Thomas committed 2022-12-13 15:43:19 -05:00
1 parent 64e3864140
commit ad88800b4e
5 files changed
+17 -5

No files matched your search

+1
View File
@@ -5,6 +5,7 @@
<w>backfill</w>
<w>cashapp</w>
<w>cheermote</w>
<w>crockford</w>
<w>fakeyou</w>
<w>hifigan</w>
<w>scrollback</w>
+1 -1
View File
@@ -2,4 +2,4 @@
pub struct InferenceToken(String);
impl_string_token!(InferenceToken);
impl_crockford_generator!(InferenceToken, 32usize, "infj_", false);
impl_crockford_generator!(InferenceToken, 32usize, "infj_", CrockfordLower);
+8 -1
View File
@@ -18,9 +18,16 @@
#![allow(non_snake_case)]
// Crockford characters
// https://en.wikipedia.org/wiki/Base32#Crockford's_Base32
pub(crate) const CROCKFORD_UPPERCASE_CHARSET: &[u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ";
pub(crate) const CROCKFORD_LOWERCASE_CHARSET: &[u8] = b"0123456789abcdefghjkmnpqrstvwxyz";
pub(crate) const CROCKFORD_MIXED_CASE_CHARSET: &[u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz";
pub(crate) enum TokenCharacterSet {
CrockfordUpper,
CrockfordLower,
CrockfordMixed,
}
#[macro_use]
mod macros;
+6 -2
View File
@@ -30,14 +30,18 @@ macro_rules! impl_string_token {
}
macro_rules! impl_crockford_generator {
($t:ident, $total_string_length:literal, $token_prefix:literal, $uppercase:literal) => {
($t:ident, $total_string_length:literal, $token_prefix:literal, $character_case:ident) => {
impl $t {
/// Constructor for a new token.
#[inline]
pub fn generate() -> Self {
use rand::Rng;
let charset = if $uppercase { crate::CROCKFORD_UPPERCASE_CHARSET } else { crate::CROCKFORD_LOWERCASE_CHARSET };
let charset = match crate::TokenCharacterSet::$character_case {
crate::TokenCharacterSet::CrockfordUpper => crate::CROCKFORD_UPPERCASE_CHARSET,
crate::TokenCharacterSet::CrockfordLower => crate::CROCKFORD_LOWERCASE_CHARSET,
crate::TokenCharacterSet::CrockfordMixed => crate::CROCKFORD_MIXED_CASE_CHARSET,
};
let mut rng = rand::thread_rng();
+1 -1
View File
@@ -26,7 +26,7 @@ pub struct UserToken(pub String);
// }
impl_string_token!(UserToken);
impl_crockford_generator!(UserToken, 15usize, "U:", true);
impl_crockford_generator!(UserToken, 15usize, "U:", CrockfordUpper);
#[cfg(test)]
mod tests {