Skip to content

Commit

Permalink
Merge pull request #256 from kyoheiu/develop
Browse files Browse the repository at this point in the history
v2.10.2
  • Loading branch information
kyoheiu authored Nov 25, 2023
2 parents e0c6584 + 19c3247 commit 5c0b7f8
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 36 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

## Unreleased

## v2.10.2 (2023-11-26)

### Fixed
- Added a filter to every user input to reject `Keyup` events. This is required on the windows platform.

## v2.10.1 (2023-11-02)

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "felix"
version = "2.10.1"
version = "2.10.2"
authors = ["Kyohei Uto <[email protected]>"]
edition = "2021"
description = "tui file manager with vim-like key mapping"
Expand Down
35 changes: 6 additions & 29 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ For more detailed document, visit https://kyoheiu.dev/felix.

## New release

## v2.10.2 (2023-11-26)

### Fixed
- Added a filter to every user input to reject `Keyup` events. This is required on the windows platform.


## v2.10.1 (2023-11-02)

### Fixed
Expand All @@ -37,35 +43,6 @@ For more detailed document, visit https://kyoheiu.dev/felix.
- Add `has_bat` field to `State`.
- Add `FxError::InvalidPath` to handle invalid unicode in file path.

## v2.9.0 (2023-10-22)

### Added
- Change color of untracked/changed files or directories containing such files. Default color is Red(1). You can change it in the config file.
- Add `git2`.

### Fixed
- Explicitly ignore the key release events for Windows.

## v2.8.1 (2023-08-25)

### Fixed
- Fix help text.

## v2.8.0 (2023-08-25)

### Added
- `i{file name}<CR>` to create new file, and `I{dir name}<CR>` to create new directory.
- If zoxide is installed, whenever changing directory inside felix, `zoxide add` will be executed to add the directory or increment its rank in the zoxide database.
- For this, `State` now has a new field `has_zoxide`, which is checked at startup.

### Changed
- config's `color` is now optional: By this, all config fields are optional.
- Remove warning message when you launch felix without the config file.
- When opening file by default editor is failed, felix displays more accurate warning: `$EDITOR may not be set, or config file may be invalid.`.

### Removed
- Remove `syntect` and syntax highlighting in the preview area. This will improve build and start-up times, and resolve the handling of wide chars such as CJK.

For more details, see `CHANGELOG.md`.

<a id="status"></a>
Expand Down
Binary file modified screenshots/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@ impl Default for Config {

fn read_config(p: &Path) -> Result<Config, FxError> {
let s = read_to_string(p)?;
read_config_from_str(&s)
}

fn read_config_from_str(s: &str) -> Result<Config, FxError> {
let deserialized: Config = serde_yaml::from_str(s)?;
let deserialized: Config = serde_yaml::from_str(&s)?;
Ok(deserialized)
}

Expand Down

0 comments on commit 5c0b7f8

Please sign in to comment.