diff --git a/src/main.rs b/src/main.rs index 77d199e..77d0923 100644 --- a/src/main.rs +++ b/src/main.rs @@ -200,18 +200,6 @@ impl FromStr for NumberOrString { } } -#[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString)] -#[strum(ascii_case_insensitive)] -pub enum ColumnType { - Id, - Time, - Size, - Compression, - FileSize, - FilePath, - Tags, - Meta, -} fn main() -> Result<(), Error> { use std::fs; diff --git a/src/modes/common.rs b/src/modes/common.rs index 09ef076..3fc5798 100644 --- a/src/modes/common.rs +++ b/src/modes/common.rs @@ -46,6 +46,19 @@ pub fn size_column(size: u64, human_readable: bool, column_width: usize) -> Stri string_column(format_size(size, human_readable), column_width) } +#[derive(Debug, Eq, PartialEq, Clone, strum::EnumIter, strum::Display, strum::EnumString)] +#[strum(ascii_case_insensitive)] +pub enum ColumnType { + Id, + Time, + Size, + Compression, + FileSize, + FilePath, + Tags, + Meta, +} + pub fn get_format_box_chars_no_border_line_separator() -> TableFormat { prettytable::format::FormatBuilder::new() .column_separator('│') diff --git a/src/modes/get.rs b/src/modes/get.rs index b0cd557..a34c0c4 100644 --- a/src/modes/get.rs +++ b/src/modes/get.rs @@ -5,6 +5,7 @@ use crate::compression::CompressionType; use clap::Command; use std::path::PathBuf; use std::str::FromStr; +use crate::modes::common::ColumnType; pub fn mode_get( cmd: &mut Command, diff --git a/src/modes/list.rs b/src/modes/list.rs index 610aab0..99cc667 100644 --- a/src/modes/list.rs +++ b/src/modes/list.rs @@ -1,7 +1,7 @@ use crate::Alignment; use crate::db::{get_item, get_item_last, get_items, get_items_matching, Item, Meta, Tag}; -use crate::modes::common::{format_size, get_format_box_chars_no_border_line_separator}; +use crate::modes::common::{format_size, get_format_box_chars_no_border_line_separator, ColumnType}; use crate::modes::common::{size_column, string_column}; use prettytable::color; use prettytable::row;