diff options
| -rw-r--r-- | Cargo.lock | 14 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | NEWS.md | 21 | ||||
| -rw-r--r-- | tree-sitter-yts/grammar.js | 60 | ||||
| -rw-r--r-- | tree-sitter-yts/package.nix | 1 | ||||
| -rw-r--r-- | tree-sitter-yts/src/grammar.json | 1 | ||||
| -rw-r--r-- | tree-sitter-yts/src/node-types.json | 2 | ||||
| -rw-r--r-- | yt/src/select/cmds.rs | 5 |
8 files changed, 74 insertions, 32 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1bb60b2..e0e8593 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -239,7 +239,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.3.1" +version = "1.3.2" dependencies = [ "serde", ] @@ -1045,7 +1045,7 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libmpv2" -version = "1.3.1" +version = "1.3.2" dependencies = [ "crossbeam", "libmpv2-sys", @@ -1056,7 +1056,7 @@ dependencies = [ [[package]] name = "libmpv2-sys" -version = "1.3.1" +version = "1.3.2" dependencies = [ "bindgen", ] @@ -2642,11 +2642,11 @@ dependencies = [ [[package]] name = "yt" -version = "1.3.1" +version = "1.3.2" dependencies = [ "anyhow", "blake3", - "bytes 1.3.1", + "bytes 1.3.2", "chrono", "chrono-humanize", "clap", @@ -2671,9 +2671,9 @@ dependencies = [ [[package]] name = "yt_dlp" -version = "1.3.1" +version = "1.3.2" dependencies = [ - "bytes 1.3.1", + "bytes 1.3.2", "log", "pyo3", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2a2a060..28f3190 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [ [workspace.package] edition = "2021" -version = "1.3.1" +version = "1.3.2" rust-version = "1.80.0" authors = ["Benedikt Peetz <benedikt.peetz@b-peetz.de>"] repository = "https://git.vhack.eu/soispha/clients/yt" diff --git a/NEWS.md b/NEWS.md index e47445f..4cfc7dc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,6 +14,27 @@ If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines. - - - +## [v1.3.2](https://git.vhack.eu/soispha/clients/yt/compare/fc9cd7a887e5f6863111cce154557873680cd0bb..v1.3.2) - 2024-11-04 +#### Bug Fixes +- **(tree-sitter-yts/grammar.js)** Add missing commands - ([ec5f2de](https://git.vhack.eu/soispha/clients/yt/commit/ec5f2deabe1a9b0abf17e3608b5a87290e37d13f)) - [@soispha](https://git.vhack.eu/soispha) +- **(yt/download)** Only print changed bytes sizes, on changed string - ([7945461](https://git.vhack.eu/soispha/clients/yt/commit/794546168238eca6300a9088204ad59ef917395e)) - [@soispha](https://git.vhack.eu/soispha) +- **(yt/download)** Don't trust the `cache_path` attribute - ([fc9cd7a](https://git.vhack.eu/soispha/clients/yt/commit/fc9cd7a887e5f6863111cce154557873680cd0bb)) - [@soispha](https://git.vhack.eu/soispha) +- **(yt/select/cmds)** Fix future incompatibility - ([ed24fa0](https://git.vhack.eu/soispha/clients/yt/commit/ed24fa0413e32956a49b6cf53bc1bf017efb513c)) - [@soispha](https://git.vhack.eu/soispha) +- **(yt_dlp/progress_hook)** Mark estimates as such - ([887be12](https://git.vhack.eu/soispha/clients/yt/commit/887be12527ca8eba92b89226c6251089d30e3be5)) - [@soispha](https://git.vhack.eu/soispha) +#### Build system +- **(cog.toml)** Format *before* checking the formatting - ([82029f6](https://git.vhack.eu/soispha/clients/yt/commit/82029f69a39a228fdf77404177594fdf55090313)) - [@soispha](https://git.vhack.eu/soispha) +- **(tree-sitter-yts)** Include in builds - ([e2ee7b6](https://git.vhack.eu/soispha/clients/yt/commit/e2ee7b63f8c29cd447ba8b8b080aaac162d17017)) - [@soispha](https://git.vhack.eu/soispha) +- **(treewide)** Update - ([93860b9](https://git.vhack.eu/soispha/clients/yt/commit/93860b95995aab5a4caf59ba7b25105ddb2dfcdd)) - [@soispha](https://git.vhack.eu/soispha) +- **(update.sh)** Improve recursiveness - ([35123cb](https://git.vhack.eu/soispha/clients/yt/commit/35123cb0b25a26e948970d276e4713bf0f599ffa)) - [@soispha](https://git.vhack.eu/soispha) +#### Miscellaneous Chores +- **(tree-sitter-yts)** Add copyright headers - ([2df1ce5](https://git.vhack.eu/soispha/clients/yt/commit/2df1ce51ff25c114011e1d01dbb0b6b6da7b2c1a)) - [@soispha](https://git.vhack.eu/soispha) +#### Refactoring +- **(tree-sitter-yts)** Move in tree - ([676cc2b](https://git.vhack.eu/soispha/clients/yt/commit/676cc2b5619ecd517df42b07dbc2c22449a47179)) - [@soispha](https://git.vhack.eu/soispha) +#### Style +- **(yt/main)** Use consistent use qualifications - ([fa41623](https://git.vhack.eu/soispha/clients/yt/commit/fa41623197514195b695b5ecc05945ec9c4e8a63)) - [@soispha](https://git.vhack.eu/soispha) + +- - - + ## [v1.3.1](https://git.vhack.eu/soispha/clients/yt/compare/48fee6897097ef9eb5a21271d55155388a05a13b..v1.3.1) - 2024-10-29 #### Bug Fixes - **(yt/cache)** Don't try to delete video cache paths that don't exist anymore - ([dd1d471](https://git.vhack.eu/soispha/clients/yt/commit/dd1d471820251dc9c5f60a5508e0e80711fb221a)) - [@soispha](https://git.vhack.eu/soispha) diff --git a/tree-sitter-yts/grammar.js b/tree-sitter-yts/grammar.js index 563f7f4..70d6bc6 100644 --- a/tree-sitter-yts/grammar.js +++ b/tree-sitter-yts/grammar.js @@ -14,35 +14,55 @@ module.exports = grammar({ rules: { source_file: ($) => repeat(choice($.line, $.comment)), line: ($) => - seq($.command, repeat($.flag), $.id, $.title, $.date, $.author, $.duration, $.url, "\n"), + seq( + $.command, + repeat($.flag), + $.id, + $.title, + $.date, + $.author, + $.duration, + $.url, + "\n", + ), - command: ($) => choice("pick", "p", "watch", "w", "watched", "wd", "add", "a", "drop", "d", "url", "u"), + command: ($) => + choice( + "pick", + "p", + "watch", + "w", + "watched", + "wd", + "add", + "a", + "drop", + "d", + "url", + "u", + ), flag: ($) => choice( - /-\w [^\s]+/, - /-\w '[^']*'/, - /-\w "[^"]*"/, - /-\w=[^\s]+/, - /-\w='[^']*'/, - /-\w="[^"]*"/, + /-\w [^\s]+/, + /-\w '[^']*'/, + /-\w "[^"]*"/, + /-\w=[^\s]+/, + /-\w='[^']*'/, + /-\w="[^"]*"/, - /--\w[\w-]+ [^\s]+/, - /--\w[\w-]+ '[^']*'/, - /--\w[\w-]+ "[^"]*"/, - /--\w[\w-]+=[^\s]+/, - /--\w[\w-]+='[^']*'/, - /--\w[\w-]+="[^"]*"/, - ), + /--\w[\w-]+ [^\s]+/, + /--\w[\w-]+ '[^']*'/, + /--\w[\w-]+ "[^"]*"/, + /--\w[\w-]+=[^\s]+/, + /--\w[\w-]+='[^']*'/, + /--\w[\w-]+="[^"]*"/, + ), id: ($) => /[a-z0-9]+/, title: ($) => seq($._q, /[^"]+/, $._q), date: ($) => seq($._q, /\d{4}-\d{2}-\d{2}/, $._q), author: ($) => seq($._q, /[^"]+/, $._q), duration: ($) => - seq( - $._q, - seq(choice("[No Duration]", /\d+m \d+s/, /\d+h \d+m/)), - $._q, - ), + seq($._q, seq(choice("[No Duration]", /\d+m \d+s/, /\d+h \d+m/)), $._q), url: ($) => seq($._q, /[^"]+/, $._q), comment: ($) => /#.*/, _q: ($) => $.quote, diff --git a/tree-sitter-yts/package.nix b/tree-sitter-yts/package.nix index 5bdb9c6..7b7adcf 100644 --- a/tree-sitter-yts/package.nix +++ b/tree-sitter-yts/package.nix @@ -7,7 +7,6 @@ # # You should have received a copy of the License along with this program. # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. - # taken from nixpgks: pkgs/development/tools/parsing/tree-sitter/grammar.nix { stdenv, diff --git a/tree-sitter-yts/src/grammar.json b/tree-sitter-yts/src/grammar.json index a63633b..65e8122 100644 --- a/tree-sitter-yts/src/grammar.json +++ b/tree-sitter-yts/src/grammar.json @@ -283,4 +283,3 @@ "inline": [], "supertypes": [] } - diff --git a/tree-sitter-yts/src/node-types.json b/tree-sitter-yts/src/node-types.json index c4a588e..4724111 100644 --- a/tree-sitter-yts/src/node-types.json +++ b/tree-sitter-yts/src/node-types.json @@ -198,4 +198,4 @@ "type": "watch", "named": false } -] \ No newline at end of file +] diff --git a/yt/src/select/cmds.rs b/yt/src/select/cmds.rs index d0f8ba5..db3685a 100644 --- a/yt/src/select/cmds.rs +++ b/yt/src/select/cmds.rs @@ -82,7 +82,10 @@ pub async fn handle_select_cmd( .map(|entry| add_entry(app, entry)) .collect(); - join_all(futures).await.into_iter().collect::<Result<()>>()?; + join_all(futures) + .await + .into_iter() + .collect::<Result<()>>()?; } } else { bail!("Your playlist does not seem to have any entries!") |