v0.0.5

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "picterm"
-version = "0.0.4"
+version = "0.0.5"
 authors = ["Keisuke Toyota <[email protected]>"]
 edition = "2018"
 repository = "https://github.com/ksk001100/picterm"

src/app/actions.rs

@@ -1,8 +1,9 @@
 use crate::inputs::key::Key;
-use std::collections::HashMap;
-use std::fmt;
-use std::fmt::Display;
-use std::slice::Iter;
+use std::{
+    collections::HashMap,
+    fmt::{self, Display},
+    slice::Iter,
+};
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum Action {

src/app/mod.rs

@@ -2,12 +2,14 @@ pub mod actions;
 pub mod state;
 pub mod ui;
 
-use self::actions::Actions;
-use self::state::AppState;
-use crate::app::actions::Action;
-
-use crate::inputs::key::Key;
-use crate::io::IoEvent;
+use crate::{
+    app::{
+        actions::{Action, Actions},
+        state::AppState,
+    },
+    inputs::key::Key,
+    io::IoEvent,
+};
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum AppReturn {

src/app/ui.rs

@@ -1,16 +1,13 @@
-use crate::app::state::AppState;
-use crate::app::Actions;
-use crate::app::App;
-
+use crate::app::{state::AppState, Actions, App};
 use byte_unit::Byte;
-use tui::backend::Backend;
-use tui::layout::{Alignment, Constraint, Direction, Layout, Rect};
-use tui::style::{Color, Style};
-use tui::text::Span;
-use tui::widgets::{
-    Block, BorderType, Borders, Cell, List, ListItem, ListState, Paragraph, Row, Table,
+use tui::{
+    backend::Backend,
+    layout::{Alignment, Constraint, Direction, Layout, Rect},
+    style::{Color, Style},
+    text::Span,
+    widgets::{Block, BorderType, Borders, Cell, List, ListItem, ListState, Paragraph, Row, Table},
+    Frame,
 };
-use tui::Frame;
 
 pub fn draw<B>(rect: &mut Frame<B>, app: &mut App)
 where
@@ -34,7 +31,7 @@ where
 
     let info_chunks = Layout::default()
         .direction(Direction::Horizontal)
-        .constraints([Constraint::Percentage(70), Constraint::Percentage(30)].as_ref())
+        .constraints([Constraint::Percentage(20), Constraint::Percentage(80)].as_ref())
         .split(header_chunks[1]);
 
     let help = draw_help(app.actions());
@@ -103,7 +100,7 @@ fn draw_info<'a>(state: &AppState) -> Table<'a> {
                 .borders(Borders::ALL)
                 .border_type(BorderType::Plain),
         )
-        .widths(&[Constraint::Length(20), Constraint::Percentage(80)])
+        .widths(&[Constraint::Length(15), Constraint::Percentage(85)])
         .column_spacing(1)
 }
 

src/inputs/events.rs

@@ -1,8 +1,11 @@
-use super::key::Key;
-use super::InputEvent;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-use std::time::Duration;
+use super::{key::Key, InputEvent};
+use std::{
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+    time::Duration,
+};
 
 pub struct Events {
     rx: tokio::sync::mpsc::Receiver<InputEvent>,
@@ -39,12 +42,10 @@ impl Events {
         }
     }
 
-    /// Attempts to read an event.
     pub async fn next(&mut self) -> InputEvent {
         self.rx.recv().await.unwrap_or(InputEvent::Tick)
     }
 
-    /// Close
     pub fn close(&mut self) {
         self.stop_capture.store(true, Ordering::Relaxed)
     }

src/inputs/mod.rs

@@ -1,7 +1,7 @@
 pub mod events;
 pub mod key;
 
-use self::key::Key;
+use crate::inputs::key::Key;
 
 pub enum InputEvent {
     Input(Key),

src/io/handler.rs

@@ -1,12 +1,15 @@
-use super::IoEvent;
-use crate::app::state::ImageInfo;
-use crate::app::App;
-use crate::image::image_fit_size;
+use crate::{
+    app::{state::ImageInfo, App},
+    image::image_fit_size,
+    io::IoEvent,
+};
 use eyre::Result;
 use image::{GenericImageView, Rgba};
 use std::sync::Arc;
-use tui::style::{Color, Style};
-use tui::text::{Span, Spans};
+use tui::{
+    style::{Color, Style},
+    text::{Span, Spans},
+};
 
 pub struct IoAsyncHandler<'a> {
     app: Arc<tokio::sync::Mutex<App<'a>>>,

src/lib.rs

@@ -4,16 +4,17 @@ pub mod inputs;
 pub mod io;
 pub mod utils;
 
-use crate::app::ui;
-use app::{App, AppReturn};
+use crate::{
+    app::{ui, App, AppReturn},
+    io::IoEvent,
+};
 use crossterm::{
     event::{DisableMouseCapture, EnableMouseCapture},
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use eyre::Result;
 use inputs::{events::Events, InputEvent};
-use io::IoEvent;
 use std::{io::stdout, sync::Arc, time::Duration};
 use tui::{backend::CrosstermBackend, Terminal};
 

src/main.rs

@@ -1,12 +1,11 @@
 use eyre::Result;
-use picterm::app::App;
-use picterm::io::handler::IoAsyncHandler;
-use picterm::io::IoEvent;
-use picterm::start_ui;
+use picterm::{
+    app::App,
+    io::{handler::IoAsyncHandler, IoEvent},
+    start_ui,
+};
 use seahorse::{App as SeahorseApp, Context};
-use std::env;
-use std::path::Path;
-use std::sync::Arc;
+use std::{env, path::Path, sync::Arc};
 
 fn main() -> Result<()> {
     let args = env::args().collect();

src/utils.rs

@@ -1,5 +1,4 @@
-use std::fs;
-use std::path::PathBuf;
+use std::{fs, path::PathBuf};
 
 pub fn get_image_paths(path: &str) -> Vec<PathBuf> {
     static FILE_TYPES: [&str; 6] = ["png", "jpg", "jpeg", "webp", "bmp", "gif"];