diff --git a/Cargo.toml b/Cargo.toml index 48e917d..dc853cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ default-run = "hunter" [dependencies] termion = "1.5" unicode-width = "0.1.5" -lazy_static = "1.3" +lazy_static = "1" alphanumeric-sort = "1.0.6" lscolors = { version = "0.5.0", features = [ "ansi_term" ] } tree_magic = "0.2.1" @@ -31,7 +31,7 @@ notify = "4.0.12" parse-ansi = "0.1.6" signal-notify = "0.1.3" systemstat = "0.1.5" -mime_guess = "2.0.0-alpha.6" +mime_guess = "2.0" async_value = "0.2.5" osstrtools = "0.1.9" pathbuftools = "0.1" diff --git a/src/files.rs b/src/files.rs index 9d49db2..fa774c5 100644 --- a/src/files.rs +++ b/src/files.rs @@ -852,8 +852,8 @@ impl File { pub fn get_mime(&self) -> Option { if let Some(ext) = self.path.extension() { - let mime = mime_guess::get_mime_type(&ext.to_string_lossy()); - Some(mime) + let mime = mime_guess::from_ext(&ext.to_string_lossy()).first(); + mime } else { // Fix crash in tree_magic when called on non-regular file self.meta() diff --git a/src/hunter-media.rs b/src/hunter-media.rs index 585f3d8..02cd0d9 100644 --- a/src/hunter-media.rs +++ b/src/hunter-media.rs @@ -281,20 +281,19 @@ fn read_keys(gst: Gstreamer, if let Some(ref renderer) = renderer { let xsize = stdin.read_line()? .unwrap_or(String::from("0")) - .parse::()?;; + .parse::()?; let ysize = stdin.read_line()? .unwrap_or(String::from("0")) - .parse::()?;; + .parse::()?; let mut xpix = stdin.read_line()? .unwrap_or(String::from("0")) - .parse::()?;; + .parse::()?; let mut ypix = stdin.read_line()? .unwrap_or(String::from("0")) - .parse::()?;; + .parse::()?; let cell_ratio = stdin.read_line()? .unwrap_or(String::from("0")) - .parse::()?;; - + .parse::()?; let mut renderer = renderer .write() .map_err(|_| format_err!("Renderer RwLock failed!"))?; @@ -722,10 +721,10 @@ impl RenderTarget { img.with_raw(move |raw| -> MResult<()> { let sixfail = |e| format_err!("Sixel failed with: {:?}", e); let encoder = Encoder::new() - .map_err(sixfail)?;;; + .map_err(sixfail)?; encoder.set_encode_policy(EncodePolicy::Fast) - .map_err(sixfail)?;; + .map_err(sixfail)?; let frame = QuickFrameBuilder::new() .width(xpix) @@ -816,7 +815,7 @@ impl Renderer { } #[cfg(feature = "video")] - fn send_media_meta(&self, frame: &(impl ImgSize)) -> MResult<()> { + fn send_media_meta(&self, frame: &impl ImgSize) -> MResult<()> { let (_, height) = self.max_size(frame); println!("{}", height+1); diff --git a/src/main.rs b/src/main.rs index 1304c49..c30102a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -140,7 +140,7 @@ fn run(mut core: WidgetCore) -> HResult<()> { fn parse_args(core: WidgetCore) -> HResult<()> { let args = App::new("Lag-free terminal file browser") .version(clap::crate_version!()) - .author(clap::crate_authors!("\n")) + .author(clap::crate_authors!()) .about("Hunt your files at light-speed, armed with full $SHELL integration") .arg( Arg::with_name("update") diff --git a/src/mediaview.rs b/src/mediaview.rs index f4e3d26..6527ef9 100644 --- a/src/mediaview.rs +++ b/src/mediaview.rs @@ -240,7 +240,7 @@ impl MediaView { imgview.set_image_data(frame); sender.send(crate::widget::Events::WidgetReady) .map_err(|e| HError::from(e)) - .log();; + .log(); } line_buf.clear(); diff --git a/src/trait_ext.rs b/src/trait_ext.rs index 51e352e..90ce6d3 100644 --- a/src/trait_ext.rs +++ b/src/trait_ext.rs @@ -36,7 +36,7 @@ impl PathBufMime for PathBuf { let mut file = File::new_from_path(&self, None) .map_err(|e| MimeError::AccessFailed(Box::new(e)))?; file.meta_sync() - .map_err(|e| MimeError::AccessFailed(Box::new(e)))?;; + .map_err(|e| MimeError::AccessFailed(Box::new(e)))?; file.get_mime()