From a2f27dac9042129c276546df20d2b292f8a331e9 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sun, 27 Apr 2025 17:54:02 +0300 Subject: [PATCH] collect edns under config/ --- .../sequencer.edn => .old/todo_project0.edn | 0 {crates/cli/edn => config}/arranger.edn | 0 {crates/app/edn => config}/arranger_keys.edn | 0 .../app/edn => config}/arranger_keys_clip.edn | 0 {crates/app/edn => config}/arranger_keys_mix.edn | 0 .../app/edn => config}/arranger_keys_scene.edn | 0 .../app/edn => config}/arranger_keys_track.edn | 0 {crates/app/examples => config}/clip.edn | 0 {crates/cli/edn => config}/groovebox.edn | 0 {crates/app/edn => config}/groovebox_keys.edn | 0 {crates/midi/edn => config}/keys_clip_length.edn | 0 {crates/midi/edn => config}/keys_clip_rename.edn | 0 {crates/midi/edn => config}/keys_edit.edn | 0 {crates/midi/edn => config}/keys_pool.edn | 0 {crates/midi/edn => config}/keys_pool_file.edn | 0 {crates/app/examples => config}/mixer.edn | 0 {crates/plugin/edn => config}/plugin-keys.edn | 0 {crates/plugin/edn => config}/plugin-view.edn | 0 {crates/cli/edn => config}/sampler.edn | 0 {crates/app/edn => config}/sampler_keys.edn | 0 {crates/cli/edn => config}/sequencer.edn | 0 {crates/app/edn => config}/sequencer_keys.edn | 0 {crates/cli/edn => config}/transport.edn | 0 crates/app/examples/arranger.edn | 0 crates/app/examples/sampler.edn | 0 crates/app/src/keys.rs | 16 ++++++++-------- crates/app/src/view.rs | 2 +- crates/cli/tek.rs | 10 +++++----- crates/midi/src/clip/clip_editor.rs | 2 +- crates/midi/src/pool/pool_model.rs | 8 ++++---- 30 files changed, 19 insertions(+), 19 deletions(-) rename crates/app/examples/sequencer.edn => .old/todo_project0.edn (100%) rename {crates/cli/edn => config}/arranger.edn (100%) rename {crates/app/edn => config}/arranger_keys.edn (100%) rename {crates/app/edn => config}/arranger_keys_clip.edn (100%) rename {crates/app/edn => config}/arranger_keys_mix.edn (100%) rename {crates/app/edn => config}/arranger_keys_scene.edn (100%) rename {crates/app/edn => config}/arranger_keys_track.edn (100%) rename {crates/app/examples => config}/clip.edn (100%) rename {crates/cli/edn => config}/groovebox.edn (100%) rename {crates/app/edn => config}/groovebox_keys.edn (100%) rename {crates/midi/edn => config}/keys_clip_length.edn (100%) rename {crates/midi/edn => config}/keys_clip_rename.edn (100%) rename {crates/midi/edn => config}/keys_edit.edn (100%) rename {crates/midi/edn => config}/keys_pool.edn (100%) rename {crates/midi/edn => config}/keys_pool_file.edn (100%) rename {crates/app/examples => config}/mixer.edn (100%) rename {crates/plugin/edn => config}/plugin-keys.edn (100%) rename {crates/plugin/edn => config}/plugin-view.edn (100%) rename {crates/cli/edn => config}/sampler.edn (100%) rename {crates/app/edn => config}/sampler_keys.edn (100%) rename {crates/cli/edn => config}/sequencer.edn (100%) rename {crates/app/edn => config}/sequencer_keys.edn (100%) rename {crates/cli/edn => config}/transport.edn (100%) delete mode 100644 crates/app/examples/arranger.edn delete mode 100644 crates/app/examples/sampler.edn diff --git a/crates/app/examples/sequencer.edn b/.old/todo_project0.edn similarity index 100% rename from crates/app/examples/sequencer.edn rename to .old/todo_project0.edn diff --git a/crates/cli/edn/arranger.edn b/config/arranger.edn similarity index 100% rename from crates/cli/edn/arranger.edn rename to config/arranger.edn diff --git a/crates/app/edn/arranger_keys.edn b/config/arranger_keys.edn similarity index 100% rename from crates/app/edn/arranger_keys.edn rename to config/arranger_keys.edn diff --git a/crates/app/edn/arranger_keys_clip.edn b/config/arranger_keys_clip.edn similarity index 100% rename from crates/app/edn/arranger_keys_clip.edn rename to config/arranger_keys_clip.edn diff --git a/crates/app/edn/arranger_keys_mix.edn b/config/arranger_keys_mix.edn similarity index 100% rename from crates/app/edn/arranger_keys_mix.edn rename to config/arranger_keys_mix.edn diff --git a/crates/app/edn/arranger_keys_scene.edn b/config/arranger_keys_scene.edn similarity index 100% rename from crates/app/edn/arranger_keys_scene.edn rename to config/arranger_keys_scene.edn diff --git a/crates/app/edn/arranger_keys_track.edn b/config/arranger_keys_track.edn similarity index 100% rename from crates/app/edn/arranger_keys_track.edn rename to config/arranger_keys_track.edn diff --git a/crates/app/examples/clip.edn b/config/clip.edn similarity index 100% rename from crates/app/examples/clip.edn rename to config/clip.edn diff --git a/crates/cli/edn/groovebox.edn b/config/groovebox.edn similarity index 100% rename from crates/cli/edn/groovebox.edn rename to config/groovebox.edn diff --git a/crates/app/edn/groovebox_keys.edn b/config/groovebox_keys.edn similarity index 100% rename from crates/app/edn/groovebox_keys.edn rename to config/groovebox_keys.edn diff --git a/crates/midi/edn/keys_clip_length.edn b/config/keys_clip_length.edn similarity index 100% rename from crates/midi/edn/keys_clip_length.edn rename to config/keys_clip_length.edn diff --git a/crates/midi/edn/keys_clip_rename.edn b/config/keys_clip_rename.edn similarity index 100% rename from crates/midi/edn/keys_clip_rename.edn rename to config/keys_clip_rename.edn diff --git a/crates/midi/edn/keys_edit.edn b/config/keys_edit.edn similarity index 100% rename from crates/midi/edn/keys_edit.edn rename to config/keys_edit.edn diff --git a/crates/midi/edn/keys_pool.edn b/config/keys_pool.edn similarity index 100% rename from crates/midi/edn/keys_pool.edn rename to config/keys_pool.edn diff --git a/crates/midi/edn/keys_pool_file.edn b/config/keys_pool_file.edn similarity index 100% rename from crates/midi/edn/keys_pool_file.edn rename to config/keys_pool_file.edn diff --git a/crates/app/examples/mixer.edn b/config/mixer.edn similarity index 100% rename from crates/app/examples/mixer.edn rename to config/mixer.edn diff --git a/crates/plugin/edn/plugin-keys.edn b/config/plugin-keys.edn similarity index 100% rename from crates/plugin/edn/plugin-keys.edn rename to config/plugin-keys.edn diff --git a/crates/plugin/edn/plugin-view.edn b/config/plugin-view.edn similarity index 100% rename from crates/plugin/edn/plugin-view.edn rename to config/plugin-view.edn diff --git a/crates/cli/edn/sampler.edn b/config/sampler.edn similarity index 100% rename from crates/cli/edn/sampler.edn rename to config/sampler.edn diff --git a/crates/app/edn/sampler_keys.edn b/config/sampler_keys.edn similarity index 100% rename from crates/app/edn/sampler_keys.edn rename to config/sampler_keys.edn diff --git a/crates/cli/edn/sequencer.edn b/config/sequencer.edn similarity index 100% rename from crates/cli/edn/sequencer.edn rename to config/sequencer.edn diff --git a/crates/app/edn/sequencer_keys.edn b/config/sequencer_keys.edn similarity index 100% rename from crates/app/edn/sequencer_keys.edn rename to config/sequencer_keys.edn diff --git a/crates/cli/edn/transport.edn b/config/transport.edn similarity index 100% rename from crates/cli/edn/transport.edn rename to config/transport.edn diff --git a/crates/app/examples/arranger.edn b/crates/app/examples/arranger.edn deleted file mode 100644 index e69de29b..00000000 diff --git a/crates/app/examples/sampler.edn b/crates/app/examples/sampler.edn deleted file mode 100644 index e69de29b..00000000 diff --git a/crates/app/src/keys.rs b/crates/app/src/keys.rs index c2ec5da7..9082d642 100644 --- a/crates/app/src/keys.rs +++ b/crates/app/src/keys.rs @@ -14,7 +14,7 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps { } } // Handle from root keymap - if let Some(command) = SourceIter(include_str!("../edn/arranger_keys.edn")) + if let Some(command) = SourceIter(include_str!("../../../config/arranger_keys.edn")) .command::<_, TekCommand, _>(app, input) { if let Some(undo) = command.execute(app)? { app.history.push(undo); } @@ -22,10 +22,10 @@ pub fn handle_arranger (app: &mut Tek, input: &TuiIn) -> Perhaps { } // Handle from selection-dependent keymaps if let Some(command) = match app.selected() { - Selection::Clip(_, _) => SourceIter(include_str!("../edn/arranger_keys_clip.edn")), - Selection::Track(_) => SourceIter(include_str!("../edn/arranger_keys_track.edn")), - Selection::Scene(_) => SourceIter(include_str!("../edn/arranger_keys_scene.edn")), - Selection::Mix => SourceIter(include_str!("../edn/arranger_keys_mix.edn")), + Selection::Clip(_, _) => SourceIter(include_str!("../../../config/arranger_keys_clip.edn")), + Selection::Track(_) => SourceIter(include_str!("../../../config/arranger_keys_track.edn")), + Selection::Scene(_) => SourceIter(include_str!("../../../config/arranger_keys_scene.edn")), + Selection::Mix => SourceIter(include_str!("../../../config/arranger_keys_mix.edn")), }.command::<_, TekCommand, _>(app, input) { if let Some(undo) = command.execute(app)? { app.history.push(undo); @@ -39,7 +39,7 @@ pub fn handle_sequencer (app: &mut Tek, input: &TuiIn) -> Perhaps { if app.editor.handle(input)? == Some(true) { return Ok(Some(true)) } - if let Some(command) = SourceIter(include_str!("../edn/sequencer_keys.edn")) + if let Some(command) = SourceIter(include_str!("../../../config/sequencer_keys.edn")) .command::<_, TekCommand, _>(app, input) { if let Some(undo) = command.execute(app)? { @@ -54,7 +54,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps { if app.editor.handle(input)? == Some(true) { return Ok(Some(true)) } - if let Some(command) = SourceIter(include_str!("../edn/groovebox_keys.edn")) + if let Some(command) = SourceIter(include_str!("../../../config/groovebox_keys.edn")) .command::<_, TekCommand, _>(app, input) { if let Some(undo) = command.execute(app)? { @@ -67,7 +67,7 @@ pub fn handle_groovebox (app: &mut Tek, input: &TuiIn) -> Perhaps { pub fn handle_sampler (app: &mut Tek, input: &TuiIn) -> Perhaps { let sampler = app.tracks[0].sampler_mut(0).expect("no sampler"); - if let Some(command) = SourceIter(include_str!("../edn/sampler_keys.edn")) + if let Some(command) = SourceIter(include_str!("../../../config/sampler_keys.edn")) .command::<_, SamplerCommand, _>(sampler, input) { if let Some(undo) = command.execute(sampler)? { diff --git a/crates/app/src/view.rs b/crates/app/src/view.rs index 18f7d105..3dc4fb01 100644 --- a/crates/app/src/view.rs +++ b/crates/app/src/view.rs @@ -868,7 +868,7 @@ impl Modal { Bsp::s(Tui::bold(true, "tek!"), Bsp::s("", Map::south(1, options, option))) } fn view_help (&self) -> impl Content { - let bindings = ||TokenIter::new(include_str!("../edn/groovebox_keys.edn")) + let bindings = ||TokenIter::new(include_str!("../../../config/groovebox_keys.edn")) .filter_map(|x|if let Value::Exp(_, iter)=x.value{ Some(iter) } else { diff --git a/crates/cli/tek.rs b/crates/cli/tek.rs index 15950013..4d3fd216 100644 --- a/crates/cli/tek.rs +++ b/crates/cli/tek.rs @@ -106,11 +106,11 @@ impl Cli { color: ItemTheme::random(), clock: Clock::new(jack, self.bpm)?, view: SourceIter(match mode { - LaunchMode::Clock => include_str!("./edn/transport.edn"), - LaunchMode::Sequencer => include_str!("./edn/sequencer.edn"), - LaunchMode::Groovebox => include_str!("./edn/groovebox.edn"), - LaunchMode::Arranger { .. } => include_str!("./edn/arranger.edn"), - LaunchMode::Sampler => include_str!("./edn/sampler.edn"), + LaunchMode::Clock => include_str!("../../config/transport.edn"), + LaunchMode::Sequencer => include_str!("../../config/sequencer.edn"), + LaunchMode::Groovebox => include_str!("../../config/groovebox.edn"), + LaunchMode::Arranger { .. } => include_str!("../../config/arranger.edn"), + LaunchMode::Sampler => include_str!("../../config/sampler.edn"), _ => todo!("{mode:?}"), }), pool: match mode { diff --git a/crates/midi/src/clip/clip_editor.rs b/crates/midi/src/clip/clip_editor.rs index 97b1954a..857834c7 100644 --- a/crates/midi/src/clip/clip_editor.rs +++ b/crates/midi/src/clip/clip_editor.rs @@ -21,7 +21,7 @@ impl Default for MidiEditor { Self { mode: PianoHorizontal::new(None), size: Measure::new(), - keys: SourceIter(include_str!("../../edn/keys_edit.edn")), + keys: SourceIter(include_str!("../../../../config/keys_edit.edn")), } } } diff --git a/crates/midi/src/pool/pool_model.rs b/crates/midi/src/pool/pool_model.rs index f83f5a4a..8f4c8ee7 100644 --- a/crates/midi/src/pool/pool_model.rs +++ b/crates/midi/src/pool/pool_model.rs @@ -23,10 +23,10 @@ impl Default for MidiPool { clips: Arc::from(RwLock::from(vec![])), clip: 0.into(), mode: None, - keys: SourceIter(include_str!("../../edn/keys_pool.edn")), - keys_file: SourceIter(include_str!("../../edn/keys_pool_file.edn")), - keys_rename: SourceIter(include_str!("../../edn/keys_clip_rename.edn")), - keys_length: SourceIter(include_str!("../../edn/keys_clip_length.edn")), + keys: SourceIter(include_str!("../../../../config/keys_pool.edn")), + keys_file: SourceIter(include_str!("../../../../config/keys_pool_file.edn")), + keys_rename: SourceIter(include_str!("../../../../config/keys_clip_rename.edn")), + keys_length: SourceIter(include_str!("../../../../config/keys_clip_length.edn")), } } }