diff --git a/README.md b/README.md index 558e376..ee7e438 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # muss -![repl_demo](https://raw.githubusercontent.com/NGnius/mps/master/extras/demo.png) +![repl_demo](https://raw.githubusercontent.com/NGnius/muss/master/extras/demo.png) Sort, filter and analyse your music to create great playlists. This project implements the interpreter (`./interpreter`), music player (`./player`), and CLI interface for Muss (`./`). @@ -54,7 +54,7 @@ One day I'll add pretty REPL example pictures and some script files... LGPL-2.1-only OR GPL-3.0-only -**NOTE**: When advanced features are enabled, GPL-3.0 must be used. +**NOTE**: Advanced features make use of [a fork of bliss-rs](https://github.com/NGnius/bliss-rs) a GPL-3.0 licensed music analysis library. ## Contribution diff --git a/README.tpl b/README.tpl index aa3c6fc..3a4afad 100644 --- a/README.tpl +++ b/README.tpl @@ -1,6 +1,6 @@ # {{crate}} -![repl_demo](https://raw.githubusercontent.com/NGnius/mps/master/extras/demo.png) +![repl_demo](https://raw.githubusercontent.com/NGnius/muss/master/extras/demo.png) {{readme}} @@ -8,7 +8,7 @@ {{license}} -**NOTE**: When advanced features are enabled, GPL-3.0 must be used. +**NOTE**: Advanced features make use of [a fork of bliss-rs](https://github.com/NGnius/bliss-rs) a GPL-3.0 licensed music analysis library. ## Contribution diff --git a/extras/demo.png b/extras/demo.png index d4ce65c..bb5e1c9 100644 Binary files a/extras/demo.png and b/extras/demo.png differ diff --git a/interpreter/README.md b/interpreter/README.md index 9d26208..30186f9 100644 --- a/interpreter/README.md +++ b/interpreter/README.md @@ -170,7 +170,7 @@ Operations to sort the items in an iterable: `iterable~(sorter)` OR `iterable.so #### field -- e.g. `iterable~(filename);` -Sort by a Item field. Valid field names change depending on what information is available when the Item is populated, but usually title, artist, album, genre, track, filename are valid fields. Items with a missing/incomparable fields will be sorted to the end. +Sort by an Item field. Valid field names change depending on what information is available when the Item is populated, but usually title, artist, album, genre, track, filename are valid fields. Items with a missing/incomparable fields will be sorted to the end. #### shuffle #### random shuffle -- e.g. `iterable~(shuffle);` @@ -244,7 +244,7 @@ Various algebraic operations: brackets (order of operations), negation, subtract #### file(filepath) -- e.g. `file("~/Music/Romantic Traffic.flac"),` -Load a item from file, populating the item with the song's tags. +Load an item from file, populating the item with the song's tags. License: LGPL-2.1-only OR GPL-3.0-only diff --git a/interpreter/src/lib.rs b/interpreter/src/lib.rs index 29afa14..cabffce 100644 --- a/interpreter/src/lib.rs +++ b/interpreter/src/lib.rs @@ -168,7 +168,7 @@ //! //! ### field -- e.g. `iterable~(filename);` //! -//! Sort by a Item field. Valid field names change depending on what information is available when the Item is populated, but usually title, artist, album, genre, track, filename are valid fields. Items with a missing/incomparable fields will be sorted to the end. +//! Sort by an Item field. Valid field names change depending on what information is available when the Item is populated, but usually title, artist, album, genre, track, filename are valid fields. Items with a missing/incomparable fields will be sorted to the end. //! //! ### shuffle //! ### random shuffle -- e.g. `iterable~(shuffle);` @@ -243,7 +243,7 @@ //! //! ### file(filepath) -- e.g. `file("~/Music/Romantic Traffic.flac"),` //! -//! Load a item from file, populating the item with the song's tags. +//! Load an item from file, populating the item with the song's tags. //! mod context; diff --git a/src/help.rs b/src/help.rs index d217945..8514bfd 100644 --- a/src/help.rs +++ b/src/help.rs @@ -100,7 +100,7 @@ pub const SORTERS: &str = Operations to sort the items in an iterable: iterable~(sorter) OR iterable.sort(sorter) field -- e.g. iterable~(filename) - Sort by a Item field. Valid field names change depending on what information is available when the Item is populated, but usually title, artist, album, genre, track, filename are valid fields. Items with a missing/incomparable fields will be sorted to the end. + Sort by an Item field. Valid field names change depending on what information is available when the Item is populated, but usually title, artist, album, genre, track, filename are valid fields. Items with a missing/incomparable fields will be sorted to the end. shuffle random shuffle -- e.g. iterable~(shuffle) @@ -160,4 +160,4 @@ Comma-separated procedure steps will be executed sequentially (like a for loop i Format a value into a string. This behaves differently depending on the value's type: When the value is an Item, the item's corresponding field will replace all `{field}` instances in the format string. When the value is a primitive type (String, Int, Bool, etc.), the value's text equivalent will replace all `{}` instances in the format string. When the value is an iterable operation (Op), the operation's script equivalent will replace all `{}` instances in the format string. file(filepath) -- e.g. file(`~/Music/Romantic Traffic.flac`) - Load a item from file, populating the item with the song's tags."; + Load an item from file, populating the item with the song's tags.";