mtnash
/
dmm
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

update (nix & cargo)

This commit is contained in:
Rowan S-L 2024-03-24 17:04:32 -04:00
parent 35c9f34d6a
commit 844757b606
4 changed files with 425 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

867
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

22
Cargo.toml
View File

@ -20,36 +20,36 @@ exclude = [ "/flake.nix", "/flake.lock" ]
unsafe_code = "forbid"
[dependencies]
clap = { version = "4.4", features = ["derive", "wrap_help", "cargo", "unicode", "string", "unstable-styles"] }
heck = "0.4"
clap = { version = "4.5", features = ["derive", "wrap_help", "cargo", "unicode", "string", "unstable-styles"] }
heck = "0.5"
ron = "0.8"
serde = { version = "1.0", features = ["derive"] }
uuid = { version = "1.6", features = ["v4", "serde"] }
notify-rust = "4.10"
serde = { version = "1", features = ["derive"] }
uuid = { version = "1", features = ["v4", "serde"] }
notify-rust = "4.11"
symphonia = { version = "0.5", features = ["mp3"] }
cpal = "0.15"
rb = "0.4"
ratatui = { version = "0.24", features = ["serde", "macros"] }
ratatui = { version = "0.26", features = ["serde", "macros"] }
flume = "0.11"
fuzzy-matcher = "0.3"
tracing = "0.1"
tracing-error = "0.2"
tracing-subscriber = { version = "0.3", features = ["env-filter", "local-time"] }
lazy_static = "1.4"
lazy_static = "1"
color-eyre = "0.6"
log = "0.4"
better-panic = "0.3"
strip-ansi-escapes = "0.2"
human-panic = "1.2"
crossterm = { version = "0.27", features = ["serde"] }
config = "0.13"
derive_deref = "1.1"
config = "0.14"
derive_deref = "1"
rand = "0.8"
num_enum = "0.7"
static_assertions = "1.1.0"
static_assertions = "1"
const_cmp = "0.0.0"
highway = "1"
base64 = "0.21"
base64 = "0.22"
thiserror = "1"
derivative = "2"

18
flake.lock
View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1710003968,
"narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=",
"lastModified": 1712681629,
"narHash": "sha256-bMDXn4AkTXLCpoZbII6pDGoSeSe9gI87jxPsHRXgu/E=",
"owner": "ipetkov",
"repo": "crane",
"rev": "10484f86201bb94bd61ecc5335b1496794fedb78",
"rev": "220387ac8e99cbee0ca4c95b621c4bc782b6a235",
"type": "github"
},
"original": {
@ -40,11 +40,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1710451336,
"narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d691274a972b3165335d261cc4671335f5c67de9",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
]
},
"locked": {
"lastModified": 1710468700,
"narHash": "sha256-YGN6R0nLfB2L57J8T/DX+LcB06QipyYzHSz7AD8B0n0=",
"lastModified": 1712973993,
"narHash": "sha256-ZJxC6t2K0UAPW+lV+bJ+pAtwbn29eqZQzXLTG54oL+I=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7ff8e9a04ac7777a3446788cb4018b452157ab8a",
"rev": "a497535d074432133b683dda3a1faa8c8ab587ad",
"type": "github"
},
"original": {

40
src/ui/components/home/draw.rs
View File

@ -91,14 +91,15 @@ impl super::Home {
}
fn draw_info(&mut self, f: &mut Frame<'_>, area: Rect) -> Result<()> {
let info_layout = Layout::new()
.direction(Direction::Vertical)
.constraints([
let info_layout = Layout::new(
Direction::Vertical,
[
Constraint::Length(6),
Constraint::Max(6),
Constraint::Min(0),
])
.split(area);
],
)
.split(area);
let selected_playlist = self.get_playlist(PlaylistID {
playlist: self
@ -188,24 +189,27 @@ impl super::Home {
}
pub(super) fn draw_inner(&mut self, f: &mut Frame<'_>, area: Rect) -> Result<()> {
let main_layout = Layout::new()
.direction(Direction::Vertical)
.constraints([Constraint::Length(3), Constraint::Min(0)])
.horizontal_margin(1)
.split(area);
let main_layout = Layout::new(
Direction::Vertical,
[Constraint::Length(3), Constraint::Min(0)],
)
.horizontal_margin(1)
.split(area);
self.draw_titlebar(f, main_layout[0])?;
let content_layout = Layout::new()
.direction(Direction::Horizontal)
.constraints([Constraint::Max(37), Constraint::Min(0)])
.split(main_layout[1]);
let content_layout = Layout::new(
Direction::Horizontal,
[Constraint::Max(37), Constraint::Min(0)],
)
.split(main_layout[1]);
self.draw_info(f, content_layout[0])?;
let lists_layout = Layout::new()
.direction(Direction::Horizontal)
.constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
.split(content_layout[1]);
let lists_layout = Layout::new(
Direction::Horizontal,
[Constraint::Percentage(50), Constraint::Percentage(50)],
)
.split(content_layout[1]);
f.render_stateful_widget(
List::new(
self.get_playlist(self.current.playlist)