Skip to content

Commit 598a58c

Browse files
Fixed multi digit range parse bug
1 parent 8e92434 commit 598a58c

4 files changed

Lines changed: 13 additions & 5 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rplexfmtr"
3-
version = "1.0.5"
3+
version = "1.0.6"
44
edition = "2021"
55
authors = ["nikolaizombie1 <fabio.matos999@gmail.com>"]
66
license = "GPL-3.0-only"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Package: rplexfmtr
2+
Version: 1.0.6
3+
Architecture: amd64
4+
Essential: no
5+
Priority: optional
6+
Depends:
7+
Maintainer: Fabio J. Matos Nieves <fabio.matos999@gmail.com>
8+
Description: A command line tool to batch rename media files for Plex® Media Server TV Shows.

src/database.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub async fn select_all_episodes(
161161
series_name: &str,
162162
) -> anyhow::Result<Vec<Episode>> {
163163
Ok(sqlx::query_as::<_, Episode>(
164-
"SELECT DISTINCT series_name, season, episode, old_path, new_path FROM episodes WHERE series_name = ? ORDER BY LENGTH(series_name), series_name, LENGTH(season), season, LENGTH(old_path), old_path;",
164+
"SELECT DISTINCT series_name, season, episode, old_path, new_path FROM episodes WHERE series_name = ? GROUP BY series_name, season, episode ORDER BY LENGTH(series_name), series_name;",
165165
)
166166
.bind(series_name)
167167
.fetch_all(db)

src/validate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ pub fn parse_range(amount_files: usize, range: String) -> anyhow::Result<Vec<usi
8989
let mut file_numbers: Vec<usize> = Vec::new();
9090
let dualendedrange: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^\d+-\d+$"#).unwrap());
9191
let leftendedrange: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^\d+-$"#).unwrap());
92-
let rightendedrange: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^+-\d$"#).unwrap());
93-
let csv: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^(\d+,)+\d$"#).unwrap());
94-
let single: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^\d$"#).unwrap());
92+
let rightendedrange: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^-\d+$"#).unwrap());
93+
let csv: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^(\d+,)+\d+$"#).unwrap());
94+
let single: Lazy<Regex> = Lazy::new(|| Regex::new(r#"^\d+$"#).unwrap());
9595
let ranges = range
9696
.split_ascii_whitespace()
9797
.map(|x| x.to_owned())

0 commit comments

Comments
 (0)