save and restore window size and position

.gitignore

@@ -6,3 +6,5 @@
 /sounds/*.wav
 /sounds.zip
 /lull.zip
+/dist/
+/package/

Cargo.toml

@@ -1,13 +1,18 @@
 [package]
 name = "lull"
-description = "a looping sound player for generating aural atmospheres"
+description = "a looping sound player for generating atmospheric soundscapes"
-version = "1.0.0"
+version = "1.0.3"
 authors = ["Max Bradbury <max@tinybird.info>"]
+repository = "https://tinybird.dev/max/lull"
 license = "MIT"
 edition = "2018"
-crate_type = "bin"
 
 [dependencies]
 dirs = "^3.0.1"
-druid = "^0.6.0"
+gdk = "^0.13.2"
+gio = "^0"
+gtk = "^0"
 rodio = "^0.11.0"
+serde = "^1.0.125"
+serde_derive = "^1.0.125"
+toml = "^0.5.8"

README.md

@@ -8,19 +8,3 @@ add your own favourite noises and blend them to create your ideal ambience.
 created by [Max Bradbury](mailto:max@tinybird.info).
 
 released under the MIT license.
-
-## to do
-
-* save volume preferences to disk
-* cross-compile to Windows?
-* watch data dir for new sounds?
-* disown file manager subcommand
-* get some good nature sounds
-    * rain on tin roof
-    * wind
-    * tape hiss
-    * vinyl crackle
-    * white noise?
-    * fan
-* set a window icon
-    * create a nice icon?

SOUNDS.md

@@ -17,3 +17,7 @@ you can skip/remove any unwanted sounds, and add your own.
 *campfire* by [sagetyrtle](https://freesound.org/people/sagetyrtle/)
 
 *rain on glass* by [Benboncan](https://freesound.org/people/Benboncan/)
+
+*birdsong* by [reinsamba](https://freesound.org/people/reinsamba/)
+
+*fireplace* by [aunrea](https://freesound.org/people/aunrea/)

TODO.md

@@ -0,0 +1,14 @@
+# to do
+
+* save volume preferences to disk
+* cross-compile to Windows?
+* watch data dir for new sounds?
+* disown file manager subcommand
+* get some good nature sounds
+    * wind
+    * tape hiss
+    * vinyl crackle
+    * white noise?
+    * fan
+* set a window icon
+    * create a nice icon?

build.sh

@@ -1,9 +1,16 @@
 #!/usr/bin/env bash
 
-cargo build --release
+mkdir dist
-cp target/release/lull .
-strip lull
-zip -r lull.zip README.md lull
-rm lull
 
-zip -r sounds.zip SOUNDS.md sounds/*.mp3
+cargo build --release
+
+mkdir dist/linux
+
+cp target/release/lull dist/linux
+cp README.md dist/linux
+cp LICENSE dist/linux
+strip dist/linux/lull
+
+mkdir dist/sounds
+
+cp sounds/*.mp3 SOUNDS.md dist/sounds

deploy.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-butler push lull.zip ruin/lull:linux
+butler push dist/linux ruin/lull:linux
-butler push sounds.zip ruin/lull:sounds
+butler push dist/sounds ruin/lull:sounds

src/main.rs

@@ -1,186 +1,238 @@
 #![windows_subsystem = "windows"]
 
-// use gio::prelude::*;
+use gio::prelude::*;
-// use gtk::prelude::*;
+use gtk::prelude::*;
-// use gtk::Orientation;
+use gtk::Orientation;
 use rodio::{Sink, Source};
+use serde_derive::{Serialize, Deserialize};
 use std::env::args;
 use std::fs::File;
-use std::io::BufReader;
+use std::io::{BufReader, Write, Read};
 use std::path::PathBuf;
 use std::process::Command;
 
 const SPACING: i32 = 16;
 
-// fn error_popup(message: &str) {
+#[derive(Debug, Eq, PartialEq, Serialize, Deserialize)]
-//     let popup = gtk::Window::new(gtk::WindowType::Toplevel);
+struct Config {
-//     popup.set_title("error");
+    position: (i32, i32),
-//     popup.set_border_width(SPACING as u32);
+    size:     (i32, i32),
-//     popup.set_position(gtk::WindowPosition::Center);
-//     popup.set_default_size(256, 64);
-//
-//     let vertical = gtk::Box::new(Orientation::Vertical, SPACING);
-//     popup.add(&vertical);
-//
-//     let message = gtk::Label::new(Some(message));
-//     vertical.add(&message);
-//
-//     let button_ok = gtk::Button::with_label("OK");
-//     vertical.add(&button_ok);
-//
-//     popup.show_all();
-//
-//     button_ok.connect_clicked(move |_| unsafe {
-//         popup.destroy();
-//     });
-// }
-//
-// fn get_data_dir() -> PathBuf {
-//     let mut data_dir = dirs::data_dir().expect("Couldn't find user data directory");
-//
-//     data_dir.push("ruin/lull");
-//
-//     if !data_dir.exists() {
-//         std::fs::create_dir_all(&data_dir).expect("Couldn't create lull data directory");
-//     }
-//
-//     data_dir
-// }
-//
-// fn build_ui(application: &gtk::Application) {
-//     let window = gtk::ApplicationWindow::new(application);
-//
-//     window.set_title("lull");
-//     window.set_border_width(SPACING as u32);
-//     window.set_position(gtk::WindowPosition::Center);
-//     window.set_default_size(256, 256);
-//
-//     let vertical = gtk::Box::new(Orientation::Vertical, SPACING);
-//     vertical.set_homogeneous(true);
-//
-//     window.add(&vertical);
-//
-//     let device = rodio::default_output_device().unwrap();
-//
-//     let paths = std::fs::read_dir(get_data_dir())
-//         .expect("Couldn't read from lull data directory");
-//
-//     for path in paths {
-//         let path = path.unwrap().path();
-//         let name: &str = path.file_stem().unwrap().to_str().unwrap();
-//
-//         let file = File::open(&path)
-//             .expect("Couldn't open audio file");
-//
-//         let source = rodio::Decoder::new(
-//             BufReader::new(file)
-//         );
-//
-//         if source.is_err() {
-//             error_popup(&format!(
-//                 "Couldn't parse file {}. \n{}.",
-//                 path.to_str().unwrap(),
-//                 source.err().unwrap()
-//             ));
-//             continue;
-//         }
-//
-//         let source = source.unwrap().repeat_infinite();
-//
-//         let sink = Sink::new(&device);
-//         sink.append(source);
-//         sink.pause();
-//
-//         let row = gtk::Box::new(Orientation::Horizontal, SPACING);
-//         row.set_homogeneous(true);
-//
-//         let label = gtk::Label::new(Some(name));
-//         row.add(&label);
-//
-//         let adjustment = gtk::Adjustment::new(
-//             0.0,
-//             0.0,
-//             1.0,
-//             0.0,
-//             0.0,
-//             0.0
-//         );
-//
-//         let slider = gtk::Scale::new(
-//             Orientation::Horizontal,
-//             Some(&adjustment)
-//         );
-//
-//         slider.set_draw_value(false);
-//
-//         slider.connect_value_changed(move |scale| {
-//             let volume = scale.get_value();
-//
-//             if volume == 0. {
-//                 sink.pause();
-//             } else {
-//                 sink.play();
-//                 sink.set_volume(volume as f32);
-//             }
-//         });
-//
-//         row.add(&slider);
-//
-//         vertical.add(&row);
-//     }
-//
-//     let row_add = gtk::Box::new(Orientation::Horizontal, SPACING);
-//     row_add.set_homogeneous(true);
-//
-//     let button_manage_sounds = gtk::Button::with_label("manage sounds");
-//
-//     button_manage_sounds.connect_clicked(|_| {
-//         let mut file_manager = Command::new("xdg-open");
-//         file_manager.arg(get_data_dir());
-//         file_manager.output().unwrap();
-//     });
-//
-//     row_add.add(&button_manage_sounds);
-//     vertical.add(&row_add);
-//
-//     window.show_all();
-// }
-//
-// fn main() {
-//     let application = gtk::Application::new(
-//         Some("dev.tinybird.max.lull"),
-//         Default::default()
-//     ).expect("Initialization failed...");
-//
-//     application.connect_activate(|app| {
-//         build_ui(app);
-//     });
-//
-//     application.run(&args().collect::<Vec<_>>());
-// }
-
-use druid::{AppLauncher, WindowDesc, Widget, PlatformError};
-use druid::widget::{Label, Padding, Flex, Align, FlexParams, CrossAxisAlignment, Slider};
-
-fn build_ui() -> impl Widget<()> {
-    Padding::new(
-        10.0,
-        Flex::column()
-            .with_flex_child(
-                Flex::row()
-                    .with_flex_child(Align::centered(Label::new("sound 1")), FlexParams::new(1.0, CrossAxisAlignment::End))
-                    .with_child(Align::centered(Label::new("slider"))),
-                1.0
-            )
-            .with_child(
-                Flex::row()
-                    .with_flex_child(Label::new("top right"), 1.0)
-                    .with_flex_child(Align::centered(Label::new("bottom right")), 1.0)
-            )
-    )
 }
 
-fn main() -> Result<(), PlatformError> {
+fn save_config(config: Config) {
-    AppLauncher::with_window(WindowDesc::new(build_ui)).launch(())?;
+    let mut config_path = dirs::config_dir()
-    Ok(())
+        .expect("Couldn't find user config directory");
+
+    config_path.push("ruin/lull");
+
+    if !config_path.exists() {
+        std::fs::create_dir_all(&config_path)
+            .expect("Couldn't create lull config directory");
+    }
+
+    let toml = toml::to_string(&config)
+        .expect("Couldn't convert config to toml");
+
+    config_path.push("lull.toml");
+
+    let mut config_file = File::create(config_path)
+        .expect("Couldn't create config file");
+
+    print!("{}", toml);
+
+    config_file.write(&toml.into_bytes())
+        .expect("Couldn't write config file");
+}
+
+fn load_config() -> Option<Config> {
+    let mut config_path = dirs::config_dir()
+        .expect("Couldn't find user config directory");
+
+    config_path.push("ruin/lull/lull.toml");
+
+    let file = File::open(config_path);
+
+    if file.is_err() {
+        return None;
+    }
+
+    let mut toml = String::new();
+
+    file.unwrap().read_to_string(&mut toml)
+        .expect("Couldn't read config file");
+
+    let config = toml::from_str(&toml)
+        .expect("Couldn't parse config");
+
+    Some(config)
+}
+
+#[cfg(target_os = "windows")]
+fn file_manager() -> &'static str {
+    "explorer"
+}
+
+#[cfg(not(target_os = "windows"))]
+fn file_manager() -> &'static str {
+    "xdg-open"
+}
+
+fn error_popup(message: &str) {
+    let popup = gtk::Window::new(gtk::WindowType::Toplevel);
+    popup.set_title("error");
+    popup.set_border_width(SPACING as u32);
+    popup.set_position(gtk::WindowPosition::Center);
+    popup.set_default_size(256, 64);
+    popup.set_type_hint(gdk::WindowTypeHint::Dialog);
+    popup.set_resizable(false);
+
+    let message = gtk::Label::new(Some(message));
+    popup.add(&message);
+
+    popup.show_all();
+}
+
+fn get_data_dir() -> PathBuf {
+    let mut data_dir = dirs::data_dir().expect("Couldn't find user data directory");
+
+    data_dir.push("ruin/lull");
+
+    if !data_dir.exists() {
+        std::fs::create_dir_all(&data_dir).expect("Couldn't create lull data directory");
+    }
+
+    data_dir
+}
+
+fn build_ui(application: &gtk::Application) {
+    let window = gtk::ApplicationWindow::new(application);
+
+    window.set_title("lull");
+    window.set_border_width(SPACING as u32);
+    window.set_position(gtk::WindowPosition::Center);
+    window.set_default_size(256, 128);
+
+    if let Some(config) = load_config() {
+        window.move_(config.position.0, config.position.1);
+        window.resize(config.size.0, config.size.1);
+    }
+
+    let button_manage_sounds = gtk::Button::with_label("manage sounds");
+
+    button_manage_sounds.connect_clicked(|_| {
+        let mut file_manager = Command::new(file_manager());
+        file_manager.arg(get_data_dir());
+        file_manager.output().unwrap();
+    });
+
+    let sounds_manage  = gtk::Box::new(Orientation::Vertical,   SPACING);
+    let columns        = gtk::Box::new(Orientation::Horizontal, SPACING);
+    let column_labels  = gtk::Box::new(Orientation::Vertical,   SPACING);
+    let column_sliders = gtk::Box::new(Orientation::Vertical,   SPACING);
+
+    columns.set_homogeneous(false);
+    column_labels.set_homogeneous(true);
+    column_sliders.set_homogeneous(true);
+    column_labels.set_property_expand(false);
+    column_sliders.set_property_expand(true);
+    column_sliders.set_property_width_request(128);
+
+    window.add(&sounds_manage);
+    sounds_manage.add(&columns);
+    sounds_manage.add(&button_manage_sounds);
+    columns.add(&column_labels);
+    columns.add(&column_sliders);
+
+    let device = rodio::default_output_device().unwrap();
+
+    let mut paths = std::fs::read_dir(get_data_dir())
+        .expect("Couldn't read lull sounds directory")
+        .map(|res| res.map(|e| e.path()))
+        .collect::<Result<Vec<_>, std::io::Error>>()
+        .expect("Couldn't read files from lull sounds directory");
+
+    paths.sort();
+
+    for path in paths {
+        let name: &str = path.file_stem().unwrap().to_str().unwrap();
+
+        let file = File::open(&path)
+            .expect("Couldn't open audio file");
+
+        let source = rodio::Decoder::new(
+            BufReader::new(file)
+        );
+
+        if source.is_err() {
+            error_popup(&format!(
+                "Couldn't parse file {}. \n{}.",
+                path.to_str().unwrap(),
+                source.err().unwrap()
+            ));
+            continue;
+        }
+
+        let source = source.unwrap().repeat_infinite();
+
+        let sink = Sink::new(&device);
+        sink.append(source);
+        sink.pause();
+
+        let label = gtk::Label::new(Some(name));
+        label.set_halign(gtk::Align::End);
+        column_labels.add(&label);
+
+        let adjustment = gtk::Adjustment::new(
+            0.0,
+            0.0,
+            1.0,
+            0.0,
+            0.0,
+            0.0
+        );
+
+        let slider = gtk::Scale::new(
+            Orientation::Horizontal,
+            Some(&adjustment)
+        );
+
+        slider.set_draw_value(false);
+
+        slider.connect_value_changed(move |scale| {
+            let volume = scale.get_value();
+
+            if volume == 0. {
+                sink.pause();
+            } else {
+                sink.play();
+                sink.set_volume(volume as f32);
+            }
+        });
+
+        column_sliders.add(&slider);
+    }
+
+    window.show_all();
+
+    window.connect_delete_event(|window, _event| {
+        save_config(Config {
+            position: window.get_position(),
+            size:     window.get_size()
+        });
+
+        Inhibit(false)
+    });
+}
+
+fn main() {
+    let application = gtk::Application::new(
+        Some("dev.tinybird.max.lull"),
+        Default::default()
+    ).expect("Initialization failed...");
+
+    application.connect_activate(|app| {
+        build_ui(app);
+    });
+
+    application.run(&args().collect::<Vec<_>>());
 }