From d0fe7f54f6c0e74f87d13a6d072599c12aad8367 Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Sun, 15 Oct 2023 23:34:22 +0200
Subject: [PATCH] Show fractal in relative_sequence_number if present

---
 crunchy-cli-core/src/archive/filter.rs  |  8 +++++---
 crunchy-cli-core/src/download/filter.rs |  8 +++++---
 crunchy-cli-core/src/utils/parse.rs     | 10 ++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/crunchy-cli-core/src/archive/filter.rs b/crunchy-cli-core/src/archive/filter.rs
index c2cc206..024ad17 100644
--- a/crunchy-cli-core/src/archive/filter.rs
+++ b/crunchy-cli-core/src/archive/filter.rs
@@ -2,7 +2,7 @@ use crate::archive::command::Archive;
 use crate::utils::filter::{real_dedup_vec, Filter};
 use crate::utils::format::{Format, SingleFormat, SingleFormatCollection};
 use crate::utils::interactive_select::{check_for_duplicated_seasons, get_duplicated_seasons};
-use crate::utils::parse::UrlFilter;
+use crate::utils::parse::{fract, UrlFilter};
 use anyhow::Result;
 use crunchyroll_rs::{Concert, Episode, Locale, Movie, MovieListing, MusicVideo, Season, Series};
 use log::{info, warn};
@@ -321,8 +321,10 @@ impl Filter for ArchiveFilter {
                 }
                 if ep.id == episode.id {
                     relative_episode_number = Some(i + 1);
-                    relative_sequence_number =
-                        Some((i + 1 - non_integer_sequence_number_count) as f32);
+                    relative_sequence_number = Some(
+                        (i + 1 - non_integer_sequence_number_count) as f32
+                            + fract(ep.sequence_number),
+                    );
                     break;
                 }
             }
diff --git a/crunchy-cli-core/src/download/filter.rs b/crunchy-cli-core/src/download/filter.rs
index c5aef7e..ff3c2ff 100644
--- a/crunchy-cli-core/src/download/filter.rs
+++ b/crunchy-cli-core/src/download/filter.rs
@@ -2,7 +2,7 @@ use crate::download::Download;
 use crate::utils::filter::Filter;
 use crate::utils::format::{Format, SingleFormat, SingleFormatCollection};
 use crate::utils::interactive_select::{check_for_duplicated_seasons, get_duplicated_seasons};
-use crate::utils::parse::UrlFilter;
+use crate::utils::parse::{fract, UrlFilter};
 use anyhow::{bail, Result};
 use crunchyroll_rs::{Concert, Episode, Movie, MovieListing, MusicVideo, Season, Series};
 use log::{error, info, warn};
@@ -211,8 +211,10 @@ impl Filter for DownloadFilter {
                 }
                 if ep.id == episode.id {
                     relative_episode_number = Some(i + 1);
-                    relative_sequence_number =
-                        Some((i + 1 - non_integer_sequence_number_count) as f32);
+                    relative_sequence_number = Some(
+                        (i + 1 - non_integer_sequence_number_count) as f32
+                            + fract(ep.sequence_number),
+                    );
                     break;
                 }
             }
diff --git a/crunchy-cli-core/src/utils/parse.rs b/crunchy-cli-core/src/utils/parse.rs
index f85d8c2..c0ac2b0 100644
--- a/crunchy-cli-core/src/utils/parse.rs
+++ b/crunchy-cli-core/src/utils/parse.rs
@@ -192,3 +192,13 @@ pub fn parse_resolution(mut resolution: String) -> Result<Resolution> {
         bail!("Could not find resolution")
     }
 }
+
+/// Dirty implementation of [`f32::fract`] with more accuracy.
+pub fn fract(input: f32) -> f32 {
+    if input.fract() == 0.0 {
+        return 0.0;
+    }
+    format!("0.{}", input.to_string().split('.').last().unwrap())
+        .parse::<f32>()
+        .unwrap()
+}