From 2c42798bc33bb27bc59a5cf754bba12394fc8898 Mon Sep 17 00:00:00 2001 From: Paul van Tilburg Date: Fri, 21 Sep 2018 21:23:06 +0200 Subject: [PATCH] Run rustfmt; add FIXME --- src/main.rs | 7 ++++--- src/registry.rs | 11 +++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index bb01b33..cd3f47b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,11 +19,12 @@ use std::sync::{Arc, Mutex}; use registry::Registry; +mod registry; + lazy_static! { static ref REGISTRY: Arc> = Arc::new(Mutex::new(Registry::default())); } -mod registry; fn main() -> Result<(), Error> { let matches = App::new("Music Sync") .version("0.1.0") @@ -86,6 +87,7 @@ fn select_albums(ui: &mut Cursive) { let added_albums = registry.added_albums(); let existing_albums = registry.existing_albums(); let removed_albums = registry.removed_albums(); + // FIXME: Use a custom view for this. let list_view = ListView::new() .with(|list_view| { list_view.add_child("--- New", Checkbox::new().disabled()); @@ -122,8 +124,7 @@ fn select_albums(ui: &mut Cursive) { } list_view.add_child(album_name(album_path), checkbox); } - }) - .scrollable(); + }).scrollable(); ui.pop_layer(); ui.add_layer( diff --git a/src/registry.rs b/src/registry.rs index 02b6e6a..f75342a 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -23,12 +23,11 @@ impl Registry { .max_depth(2); let dir_filter = |entry: &DirEntry| { // The entry should be a directory and its name should not start with "extra" - entry.metadata().map(|e| e.is_dir()).unwrap_or(false) - && !entry - .file_name() - .to_str() - .map(|s| s.starts_with("extra")) - .unwrap_or(true) + entry.metadata().map(|e| e.is_dir()).unwrap_or(false) && !entry + .file_name() + .to_str() + .map(|s| s.starts_with("extra")) + .unwrap_or(true) }; for entry in dir_walker.into_iter().filter_entry(dir_filter) {