From cf729aaef3a314a24c2374a4d16424a8cb615b31 Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Sun, 13 Mar 2022 11:47:01 +0000
Subject: [PATCH] Simplify

---
 src/analyse.rs | 30 +++++++++---------------------
 src/cue.rs     |  2 +-
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/analyse.rs b/src/analyse.rs
index 7e1e3f5..5b531a9 100644
--- a/src/analyse.rs
+++ b/src/analyse.rs
@@ -196,27 +196,15 @@ pub fn analyze_cue_streaming(tracks: Vec<cue::CueTrack>,) -> BlissResult<Receive
                         idx += 1;
 
                         log::debug!("Extracting '{}'", track_path);
-                        if cue_track.duration<last_track_duration {
-                            match Exec::cmd("ffmpeg").arg("-i").arg(&audio_path)
-                                                     .arg("-ss").arg(&cue_track.start.hhmmss())
-                                                     .arg("-t").arg(&cue_track.duration.hhmmss())
-                                                     .arg("-c").arg("copy")
-                                                     .arg(String::from(tmp_file.to_string_lossy()))
-                                                     .stderr(NullFile)
-                                                     .join() {
-                                Ok(_) => { },
-                                Err(e) => { log::error!("Failed to call ffmpeg. {}", e); }
-                            }
-                        } else {
-                            match Exec::cmd("ffmpeg").arg("-i").arg(&audio_path)
-                                                     .arg("-ss").arg(&cue_track.start.hhmmss())
-                                                     .arg("-c").arg("copy")
-                                                     .arg(String::from(tmp_file.to_string_lossy()))
-                                                     .stderr(NullFile)
-                                                     .join() {
-                                Ok(_) => { },
-                                Err(e) => { log::error!("Failed to call ffmpeg. {}", e); }
-                            }
+                        match Exec::cmd("ffmpeg").arg("-i").arg(&audio_path)
+                                                    .arg("-ss").arg(&cue_track.start.hhmmss())
+                                                    .arg("-t").arg(&cue_track.duration.hhmmss())
+                                                    .arg("-c").arg("copy")
+                                                    .arg(String::from(tmp_file.to_string_lossy()))
+                                                    .stderr(NullFile)
+                                                    .join() {
+                            Ok(_) => { },
+                            Err(e) => { log::error!("Failed to call ffmpeg. {}", e); }
                         }
 
                         if ! cfg!(windows) {
diff --git a/src/cue.rs b/src/cue.rs
index 03d06ef..6353fec 100644
--- a/src/cue.rs
+++ b/src/cue.rs
@@ -13,7 +13,7 @@ use std::path::PathBuf;
 use std::time::Duration;
 
 pub const MARKER:&str = ".CUE_TRACK.";
-pub const LAST_TRACK_DURATION:u64 = 60*60*24*7;
+pub const LAST_TRACK_DURATION:u64 = 60*60*24;
 const GENRE:&str = "GENRE";
 
 #[derive(Clone)]