Skip to content

Commit

Permalink
Merge pull request #153 from kyoheiu/develop
Browse files Browse the repository at this point in the history
v2.1.1
  • Loading branch information
kyoheiu authored Dec 1, 2022
2 parents 02f2144 + 6183b61 commit 406c666
Show file tree
Hide file tree
Showing 15 changed files with 568 additions and 406 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@

## Unreleased

## v2.1.1 (2022-12-02)

### Fixed

- You can now open a file in a new window on Wayland environment too.
- Proper handling of wide characters: Even if an item or a info message includes some wide charatcters such as CJK, the layout won't break anymore.
- Fix cursor color after printing the text preview.

### Changed

- Some refactoring around text-printing in the preview space.
- When you change the sort key, felix refresh the list more efficiently than ever by avoiding to read all the items.

## v2.1.0 (2022-11-19)

### Added
Expand Down
92 changes: 61 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "felix"
version = "2.1.0"
version = "2.1.1"
authors = ["Kyohei Uto <[email protected]>"]
edition = "2021"
description = "tui file manager with vim-like key mapping"
Expand Down Expand Up @@ -32,6 +32,9 @@ flate2 = "1.0.24"
lzma-rs = "0.2.0"
zstd = "0.11.2"

[target.'cfg(target_os = "linux")'.dependencies]
nix = {version = "0.25.0", features = ["process"]}

[dependencies.serde]
version = "1.0.136"
features = ["derive"]
Expand Down
38 changes: 15 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,13 @@ For the detailed document, please see https://kyoheiu.dev/felix.

## New Release

## v2.1.0 (2022-11-19)

### Added

![sample_extraction](screenshots/sample_extraction.gif)

- Feature to unpack archive/compressed file to the current directory. Supported types: `tar.gz`(Gzip), `tar.xz`(lzma), `tar.zst`(Zstandard & tar), `zst`(Zstandard), `tar`, zip file format and formats based on it(`zip`, `docx`, ...). To unpack, press `e` on the item.
- The number of dependencies bumps up to around 150 due to this.
## v2.1.1 (2022-12-02)

### Fixed

- Bug: In the select mode, the selected item was unintentionally canceled when going up/down.
- Delete pointer properly when removing items.
- Instead of panic, return error when `config_dir()` fails.

### Changed

- Image file detection: Use magic bytes instead of checking the extension. This will enable to detect image more precisely.
- You can now open a file in a new window on Wayland environment too.
- Proper handling of wide characters: Even if e.g. file name includes some wide charatcters such as CJK, the layout won't break anymore.
- Fix cursor color after printing the text preview.

For more details, see `CHANGELOG.md`.

Expand All @@ -43,37 +32,40 @@ For more details, see `CHANGELOG.md`.

_For Windows users: From v1.3.0, it can be at least compiled on Windows (see `.github/workflows/install_test.yml`.) If you're interested, please try and report any problems._

MSRV(Minimum Supported rustc Version): **1.60.0**

## Installation

_Make sure that `gcc` is installed._
### Prerequisites

Update Rust:
- Make sure that `gcc` is installed.
- MSRV(Minimum Supported rustc Version): **1.60.0**

Update Rust if rustc < 1.60:

```
rustup update
```

From crates.io:
### From crates.io

```
cargo install felix
```

From AUR:
### From AUR

```
yay -S felix-rs
```

On NetBSD, package is available from the official repositories:
### NetBSD

available from the official repositories:

```
pkgin install felix
```

From this repository:
### From this repository

```
git clone https://github.com/kyoheiu/felix.git
Expand Down
6 changes: 3 additions & 3 deletions config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# v2.1.0
# v2.1.1

# (Optional)
# Default exec command when open files.
# Default exec command when opening files.
# If not set, will default to $EDITOR.
# default: nvim

# (Optional)
# key (the command you want to use): [values] (extensions)
# key (the command you want to use when opening certain files): [values] (extensions)
# exec:
# feh:
# [jpg, jpeg, png, gif, svg]
Expand Down
4 changes: 2 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use super::errors::FxError;
use super::state::FX_CONFIG_DIR;

use serde::Deserialize;
use std::collections::HashMap;
use std::collections::BTreeMap;
use std::fs::read_to_string;
use std::path::{Path, PathBuf};

Expand Down Expand Up @@ -74,7 +74,7 @@ color:
#[derive(Deserialize, Debug, Clone)]
pub struct Config {
pub default: Option<String>,
pub exec: Option<HashMap<String, Vec<String>>>,
pub exec: Option<BTreeMap<String, Vec<String>>>,
pub color: ConfigColor,
pub syntax_highlight: Option<bool>,
pub default_theme: Option<DefaultTheme>,
Expand Down
Loading

0 comments on commit 406c666

Please sign in to comment.