save and restore window size and position

.gitignore

@@ -1,6 +1,10 @@
 /target
 /Cargo.lock
 /.idea/
-/sounds/
+/sounds/*.flac
+/sounds/*.mp3
+/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"
+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"

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Max Bradbury
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,27 +1,10 @@
 # lull
 
+https://ruin.itch.io/lull
+
 a looping sound player. 
 add your own favourite noises and blend them to create your ideal ambience.
 
-## to do
+created by [Max Bradbury](mailto:max@tinybird.info).
 
-* save volume preferences to disk
+released under the MIT license.
-* cross-compile to Windows?
-* watch data dir for new sounds?
-* disown file manager subcommand
-* get some good nature sounds
-    * rain on tin roof
-    * campfire
-    * wind
-    * waves
-    * tape hiss
-    * white noise?
-    * fan
-
-## audio credits
-
-*rain under parasol* and *waterfall* by [Samuel Strågefors](https://freesound.org/people/straget/)
-
-*waves* by [Florian Reichelt](https://freesound.org/people/florianreichelt/)
-
-*campfire* by [sagetyrtle](https://freesound.org/people/sagetyrtle/)

SOUNDS.md

@@ -0,0 +1,23 @@
+# lull - basic sounds pack
+
+## installation
+
+1. open *lull*
+2. click "manage sounds" and the sounds folder will open in your file manager. 
+3. extract these sounds to the sounds folder
+
+you can skip/remove any unwanted sounds, and add your own. 
+
+## credits
+
+*waterfall* and *rain on parasol* by [Samuel Strågefors](https://freesound.org/people/straget/)
+
+*waves* by [Florian Reichelt](https://freesound.org/people/florianreichelt/)
+
+*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 README.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,36 +1,95 @@
+#![windows_subsystem = "windows"]
+
 use gio::prelude::*;
 use gtk::prelude::*;
 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;
 
+#[derive(Debug, Eq, PartialEq, Serialize, Deserialize)]
+struct Config {
+    position: (i32, i32),
+    size:     (i32, i32),
+}
+
+fn save_config(config: Config) {
+    let mut config_path = dirs::config_dir()
+        .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);
-    let vertical = gtk::Box::new(Orientation::Vertical, SPACING);
+    popup.set_resizable(false);
-    popup.add(&vertical);
 
     let message = gtk::Label::new(Some(message));
-    vertical.add(&message);
+    popup.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 {
@@ -51,20 +110,50 @@ fn build_ui(application: &gtk::Application) {
     window.set_title("lull");
     window.set_border_width(SPACING as u32);
     window.set_position(gtk::WindowPosition::Center);
-    window.set_default_size(256, 256);
+    window.set_default_size(256, 128);
 
-    let vertical = gtk::Box::new(Orientation::Vertical, SPACING);
+    if let Some(config) = load_config() {
-    vertical.set_homogeneous(true);
+        window.move_(config.position.0, config.position.1);
+        window.resize(config.size.0, config.size.1);
+    }
 
-    window.add(&vertical);
+    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 paths = std::fs::read_dir(get_data_dir())
+    let mut paths = std::fs::read_dir(get_data_dir())
-        .expect("Couldn't read from lull data directory");
+        .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 path = path.unwrap().path();
         let name: &str = path.file_stem().unwrap().to_str().unwrap();
 
         let file = File::open(&path)
@@ -89,11 +178,9 @@ fn build_ui(application: &gtk::Application) {
         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);
+        label.set_halign(gtk::Align::End);
+        column_labels.add(&label);
 
         let adjustment = gtk::Adjustment::new(
             0.0,
@@ -122,26 +209,19 @@ fn build_ui(application: &gtk::Application) {
             }
         });
 
-        row.add(&slider);
+        column_sliders.add(&slider);
-
-        vertical.add(&row);
     }
 
-    let row_add = gtk::Box::new(Orientation::Horizontal, SPACING);
+    window.show_all();
-    row_add.set_homogeneous(true);
 
-    let button_manage_sounds = gtk::Button::with_label("manage sounds");
+    window.connect_delete_event(|window, _event| {
-
+        save_config(Config {
-    button_manage_sounds.connect_clicked(|_| {
+            position: window.get_position(),
-        let mut file_manager = Command::new("xdg-open");
+            size:     window.get_size()
-        file_manager.arg(get_data_dir());
-        file_manager.output().unwrap();
         });
 
-    row_add.add(&button_manage_sounds);
+        Inhibit(false)
-    vertical.add(&row_add);
+    });
-
-    window.show_all();
 }
 
 fn main() {