fetch & fetchpost: consolidate more shared data structures in fet…

…ch.rs

src/cmd/fetch.rs

@@ -330,7 +330,7 @@ const MIN_WAIT: time::Duration = time::Duration::from_millis(MINIMUM_WAIT_MS);
 
 // for --report option
 #[derive(PartialEq)]
-enum ReportKind {
+pub enum ReportKind {
  Detailed,
  Short,
  None,
@@ -362,12 +362,12 @@ impl RedisConfig {
 }
 
 #[derive(Debug)]
-struct DiskCacheConfig {
- ttl_secs: u64,
- ttl_refresh: bool,
+pub struct DiskCacheConfig {
+ pub ttl_secs: u64,
+ pub ttl_refresh: bool,
 }
 impl DiskCacheConfig {
- fn new() -> DiskCacheConfig {
+ pub fn new() -> DiskCacheConfig {
  Self {
  ttl_secs: std::env::var("QSV_DISKCACHE_TTL_SECS")
  .unwrap_or_else(|_| DEFAULT_DISKCACHE_TTL_SECS.to_string())
@@ -379,7 +379,7 @@ impl DiskCacheConfig {
 }
 
 #[derive(Debug, Default, PartialEq)]
-enum CacheType {
+pub enum CacheType {
  #[default]
  None,
  InMemory,
@@ -388,10 +388,10 @@ enum CacheType {
 }
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
-struct FetchResponse {
- response: String,
- status_code: u16,
- retries: u8,
+pub struct FetchResponse {
+ pub response: String,
+ pub status_code: u16,
+ pub retries: u8,
 }
 
 static DISKCACHE_DIR: OnceLock<String> = OnceLock::new();

src/cmd/fetchpost.rs

@@ -206,7 +206,8 @@ use url::Url;
 
 use crate::{
  cmd::fetch::{
- get_ratelimit_header_value, parse_ratelimit_header_value, process_jql, RedisConfig,
+ get_ratelimit_header_value, parse_ratelimit_header_value, process_jql, CacheType,
+ DiskCacheConfig, FetchResponse, RedisConfig, ReportKind,
  },
  config::{Config, Delimiter},
  select::SelectColumns,
@@ -257,21 +258,6 @@ static DEFAULT_ACCEPT_ENCODING: &str = "br;q=1.0, gzip;q=0.6, deflate;q=0.4, *;q
 const MINIMUM_WAIT_MS: u64 = 10;
 const MIN_WAIT: time::Duration = time::Duration::from_millis(MINIMUM_WAIT_MS);
 
-// for --report option
-#[derive(PartialEq)]
-enum ReportKind {
- Detailed,
- Short,
- None,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-struct FetchResponse {
- response: String,
- status_code: u16,
- retries: u8,
-}
-
 static REDISCONFIG: OnceLock<RedisConfig> = OnceLock::new();
 
 pub fn run(argv: &[&str]) -> CliResult<()> {