alterwain/Lyrica
alterwain/Lyrica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: alterwain:f337a6de1f7b52eabbfe361e15c4cade1518f3aa
Branches Tags
alterwain:main
alterwain:cli
..
compare: alterwain:7a32015a05ae79894090712a629d9eba26e9eff2
Branches Tags
alterwain:main
alterwain:cli

No commits in common. "f337a6de1f7b52eabbfe361e15c4cade1518f3aa" and "7a32015a05ae79894090712a629d9eba26e9eff2" have entirely different histories.
f337a6de1f ... 7a32015a05

6 changed files with 76 additions and 63 deletions
Show Stats Expand all files Collapse all files

18
src/main.rs
View File

@ -1,14 +1,15 @@
use std::{collections::HashMap, error::Error, io}; use std::{any::Any, cell::RefCell, collections::HashMap, error::Error, io, ops::Deref, path::{Path, PathBuf}};
use color_eyre::Result; use color_eyre::Result;
use crossterm::{event::{DisableMouseCapture, EnableMouseCapture, Event, EventStream, KeyCode, KeyEvent, KeyEventKind}, execute, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}}; use crossterm::{event::{self, DisableMouseCapture, EnableMouseCapture, Event, EventStream, KeyCode, KeyEvent, KeyEventKind}, execute, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}};
use futures::StreamExt; use futures::StreamExt;
use ratatui::{prelude::{Backend, CrosstermBackend}, widgets::Widget, Frame, Terminal}; use ratatui::{buffer::Buffer, layout::{Layout, Rect}, prelude::{Backend, CrosstermBackend}, style::{Color, Stylize}, symbols::border, text::{Line, Text}, widgets::{Block, Paragraph, Tabs, Widget}, DefaultTerminal, Frame, Terminal};
use main_screen::MainScreen; use main_screen::MainScreen;
use screen::AppScreen; use screen::AppScreen;
use sync::AppEvent; use sync::AppEvent;
use tokio::sync::mpsc::{self, Receiver, UnboundedSender}; use tokio::{fs::File, io::AsyncReadExt, sync::mpsc::{self, Receiver, Sender, UnboundedReceiver, UnboundedSender}};
use tokio_util::sync::CancellationToken; use tokio_util::sync::CancellationToken;
use ratatui::prelude::Constraint::{Length, Min};
use wait_screen::WaitScreen; use wait_screen::WaitScreen;
mod dlp; mod dlp;
@ -35,8 +36,8 @@ pub struct App {
impl Default for App { impl Default for App {
fn default() -> Self { fn default() -> Self {
let (tx, rx) = mpsc::channel(10); let (tx, mut rx) = mpsc::channel(10);
let (jx, jr) = mpsc::unbounded_channel(); let (jx, mut jr) = mpsc::unbounded_channel();
let token = CancellationToken::new(); let token = CancellationToken::new();
sync::initialize_async_service(tx, jr, token.clone()); sync::initialize_async_service(tx, jr, token.clone());
@ -106,7 +107,10 @@ impl App {
fn handle_key_event(&mut self, key_event: KeyEvent) { fn handle_key_event(&mut self, key_event: KeyEvent) {
self.screens.get_mut(&self.state).unwrap().handle_key_event(key_event); self.screens.get_mut(&self.state).unwrap().handle_key_event(key_event);
if let KeyCode::Char('q') = key_event.code { self.exit() } match key_event.code {
KeyCode::Char('q') => self.exit(),
_ => {}
}
} }
fn exit(&mut self) { fn exit(&mut self) {

99
src/main_screen.rs
View File

@ -1,7 +1,8 @@
use chrono::{DateTime, Utc};
use color_eyre::owo_colors::OwoColorize; use color_eyre::owo_colors::OwoColorize;
use crossterm::event::{KeyCode, KeyEvent}; use crossterm::event::{KeyCode, KeyEvent};
use rascii_art::{charsets, render_image_to, RenderOptions}; use rascii_art::{charsets, render_image_to, render_to, RenderOptions};
use ratatui::{layout::{Constraint, Direction, Layout, Rect}, style::{Color, Modifier, Style, Stylize}, text::{Line, Span}, widgets::{Block, Borders, Gauge, Paragraph, Tabs}, Frame}; use ratatui::{buffer::Buffer, layout::{Constraint, Direction, Layout, Rect}, style::{Color, Modifier, Style, Stylize}, text::{Line, Span, Text}, widgets::{Block, Borders, Gauge, List, ListItem, Paragraph, Row, Table, Tabs, Widget}, Frame};
use soundcloud::sobjects::CloudPlaylists; use soundcloud::sobjects::CloudPlaylists;
use strum::IntoEnumIterator; use strum::IntoEnumIterator;
use tokio::sync::mpsc::UnboundedSender; use tokio::sync::mpsc::UnboundedSender;
@ -121,15 +122,18 @@ impl MainScreen {
} }
fn download_row(&mut self) { fn download_row(&mut self) {
if self.selected_tab == 1 {// SC match self.selected_tab {
let playlist_url = self.soundcloud.as_ref().unwrap().get(self.selected_row as usize).unwrap().link.clone(); 1 => {// SC
let _ = self.sender.send(AppEvent::DownloadPlaylist(playlist_url)); let playlist_url = self.soundcloud.as_ref().unwrap().get(self.selected_row as usize).unwrap().link.clone();
let _ = self.sender.send(AppEvent::DownloadPlaylist(playlist_url));
},
_ => {}
} }
} }
pub fn set_soundcloud_playlists(&mut self, pl: CloudPlaylists) { pub fn set_soundcloud_playlists(&mut self, pl: CloudPlaylists) {
self.soundcloud = Some( self.soundcloud = Some(
pl.collection.iter().map(|p| Playlist { name: p.title.clone(), thumbnail_url: p.artwork_url.as_deref().map_or(String::new(), |u| self.ascii_art_from_url(u)), link: p.permalink_url.clone() }).collect() pl.collection.iter().map(|p| Playlist { name: p.title.clone(), thumbnail_url: p.artwork_url.as_deref().map_or(String::new(), |u| self.ascii_art_from_url(&u)), link: p.permalink_url.clone() }).collect()
); );
} }
@ -175,59 +179,62 @@ impl MainScreen {
} }
fn render_tab(&self, frame: &mut Frame, area: Rect) /*-> Table<'_>*/ { fn render_tab(&self, frame: &mut Frame, area: Rect) /*-> Table<'_>*/ {
if self.selected_tab == 1 { // SC let rows = match self.selected_tab {
/*let mut v = Vec::new(); 1 => { // SC
v.push(Row::new(vec!["Id", "Title", "Songs Count", "Date", "IS"]).style(Style::default().fg(Color::Gray))); /*let mut v = Vec::new();
if let Some(s) = &self.soundcloud { v.push(Row::new(vec!["Id", "Title", "Songs Count", "Date", "IS"]).style(Style::default().fg(Color::Gray)));
for (i, playlist) in (&s.collection).iter().enumerate() { if let Some(s) = &self.soundcloud {
let date: DateTime<Utc> = playlist.created_at.parse().unwrap(); for (i, playlist) in (&s.collection).iter().enumerate() {
let mut row = Row::new( let date: DateTime<Utc> = playlist.created_at.parse().unwrap();
vec![ let mut row = Row::new(
playlist.id.to_string(), vec![
playlist.title.clone(), playlist.id.to_string(),
[playlist.track_count.to_string(), " songs".to_string()].concat(), playlist.title.clone(),
format!("{}", date.format("%Y-%m-%d %H:%M")), [playlist.track_count.to_string(), " songs".to_string()].concat(),
"NO".to_string() format!("{}", date.format("%Y-%m-%d %H:%M")),
] "NO".to_string()
); ]
if self.selected_row == i as i32 { );
row = row.style(Style::default().bg(Color::Yellow)); if self.selected_row == i as i32 {
row = row.style(Style::default().bg(Color::Yellow));
}
v.push(row);
} }
v.push(row);
} }
} v*/
v*/ let v = self.soundcloud.as_deref().unwrap_or(&[]);
let v = self.soundcloud.as_deref().unwrap_or(&[]);
let rows = Layout::default() let rows = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
.constraints(vec![Constraint::Percentage(100); math::round::ceil(v.len() as f64 / 3_f64, 0) as usize]) // Two rows .constraints(vec![Constraint::Percentage(100); math::round::ceil(v.len() as f64 / 3 as f64, 0) as usize]) // Two rows
.split(area); .split(area);
for (i, row) in rows.iter().enumerate() { for (i, row) in rows.iter().enumerate() {
let cols = Layout::default() let cols = Layout::default()
.direction(Direction::Horizontal) .direction(Direction::Horizontal)
.constraints(vec![Constraint::Length(16); 2]) // Three columns .constraints(vec![Constraint::Length(16); 2]) // Three columns
.split(*row); .split(*row);
for (j, col) in cols.iter().enumerate() { for (j, col) in cols.iter().enumerate() {
let index = i * 3 + j; let index = i * 3 + j;
if index < v.len() { if index < v.len() {
let p = &v[index]; let p = &v[index];
let url_cl = p.thumbnail_url.clone(); let url_cl = p.thumbnail_url.clone();
let s = url_cl.lines().map(Line::from).collect::<Vec<Line>>(); let mut s = url_cl.lines().map(|l| Line::from(l)).collect::<Vec<Line>>();
let paragraph = Paragraph::new(s) let paragraph = Paragraph::new(s)
.block(Block::default().borders(Borders::ALL)) .block(Block::default().borders(Borders::ALL))
.style(Style::default()); .style(Style::default());
frame.render_widget(paragraph, *col); frame.render_widget(paragraph, *col);
}
} }
} }
} }
_ => {} // Vec::new()
}; };
// Create the table // Create the table

2
src/screen.rs
View File

@ -1,7 +1,7 @@
use std::any::Any; use std::any::Any;
use crossterm::event::KeyEvent; use crossterm::event::KeyEvent;
use ratatui::Frame; use ratatui::{buffer::Buffer, layout::Rect, Frame};
pub trait AppScreen { pub trait AppScreen {
fn handle_key_event(&mut self, key_event: KeyEvent); fn handle_key_event(&mut self, key_event: KeyEvent);

4
src/sync.rs
View File

@ -34,13 +34,13 @@ pub fn initialize_async_service(sender: Sender<AppEvent>, receiver: UnboundedRec
} else { } else {
let _ = sender.send(AppEvent::IPodNotFound).await; let _ = sender.send(AppEvent::IPodNotFound).await;
}*/ }*/
let _ = sender.send(AppEvent::IPodFound("/Users/michael/Documents/ipod/iTunes/iTunesDB".to_string())).await; let _ = sender.send(AppEvent::IPodFound("D:\\Documents\\RustroverProjects\\itunesdb\\ITunesDB\\two_tracks".to_string())).await;
}, },
AppEvent::ParseItunes(path) => { AppEvent::ParseItunes(path) => {
// todo: parse itunes // todo: parse itunes
let _ = std::fs::create_dir_all(get_configs_dir()); let _ = std::fs::create_dir_all(get_configs_dir());
let cd = get_temp_itunesdb(); let cd = get_temp_itunesdb();
let p: PathBuf = Path::new(&path).into(); let mut p: PathBuf = Path::new(&path).into();
// p.push("iPod_Control"); // p.push("iPod_Control");
// p.push("iTunes"); // p.push("iTunes");
// p.set_file_name("iTunesDB"); // p.set_file_name("iTunesDB");

4
src/util.rs
View File

@ -91,7 +91,9 @@ fn get_ipod_path() -> Option<String> {
match list() { match list() {
Ok(l) => l.iter() Ok(l) => l.iter()
.filter(|d| is_ipod(d)) .filter(|d| is_ipod(d))
.filter_map(|d| get_mount_point(d)) .map(|d| get_mount_point(d))
.filter(|d| d.is_some())
.map(|d| d.unwrap())
.last(), .last(),
Err(_e) => None Err(_e) => None
} }

2
src/wait_screen.rs
View File

@ -1,4 +1,4 @@
use ratatui::{style::Stylize, symbols::border, text::{Line, Text}, widgets::{Block, Paragraph}, Frame}; use ratatui::{style::Stylize, symbols::border, text::{Line, Text}, widgets::{Block, Paragraph, Widget}, Frame};
use crate::screen::AppScreen; use crate::screen::AppScreen;